From 89a2ae8917018162fc3bc59ebef5f4bd5921cf5f Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 8 Mar 2011 14:53:55 +0000 Subject: [PATCH] unshadow some variabales, fix build git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@13561 67ed7778-7388-44ab-90cf-0a291f65f57c --- camlibs/ptp2/library.c | 2 +- camlibs/ptp2/usb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c index 1f5b92c43..a7e46a480 100644 --- a/camlibs/ptp2/library.c +++ b/camlibs/ptp2/library.c @@ -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) diff --git a/camlibs/ptp2/usb.c b/camlibs/ptp2/usb.c index f22ddaa29..5fdbfb704 100644 --- a/camlibs/ptp2/usb.c +++ b/camlibs/ptp2/usb.c @@ -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);