projects
/
gnulib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
43b1141
)
(dir_name_r): Add `const' in a few local declarations.
author
Jim Meyering
<jim@meyering.net>
Tue, 5 Dec 2000 13:14:13 +0000
(13:14 +0000)
committer
Jim Meyering
<jim@meyering.net>
Tue, 5 Dec 2000 13:14:13 +0000
(13:14 +0000)
lib/dirname.c
patch
|
blob
|
history
diff --git
a/lib/dirname.c
b/lib/dirname.c
index
3487015
..
2225800
100644
(file)
--- a/
lib/dirname.c
+++ b/
lib/dirname.c
@@
-54,15
+54,15
@@
void *memrchr ();
Works properly even if there are trailing slashes
(by effectively ignoring them). */
size_t
Works properly even if there are trailing slashes
(by effectively ignoring them). */
size_t
-dir_name_r (c
onst char *path, const char
**result)
+dir_name_r (c
har const *path, char const
**result)
{
{
- char *slash;
+ char
const
*slash;
size_t length; /* Length of result, not including NUL. */
slash = strrchr (path, '/');
if (BACKSLASH_IS_PATH_SEPARATOR)
{
size_t length; /* Length of result, not including NUL. */
slash = strrchr (path, '/');
if (BACKSLASH_IS_PATH_SEPARATOR)
{
- char *b = strrchr (path, '\\');
+ char
const
*b = strrchr (path, '\\');
if (b && slash < b)
slash = b;
}
if (b && slash < b)
slash = b;
}
@@
-81,7
+81,7
@@
dir_name_r (const char *path, const char **result)
slash = memrchr (path, '/', slash - path);
if (BACKSLASH_IS_PATH_SEPARATOR)
{
slash = memrchr (path, '/', slash - path);
if (BACKSLASH_IS_PATH_SEPARATOR)
{
- char *b = memrchr (path, '\\', slash - path);
+ char
const
*b = memrchr (path, '\\', slash - path);
if (b && slash < b)
slash = b;
}
if (b && slash < b)
slash = b;
}
@@
-99,7
+99,7
@@
dir_name_r (const char *path, const char **result)
/* Remove any trailing slashes from the result. */
if (BACKSLASH_IS_PATH_SEPARATOR)
{
/* Remove any trailing slashes from the result. */
if (BACKSLASH_IS_PATH_SEPARATOR)
{
- c
onst char
*lim = ((path[0] >= 'A' && path[0] <= 'z'
+ c
har const
*lim = ((path[0] >= 'A' && path[0] <= 'z'
&& path[1] == ':')
? path + 2 : path);
&& path[1] == ':')
? path + 2 : path);
@@
-126,9
+126,9
@@
dir_name_r (const char *path, const char **result)
(by effectively ignoring them). */
char *
(by effectively ignoring them). */
char *
-dir_name (c
onst char
*path)
+dir_name (c
har const
*path)
{
{
- c
onst char
*result;
+ c
har const
*result;
size_t length = dir_name_r (path, &result);
char *newpath = (char *) malloc (length + 1);
if (newpath == 0)
size_t length = dir_name_r (path, &result);
char *newpath = (char *) malloc (length + 1);
if (newpath == 0)
@@
-170,7
+170,7
@@
main ()
{
char path[MAX_BUFF_LEN];
char expected_result[MAX_BUFF_LEN];
{
char path[MAX_BUFF_LEN];
char expected_result[MAX_BUFF_LEN];
- char *result;
+ char
const
*result;
sscanf (buff, "%s %s", path, expected_result);
result = dir_name (path);
if (strcmp (result, expected_result))
sscanf (buff, "%s %s", path, expected_result);
result = dir_name (path);
if (strcmp (result, expected_result))