diff options
| author |  Jonathan Beck | 2009-01-04 22:21:15 +0100 |
|---|---|---|
| committer | Jonathan Beck | 2009-01-04 22:21:15 +0100 |
| commit | 5514a3b2a9734d311e4f6014585f922e0b748cab (patch) | |
| tree | ca88a32519d6a07da72d15632de7af04461f7ba8 /src/iphone.c | |
| parent | 4301ef9bb8e9d06ffa4e9172191d58ede5e16f5d (diff) | |
| parent | 5cde55426112a8cb79d809dae5f61e347c007212 (diff) | |
| download | libimobiledevice-5514a3b2a9734d311e4f6014585f922e0b748cab.tar.gz libimobiledevice-5514a3b2a9734d311e4f6014585f922e0b748cab.tar.bz2 | |
Merge branch 'master' into plist
Conflicts:
src/AFC.c
src/lockdown.c
src/lockdown.h
src/plist.c
src/plist.h
Diffstat (limited to 'src/iphone.c')
| -rw-r--r-- | src/iphone.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/iphone.c b/src/iphone.c index b7f6cc4..32d27f6 100644 --- a/src/iphone.c +++ b/src/iphone.c @@ -42,7 +42,7 @@ * descriptor on return. * @return IPHONE_E_SUCCESS if ok, otherwise an error code. */ -iphone_error_t iphone_get_specific_device(int bus_n, int dev_n, iphone_device_t * device) +static iphone_error_t iphone_get_specific_device(unsigned int bus_n, int dev_n, iphone_device_t * device) { struct usb_bus *bus, *busses; struct usb_device *dev; @@ -146,7 +146,7 @@ iphone_error_t iphone_get_specific_device(int bus_n, int dev_n, iphone_device_t */ iphone_error_t iphone_get_device(iphone_device_t * device) { - struct usb_bus *bus, *busses; + struct usb_bus *bus; struct usb_device *dev; usb_init(); @@ -214,7 +214,7 @@ int send_to_phone(iphone_device_t phone, char *data, int datalen) } else { return bytes; } - + /* Should not be reached */ return -1; } |