darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

restore behaviour of gp_port_info_list_append, as other components

Browse Source 
assume it and the return value is the index.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@15130 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Marcus Meissner
2014-08-16 13:27:29 +00:00
parent 56c12ac178
commit 7bbda70c0e
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c
View File

@@ -168,18 +168,25 @@ gp_port_info_list_free (GPPortInfoList *list)
* against info.path and - if successfull - will append this entry to the
* list.
*
* \return A gphoto2 error code
* \return A gphoto2 error code, or an index into the port list (excluding generic entries).
* which can be used for gp_port_info_list_get_info.
**/
int
gp_port_info_list_append (GPPortInfoList *list, GPPortInfo info)
{
int generic, i;
C_PARAMS (list);
C_MEM (list->info = realloc (list->info, sizeof (GPPortInfo) * (list->count + 1)));
list->count++;
list->info[list->count - 1] = info;
return GP_OK;
/* Ignore generic entries */
for (generic = i = 0; i < list->count; i++)
if (!strlen (list->info[i]->name))
generic++;
return (list->count - 1 - generic);
}