diff options
| author | Jim Meyering <jim@meyering.net> | 2000-12-05 13:14:13 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2000-12-05 13:14:13 +0000 |
| commit | cd6f0af0eac4378bcb93195d0e342b32fc654e4b (patch) | |
| tree | 9ec8decd13dcd81c29f3e4f674322c659920738d /lib | |
| parent | 2746cd50c3e171764316aef729df1ad8b191801d (diff) | |
| download | coreutils-cd6f0af0eac4378bcb93195d0e342b32fc654e4b.tar.xz | |
(dir_name_r): Add `const' in a few local declarations.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/dirname.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/dirname.c b/lib/dirname.c index 348701534..2225800ab 100644 --- 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 -dir_name_r (const char *path, const char **result) +dir_name_r (char 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) { - char *b = strrchr (path, '\\'); + char const *b = strrchr (path, '\\'); 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) { - char *b = memrchr (path, '\\', slash - path); + char const *b = memrchr (path, '\\', slash - path); 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) { - const char *lim = ((path[0] >= 'A' && path[0] <= 'z' + char const *lim = ((path[0] >= 'A' && path[0] <= 'z' && path[1] == ':') ? path + 2 : path); @@ -126,9 +126,9 @@ dir_name_r (const char *path, const char **result) (by effectively ignoring them). */ char * -dir_name (const char *path) +dir_name (char const *path) { - const char *result; + char const *result; 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 *result; + char const *result; sscanf (buff, "%s %s", path, expected_result); result = dir_name (path); if (strcmp (result, expected_result)) |