Improve basename()'s argument name

diff --git a/ccache.h b/ccache.h
index 9698c1fdeffce835c0b5e43f3f1cfd7d6b7a741a..03f63763e550cf65a2bafa97afa94347fa99e75e 100644 (file)
--- a/ccache.h
+++ b/ccache.h
@@ -121,7 +121,7 @@ void *x_realloc(void *ptr, size_t size);
 void *x_malloc(size_t size);
 void *x_calloc(size_t nmemb, size_t size);
 void traverse(const char *dir, void (*fn)(const char *, struct stat *));
-char *basename(const char *s);
+char *basename(const char *path);
 char *dirname(const char *path);
 const char *get_extension(const char *path);
 char *remove_extension(const char *path);

diff --git a/util.c b/util.c
index d3b24d7e6227f960f1ead7c26e23518eda042949..e09b2cf06407edf7b449c2883300d8d4451ea3c8 100644 (file)
--- a/util.c
+++ b/util.c
@@ -659,17 +659,17 @@ traverse(const char *dir, void (*fn)(const char *, struct stat *))
 
 /* return the base name of a file - caller frees */
 char *
-basename(const char *s)
+basename(const char *path)
 {
        char *p;
-       p = strrchr(s, '/');
-       if (p) s = p + 1;
+       p = strrchr(path, '/');
+       if (p) path = p + 1;
 #ifdef _WIN32
-       p = strrchr(s, '\\');
-       if (p) s = p + 1;
+       p = strrchr(path, '\\');
+       if (p) path = p + 1;
 #endif
 
-       return x_strdup(s);
+       return x_strdup(path);
 }
 
 /* return the dir name of a file - caller frees */