From c3e0fbd9e4d05a751fb8b32a3524cfa9c95c1994 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 16 Dec 2009 16:09:10 +0100 Subject: [PATCH] archive/bz2: use g_path_get_basename() Use g_path_get_basename() instead of manually filtering the path name. Big advantage: g_path_get_basename() cannot fail. --- src/archive/bz2_plugin.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/archive/bz2_plugin.c b/src/archive/bz2_plugin.c index 4e5733225..713dcc234 100644 --- a/src/archive/bz2_plugin.c +++ b/src/archive/bz2_plugin.c @@ -98,7 +98,6 @@ static struct archive_file * bz2_open(char *pathname) { bz2_context *context; - char *name; int len; context = g_malloc(sizeof(*context)); @@ -110,15 +109,7 @@ bz2_open(char *pathname) return NULL; } - //capture filename - name = strrchr(pathname, '/'); - if (name == NULL) { - g_warning("failed to get bzip2 name from %s\n",pathname); - g_free(context); - return NULL; - } - - context->name = g_strdup(name + 1); + context->name = g_path_get_basename(pathname); //remove suffix len = strlen(context->name);