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

unshadow some variabales, fix build

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@13561 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Marcus Meissner
2011-03-08 14:53:55 +00:00
parent 9992435ac2
commit 89a2ae8917
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
camlibs/ptp2/library.c
View File

@@ -5369,7 +5369,6 @@ ptp_list_folder (PTPParams *params, uint32_t storage, uint32_t handle) {
uint16_t ret;
uint32_t xhandle = handle;
PTPObject *newobs;
PTPObject *ob;
PTPObjectHandles handles;
gp_log (GP_LOG_DEBUG, "ptp_list_folder", "(storage=0x%08x, handle=0x%08x)", storage, handle);
@@ -5377,6 +5376,7 @@ ptp_list_folder (PTPParams *params, uint32_t storage, uint32_t handle) {
return PTP_RC_OK;
if (handle) { /* 0 is the virtual root */
PTPObject *ob;
/* first check if object itself is loaded, and get its objectinfo. */
ret = ptp_object_want (params, handle, PTPOBJECT_OBJECTINFO_LOADED, &ob);
if (ret != PTP_RC_OK)

2
camlibs/ptp2/usb.c
View File

@@ -546,7 +546,7 @@ ptp_usb_event (PTPParams* params, PTPContainer* event, int wait)
}
/* if we read anything over interrupt endpoint it must be an event */
/* build an appropriate PTPContainer */
resp->Nparam = (rlen-12)/4;
event->Nparam = (rlen-12)/4;
event->Code = dtoh16(usbevent.code);
event->SessionID=params->session_id;
event->Transaction_ID=dtoh32(usbevent.trans_id);