Follow glib style and rename iphone_free_device to iphone_device_free

9 files changed, 20 insertions, 20 deletions

diff --git a/dev/afccheck.c b/dev/afccheck.c
index 370742b..067dd5b 100644
--- a/dev/afccheck.c
+++ b/dev/afccheck.c
@@ -105,13 +105,13 @@ int main(int argc, char *argv[])
         }
 
         if (LOCKDOWN_E_SUCCESS != lockdownd_client_new(phone, &client)) {
-                iphone_free_device(phone);
+                iphone_device_free(phone);
                 return 1;
         }
 
         if (LOCKDOWN_E_SUCCESS == lockdownd_start_service(client, "com.apple.afc", &port) && !port) {
                 lockdownd_client_free(client);
-                iphone_free_device(phone);
+                iphone_device_free(phone);
                 fprintf(stderr, "Something went wrong when starting AFC.");
                 return 1;
         }
@@ -137,7 +137,7 @@ int main(int argc, char *argv[])
         }
 
         lockdownd_client_free(client);
-        iphone_free_device(phone);
+        iphone_device_free(phone);
 
         return 0;
 }
diff --git a/dev/iphone_id.c b/dev/iphone_id.c
index 1b8f8a1..f68fc8b 100644
--- a/dev/iphone_id.c
+++ b/dev/iphone_id.c
@@ -69,7 +69,7 @@ int main(int argc, char **argv)
         }
 
         if (LOCKDOWN_E_SUCCESS != lockdownd_client_new(phone, &client)) {
-                iphone_free_device(phone);
+                iphone_device_free(phone);
                 fprintf(stderr, "ERROR: Connecting to device failed!\n");
                 return -2;
         }
@@ -80,7 +80,7 @@ int main(int argc, char **argv)
         }
 
         lockdownd_client_free(client);
-        iphone_free_device(phone);
+        iphone_device_free(phone);
 
         if (ret == 0) {
                 printf("%s\n", devname);
diff --git a/dev/iphoneinfo.c b/dev/iphoneinfo.c
index 52d7c8a..790804c 100644
--- a/dev/iphoneinfo.c
+++ b/dev/iphoneinfo.c
@@ -137,7 +137,7 @@ int main(int argc, char *argv[])
         }
 
         if (LOCKDOWN_E_SUCCESS != lockdownd_client_new(phone, &client)) {
-                iphone_free_device(phone);
+                iphone_device_free(phone);
                 return -1;
         }
 
@@ -170,7 +170,7 @@ int main(int argc, char *argv[])
         if (domain != NULL)
                 free(domain);
         lockdownd_client_free(client);
-        iphone_free_device(phone);
+        iphone_device_free(phone);
 
         return 0;
 }
diff --git a/dev/lckdclient.c b/dev/lckdclient.c
index 4dcb0b4..b880253 100644
--- a/dev/lckdclient.c
+++ b/dev/lckdclient.c
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
                 free(uuid);
 
         if (LOCKDOWN_E_SUCCESS != lockdownd_client_new(phone, &client)) {
-                iphone_free_device(phone);
+                iphone_device_free(phone);
                 return -1;
         }
 
@@ -109,7 +109,7 @@ int main(int argc, char *argv[])
         }
         clear_history();
         lockdownd_client_free(client);
-        iphone_free_device(phone);
+        iphone_device_free(phone);
 
         return 0;
 }
diff --git a/dev/main.c b/dev/main.c
index 69b0b80..5551ed9 100644
--- a/dev/main.c
+++ b/dev/main.c
@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
                 free(uuid);
 
         if (LOCKDOWN_E_SUCCESS != lockdownd_client_new(phone, &client)) {
-                iphone_free_device(phone);
+                iphone_device_free(phone);
                 printf("Exiting.\n");
                 return -1;
         }
@@ -249,7 +249,7 @@ int main(int argc, char *argv[])
         printf("All done.\n");
 
         lockdownd_client_free(client);
