[PATCH 1/4] Clean up my_basename()

Combines five implementations found in depmod.c, insmod.c, modprobe.c and
util.c. The new version is implemented as a macro.

Signed-off-by: Andreas Robinson <andr345@gmail.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/tables.c b/tables.c
index 1dccaf3..e3f005f 100644
--- a/tables.c
+++ b/tables.c
@@ -4,15 +4,16 @@
 #include <ctype.h>
 #include "depmod.h"
 #include "tables.h"
+#include "util.h"
 
 /* Turn /lib/modules/2.5.49/kernel/foo.ko(.gz) => foo */
 static void make_shortname(char *dest, const char *src)
 {
 	char *ext;
-	const char *slash;
+	const char *bname;
 
-	slash = strrchr(src, '/') ?: src-1;
-	strcpy(dest, slash + 1);
+	bname = my_basename(src);
+	strcpy(dest, bname);
 	ext = strchr(dest, '.');
 	if (ext)
 		*ext = '\0';