summaryrefslogtreecommitdiffstats
path: root/src/syslog_relay.c
diff options
context:
space:
mode:
authorGravatar Nikias Bassen2019-06-11 01:12:49 +0200
committerGravatar Nikias Bassen2019-06-11 01:12:49 +0200
commit59adbacef6d400d4c6458f26daddda24bcdfd635 (patch)
treefab41dc53822655f4be988017be4031be64cac33 /src/syslog_relay.c
parent34444782e22ebfd2abc9e5e9c27e170a839ff66b (diff)
downloadlibimobiledevice-59adbacef6d400d4c6458f26daddda24bcdfd635.tar.gz
libimobiledevice-59adbacef6d400d4c6458f26daddda24bcdfd635.tar.bz2
common: Update thread.c/.h to match the one from libusbmuxd
Diffstat (limited to 'src/syslog_relay.c')
-rw-r--r--src/syslog_relay.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/syslog_relay.c b/src/syslog_relay.c
index 29f4de5..3be84e0 100644
--- a/src/syslog_relay.c
+++ b/src/syslog_relay.c
@@ -81,7 +81,7 @@ LIBIMOBILEDEVICE_API syslog_relay_error_t syslog_relay_client_new(idevice_t devi
81 81
82 syslog_relay_client_t client_loc = (syslog_relay_client_t) malloc(sizeof(struct syslog_relay_client_private)); 82 syslog_relay_client_t client_loc = (syslog_relay_client_t) malloc(sizeof(struct syslog_relay_client_private));
83 client_loc->parent = parent; 83 client_loc->parent = parent;
84 client_loc->worker = (thread_t)NULL; 84 client_loc->worker = THREAD_T_NULL;
85 85
86 *client = client_loc; 86 *client = client_loc;
87 87
@@ -107,7 +107,7 @@ LIBIMOBILEDEVICE_API syslog_relay_error_t syslog_relay_client_free(syslog_relay_
107 debug_info("Joining syslog capture callback worker thread"); 107 debug_info("Joining syslog capture callback worker thread");
108 thread_join(client->worker); 108 thread_join(client->worker);
109 thread_free(client->worker); 109 thread_free(client->worker);
110 client->worker = (thread_t)NULL; 110 client->worker = THREAD_T_NULL;
111 } 111 }
112 free(client); 112 free(client);
113 113
@@ -209,9 +209,9 @@ LIBIMOBILEDEVICE_API syslog_relay_error_t syslog_relay_stop_capture(syslog_relay
209 /* join thread to make it exit */ 209 /* join thread to make it exit */
210 thread_join(client->worker); 210 thread_join(client->worker);
211 thread_free(client->worker); 211 thread_free(client->worker);
212 client->worker = (thread_t)NULL; 212 client->worker = THREAD_T_NULL;
213 client->parent = parent; 213 client->parent = parent;
214 } 214 }
215 215
216 return SYSLOG_RELAY_E_SUCCESS; 216 return SYSLOG_RELAY_E_SUCCESS;
217} \ No newline at end of file 217}