-        iphone_free_device(phone);
+        iphone_device_free(phone);
 
         return 0;
 }
diff --git a/dev/msyncclient.c b/dev/msyncclient.c
index 6ab7c79..5fffe7a 100644
--- a/dev/msyncclient.c
+++ b/dev/msyncclient.c
@@ -142,7 +142,7 @@ int main(int argc, char *argv[])
         }
 
         if (LOCKDOWN_E_SUCCESS != lockdownd_client_new(phone, &client)) {
-                iphone_free_device(phone);
+                iphone_device_free(phone);
                 return -1;
         }
 
@@ -162,7 +162,7 @@ int main(int argc, char *argv[])
         printf("All done.\n");
 
         lockdownd_client_free(client);
-        iphone_free_device(phone);
+        iphone_device_free(phone);
 
         return 0;
 }
diff --git a/dev/syslog_relay.c b/dev/syslog_relay.c
index 0c41c94..58a2544 100644
--- a/dev/syslog_relay.c
+++ b/dev/syslog_relay.c
@@ -101,7 +101,7 @@ int main(int argc, char *argv[])
         }
 
         if (LOCKDOWN_E_SUCCESS != lockdownd_client_new(phone, &client)) {
-                iphone_free_device(phone);
+                iphone_device_free(phone);
                 return -1;
         }
 
@@ -148,7 +148,7 @@ int main(int argc, char *argv[])
                 printf("ERROR: Could not start service com.apple.syslog_relay.\n");
         }
 
-        iphone_free_device(phone);
+        iphone_device_free(phone);
 
         return 0;
 }
diff --git a/include/libiphone/libiphone.h b/include/libiphone/libiphone.h
index 895e809..7974526 100644
--- a/include/libiphone/libiphone.h
+++ b/include/libiphone/libiphone.h
@@ -58,10 +58,10 @@ typedef struct iphone_device_int *iphone_device_t;
 void iphone_set_debug_mask(uint16_t mask);
 void iphone_set_debug_level(int level);
 
-//device related functions
+/* Interface */
 iphone_error_t iphone_get_device(iphone_device_t *device);
 iphone_error_t iphone_get_device_by_uuid(iphone_device_t *device, const char *uuid);
-iphone_error_t iphone_free_device(iphone_device_t device);
+iphone_error_t iphone_device_free(iphone_device_t device);
 uint32_t iphone_get_device_handle(iphone_device_t device);
 iphone_error_t iphone_device_get_uuid(iphone_device_t device, char **uuid);
 
diff --git a/src/iphone.c b/src/iphone.c
index 93d7b5d..bdabc35 100644
--- a/src/iphone.c
+++ b/src/iphone.c
@@ -52,11 +52,11 @@ iphone_error_t iphone_get_device_by_uuid(iphone_device_t * device, const char *u
         }
         if (dev_list && dev_list[0].handle > 0) {
                 if (!uuid) {
-                        // select first device found if no UUID specified
+                        /* select first device found if no UUID specified */
                         handle = dev_list[0].handle;
                         strcpy(serial_number, dev_list[0].serial_number);
                 } else {
-                        // otherwise walk through the list
+                        /* otherwise walk through the list */
                         for (i = 0; dev_list[i].handle > 0; i++) {
                                 log_debug_msg("%s: device handle=%d, uuid=%s\n", __func__, dev_list[i].handle, dev_list[i].serial_number);
                                 if (strcasecmp(uuid, dev_list[i].serial_number) == 0) {
@@ -119,7 +119,7 @@ iphone_error_t iphone_device_get_uuid(iphone_device_t device, char **uuid)
  * 
  * @param phone A pointer to an iPhone structure.
  */
-iphone_error_t iphone_free_device(iphone_device_t device)
+iphone_error_t iphone_device_free(iphone_device_t device)
 {
         if (!device)
                 return IPHONE_E_INVALID_ARG;