summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Jonathan Beck2008-08-02 12:53:32 +0200
committerGravatar Matt Colyer2008-08-05 23:28:10 -0700
commitb6ed54477c00e2b4572e898fe0a47aa64a028c26 (patch)
treef29a2e47e45e5acefd4f0d6fc95e6c828f0b1e34
parentdceb48d2745014ef68ab218f2257e5f0642d998c (diff)
downloadlibimobiledevice-b6ed54477c00e2b4572e898fe0a47aa64a028c26.tar.gz
libimobiledevice-b6ed54477c00e2b4572e898fe0a47aa64a028c26.tar.bz2
fixes some warnings
Signed-off-by: Matt Colyer <matt@colyer.name>
-rw-r--r--src/lockdown.c5
-rw-r--r--src/userpref.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/src/lockdown.c b/src/lockdown.c
index 4fd8a66..7d5c16d 100644
--- a/src/lockdown.c
+++ b/src/lockdown.c
@@ -59,7 +59,7 @@ int lockdownd_recv(lockdownd_client *control, char **dump_data) {
59 char *receive; 59 char *receive;
60 uint32 datalen = 0, bytes = 0; 60 uint32 datalen = 0, bytes = 0;
61 61
62 if (!control->in_SSL) bytes = mux_recv(control->connection, (char *)&datalen, sizeof(datalen)); 62 if (!control->in_SSL) bytes = mux_recv(control->iphone, control->connection, (char*)&datalen, sizeof(datalen));
63 else bytes = gnutls_record_recv(*control->ssl_session, &datalen, sizeof(datalen)); 63 else bytes = gnutls_record_recv(*control->ssl_session, &datalen, sizeof(datalen));
64 datalen = ntohl(datalen); 64 datalen = ntohl(datalen);
65 65
@@ -107,7 +107,8 @@ int lockdownd_hello(lockdownd_client *control) {
107 char *XML_content; 107 char *XML_content;
108 uint32 length; 108 uint32 length;
109 109
110 xmlDocDumpMemory(plist, (xmlChar **)&XML_content, &length); 110 xmlDocDumpMemory(plist, (xmlChar**)&XML_content, &length);
111
111 bytes = lockdownd_send(control, XML_content, length); 112 bytes = lockdownd_send(control, XML_content, length);
112 113
113 xmlFree(XML_content); 114 xmlFree(XML_content);
diff --git a/src/userpref.c b/src/userpref.c
index 27aded5..bc92f96 100644
--- a/src/userpref.c
+++ b/src/userpref.c
@@ -44,7 +44,7 @@ char* get_host_id()
44 44
45 gchar* loc_host_id = g_key_file_get_value(key_file, "Global", "HostID", NULL); 45 gchar* loc_host_id = g_key_file_get_value(key_file, "Global", "HostID", NULL);
46 if (loc_host_id) 46 if (loc_host_id)
47 host_id = strdup(loc_host_id); 47 host_id = strdup((char*)loc_host_id);
48 g_free(loc_host_id); 48 g_free(loc_host_id);
49 } 49 }
50 g_key_file_free(key_file); 50 g_key_file_free(key_file);