Merge branch 'master' into plist

Conflicts:

	src/AFC.c
	src/lockdown.c
	src/lockdown.h
	src/plist.c
	src/plist.h

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;
 }