summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2009-07-30 21:03:54 +0000
committerMarcus Meissner <marcus@jet.franken.de>2009-07-30 21:03:54 +0000
commit681860692b419d2a653c4ef248f86dc4b0eea5a1 (patch)
treef405c03868ea58f33aeb3acbf3316b2c1ad6fad8
parent936dbaed293ac1473ec69473102cf25be333cc0e (diff)
downloadlibgphoto2-681860692b419d2a653c4ef248f86dc4b0eea5a1.tar.gz
c89/sus fixes
git-svn-id: https://svn.code.sf.net/p/gphoto/code/branches/libgphoto2-2_4/libgphoto2@12317 67ed7778-7388-44ab-90cf-0a291f65f57c
-rw-r--r--tests/test-camera-list.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/test-camera-list.c b/tests/test-camera-list.c
index 67c1105cb..55aee6fa9 100644
--- a/tests/test-camera-list.c
+++ b/tests/test-camera-list.c
@@ -90,7 +90,7 @@ print_hline (void)
/** C equivalent of basename(1) */
static const char *
-basename (const char *pathname)
+path_basename (const char *pathname)
{
char *result, *tmp;
/* remove path part from camlib name */
@@ -159,7 +159,7 @@ parse_command_line (const int argc, char *argv[])
} else if (strcmp(argv[i], "--format=camlibs") == 0) {
format = FMT_FLAT_CAMLIBS;
} else {
- const char * const bn = basename(argv[0]);
+ const char * const bn = path_basename(argv[0]);
printf("Unknown command line parameter %d: \"%s\"\n",
i, argv[i]);
printf("Sorry, no more help to give but the "
@@ -248,7 +248,7 @@ main (int argc, char *argv[])
CameraAbilities abilities;
const char *camlib_basename;
CHECK (gp_abilities_list_get_abilities (al, i, &abilities));
- camlib_basename = basename(abilities.library);
+ camlib_basename = path_basename(abilities.library);
switch (format) {
case FMT_HEADED_TEXT: