From: Joel Rosdahl <joel@rosdahl.net>
Date: Sun, 28 Feb 2010 15:30:08 +0000 (+0100)
Subject: Rename str_basename() to basename()
X-Git-Tag: v3.0pre0~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cff73fff68de516825b46efc4d794454249dd8d4;p=thirdparty%2Fccache.git

Rename str_basename() to basename()
---

diff --git a/ccache.c b/ccache.c
index 8308f8f68..f37d23997 100644
--- 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 cb87cb771..4da2920a4 100644
--- 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 3af734483..aab5c4cba 100644
--- 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 8a54dc14f..b95d8f8e3 100644
--- 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 af95ee788..9b770cd3d 100644
--- 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) {