Rename str_basename() to basename()

diff --git a/ccache.c b/ccache.c
index 8308f8f682b3a1d746c7c93b79616134c9a8a1f9..f37d239978f05f1d7c12df70b81ffbfe26c486bc 100644 (file)
--- a/ccache.c
+++ b/ccache.c
@@ -655,7 +655,7 @@ get_object_name_from_cpp(ARGS *args, struct mdfour *hash)
           limit the basename to 10
           characters in order to cope with filesystem with small
           maximum filename length limits */
-       input_base = str_basename(input_file);
+       input_base = basename(input_file);
        tmp = strchr(input_base, '.');
        if (tmp != NULL) {
                *tmp = 0;
@@ -843,7 +843,7 @@ static int find_hash(ARGS *args, enum findhash_call_mode mode)
        /* also include the hash of the compiler name - as some compilers
           use hard links and behave differently depending on the real name */
        if (st.st_nlink > 1) {
-               hash_string(&hash, str_basename(args->argv[0]));
+               hash_string(&hash, basename(args->argv[0]));
        }
 
        compilercheck = getenv("CCACHE_COMPILERCHECK");
@@ -1096,7 +1096,7 @@ static void find_compiler(int argc, char **argv)
 
        orig_args = args_init(argc, argv);
 
-       base = str_basename(argv[0]);
+       base = basename(argv[0]);
 
        /* we might be being invoked like "ccache gcc -c foo.c" */
        if (strcmp(base, MYNAME) == 0) {
@@ -1106,7 +1106,7 @@ static void find_compiler(int argc, char **argv)
                        /* a full path was given */
                        return;
                }
-               base = str_basename(argv[1]);
+               base = basename(argv[1]);
        }
 
        /* support user override of the compiler */
@@ -1781,7 +1781,7 @@ int main(int argc, char *argv[])
        }
 
        /* check if we are being invoked as "ccache" */
-       program_name = str_basename(argv[0]);
+       program_name = basename(argv[0]);
        if (strcmp(program_name, MYNAME) == 0) {
                if (argc < 2) {
                        fputs(USAGE_TEXT, stderr);

diff --git a/ccache.h b/ccache.h
index cb87cb771462793744da31b4cb75d248f1b45766..4da2920a47c91bc3898ae3b9778e3bc6415ff7f2 100644 (file)
--- a/ccache.h
+++ b/ccache.h
@@ -80,7 +80,7 @@ char *x_strndup(const char *s, size_t n);
 void *x_realloc(void *ptr, size_t size);
 void *x_malloc(size_t size);
 void traverse(const char *dir, void (*fn)(const char *, struct stat *));
-char *str_basename(const char *s);
+char *basename(const char *s);
 char *dirname(char *s);
 char *remove_extension(const char *path);
 int read_lock_fd(int fd);

diff --git a/cleanup.c b/cleanup.c
index 3af7344837d9febc386d7a50f99b19949d840d0a..aab5c4cba6de53a6064066b613897d4dd4f96396 100644 (file)
--- a/cleanup.c
+++ b/cleanup.c
@@ -93,7 +93,7 @@ static void traverse_fn(const char *fname, struct stat *st)
 
        if (!S_ISREG(st->st_mode)) return;
 
-       p = str_basename(fname);
+       p = basename(fname);
        if (strcmp(p, "stats") == 0) {
                free(p);
                return;
@@ -241,7 +241,7 @@ static void wipe_fn(const char *fname, struct stat *st)
 
        if (!S_ISREG(st->st_mode)) return;
 
-       p = str_basename(fname);
+       p = basename(fname);
        if (strcmp(p, "stats") == 0) {
                free(p);
                return;

diff --git a/execute.c b/execute.c
index 8a54dc14fd661597673e74bbd4b406ada68ba061..b95d8f8e365d9eaffaf721f8069cf84e9b2bd7e1 100644 (file)
--- a/execute.c
+++ b/execute.c
@@ -114,7 +114,7 @@ char *find_executable(const char *name, const char *exclude_name)
                        if (S_ISLNK(st1.st_mode)) {
                                char *buf = x_realpath(fname);
                                if (buf) {
-                                       char *p = str_basename(buf);
+                                       char *p = basename(buf);
                                        if (strcmp(p, exclude_name) == 0) {
                                                /* its a link to "ccache" ! */
                                                free(p);

diff --git a/util.c b/util.c
index af95ee7889115878ce4601f31d691d65fbd06d21..9b770cd3da9a03a5fa9ed816539760d69f85d40c 100644 (file)
--- a/util.c
+++ b/util.c
@@ -475,7 +475,7 @@ void traverse(const char *dir, void (*fn)(const char *, struct stat *))
 
 
 /* return the base name of a file - caller frees */
-char *str_basename(const char *s)
+char *basename(const char *s)
 {
        char *p = strrchr(s, '/');
        if (p) {