From: Javier K. <jk...@us...> - 2012-10-07 06:47:14
|
commit 6c008dfc0c30e4e0a0454b033ccfea8bfac3dba8 Author: Jonathan Neuschäfer <j.n...@gm...> Date: Thu Sep 27 20:28:31 2012 +0200 replace deprecated g_basename() g_basename is deprecated since GLib 2.2. As all of these calls are done just before the program terminates, we might as well skip the g_free. tests/get-timezone.c | 4 +++- tests/itdb_main.c | 5 ++++- tests/test-cp.cc | 4 +++- tests/test-fw-id.c | 4 +++- tests/test-ls.c | 6 ++++-- tests/test-rebuild-db.cc | 4 +++- tools/ipod-time-sync.c | 6 ++++-- tools/read-sysinfoextended.c | 6 ++++-- 8 files changed, 28 insertions(+), 11 deletions(-) --- diff --git a/tests/get-timezone.c b/tests/get-timezone.c index e453ca3..60977d9 100644 --- a/tests/get-timezone.c +++ b/tests/get-timezone.c @@ -28,7 +28,9 @@ int main (int argc, char **argv) if (argc >= 2) { mountpoint = argv[1]; } else { - g_print ("Usage: %s <mountpoint>\n\n", g_basename(argv[0])); + char *basename = g_path_get_basename(argv[0]); + g_print ("Usage: %s <mountpoint>\n\n", basename); + g_free (basename); return -1; } diff --git a/tests/itdb_main.c b/tests/itdb_main.c index e7723bb..1cc03a4 100644 --- a/tests/itdb_main.c +++ b/tests/itdb_main.c @@ -55,7 +55,10 @@ main (int argc, char *argv[]) if (infile == 0) { - printf ("Usage: %s <infile> [<outfile>]\n", g_basename(argv[0])); + char *basename = g_path_get_basename(argv[0]); + printf ("Usage: %s <infile> [<outfile>]\n", basename); + g_free(basename); + exit (0); } diff --git a/tests/test-cp.cc b/tests/test-cp.cc index cec778d..73a1dd9 100644 --- a/tests/test-cp.cc +++ b/tests/test-cp.cc @@ -108,8 +108,10 @@ int main (int argc, char **argv) GError *error; if (argc != 3) { + char *basename = g_path_get_basename(argv[0]); g_print ("Usage:\n"); - g_print ("%s <filename> <mountpoint> \n", g_basename (argv[0])); + g_print ("%s <filename> <mountpoint> \n", basename); + g_free (basename); exit (1); } diff --git a/tests/test-fw-id.c b/tests/test-fw-id.c index 7490001..085123a 100644 --- a/tests/test-fw-id.c +++ b/tests/test-fw-id.c @@ -42,7 +42,9 @@ main (int argc, char *argv[]) char *fwid; if (argc < 2) { - g_print ("Usage: %s <mountpoint>\n", g_basename (argv[0])); + char *basename = g_path_get_basename(argv[0]); + g_print ("Usage: %s <mountpoint>\n", basename); + g_free (basename); return 1; } diff --git a/tests/test-ls.c b/tests/test-ls.c index e28cd9c..464824e 100644 --- a/tests/test-ls.c +++ b/tests/test-ls.c @@ -118,10 +118,12 @@ main (int argc, char *argv[]) if (mountpoint == NULL) { + char *basename = g_path_get_basename (argv[0]); g_print ("Usage: %s <mountpoint>|-l [<playlistname>]\n\n" "-l - List from the local repository (~" LOCALDB ")\n" - "<playlistname> - name of the playlist to list (optional)\n", - g_basename(argv[0])); + "<playlistname> - name of the playlist to list (optional)\n", + basename); + g_free (basename); exit (0); } diff --git a/tests/test-rebuild-db.cc b/tests/test-rebuild-db.cc index fbcaf1e..f2b05ef 100644 --- a/tests/test-rebuild-db.cc +++ b/tests/test-rebuild-db.cc @@ -216,8 +216,10 @@ int main (int argc, char **argv) GError *error; if (argc != 2) { + char *basename = g_path_get_basename(argv[0]); g_print ("Usage:\n"); - g_print ("%s <mountpoint>\n", g_basename (argv[0])); + g_print ("%s <mountpoint>\n", basename); + g_free (basename); exit (1); } diff --git a/tools/ipod-time-sync.c b/tools/ipod-time-sync.c index 0cc62f1..a0cc163 100644 --- a/tools/ipod-time-sync.c +++ b/tools/ipod-time-sync.c @@ -34,8 +34,10 @@ int main (int argc, char **argv) { if (argc < 2) { - g_print (_("usage: %s <device> [timezone]\n"), g_basename (argv[0])); - return 1; + char *basename = g_path_get_basename (argv[0]); + g_print (_("usage: %s <device> [timezone]\n"), basename); + g_free (basename); + return 1; } sync_time (argv[1], NULL); diff --git a/tools/read-sysinfoextended.c b/tools/read-sysinfoextended.c index b3afd2c..8262137 100644 --- a/tools/read-sysinfoextended.c +++ b/tools/read-sysinfoextended.c @@ -78,8 +78,10 @@ main (int argc, char **argv) char *xml; if (argc < 3) { - g_print (_("usage: %s <device|uuid|bus device> <mountpoint>\n"), g_basename (argv[0])); - return 1; + char *basename = g_path_get_basename (argv[0]); + g_print (_("usage: %s <device|uuid|bus device> <mountpoint>\n"), basename); + g_free (basename); + return 1; } xml = NULL; |