test for duplicated names.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14591 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
@@ -183,6 +183,7 @@ main (int argc, char *argv[])
|
||||
int i;
|
||||
int count;
|
||||
const char *fmt_str = NULL;
|
||||
char lastmodel[200];
|
||||
|
||||
parse_command_line (argc, argv);
|
||||
|
||||
@@ -244,6 +245,7 @@ main (int argc, char *argv[])
|
||||
break;
|
||||
}
|
||||
|
||||
strcpy(lastmodel,"xxx");
|
||||
/* For each camera in the list, add a text snippet to the
|
||||
* output file. */
|
||||
for (i = 0; i < count; i++) {
|
||||
@@ -252,6 +254,12 @@ main (int argc, char *argv[])
|
||||
CHECK (gp_abilities_list_get_abilities (al, i, &abilities));
|
||||
camlib_basename = path_basename(abilities.library);
|
||||
|
||||
if (!strcmp(lastmodel, abilities.model)) {
|
||||
fprintf(stderr,"Duplicated model name in camera list: %s\n", lastmodel);
|
||||
exit(1);
|
||||
}
|
||||
strcpy(lastmodel,abilities.model);
|
||||
|
||||
switch (format) {
|
||||
case FMT_HEADED_TEXT:
|
||||
if ( ((i%25)== 0) &&
|
||||
|
||||
Reference in New Issue
Block a user