diff options
| author |  Nikias Bassen | 2021-09-01 15:57:09 +0200 |
|---|---|---|
| committer | Nikias Bassen | 2021-09-01 15:57:09 +0200 |
| commit | c53602cf09a9dec0b82e0f2cfd46616cf7b4ccff (patch) | |
| tree | 6b8097d7d02d0aa11f470fe06df71400a8190f32 /src | |
| parent | 9a9ad5dab9a88705bb0b3261220ba2a52acc31dc (diff) | |
| download | idevicerestore-c53602cf09a9dec0b82e0f2cfd46616cf7b4ccff.tar.gz idevicerestore-c53602cf09a9dec0b82e0f2cfd46616cf7b4ccff.tar.bz2 | |
Remove common code in favor of libimobiledevice-glue
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/common.h | 2 | ||||
| -rw-r--r-- | src/fdr.c | 4 | ||||
| -rw-r--r-- | src/fdr.h | 1 | ||||
| -rw-r--r-- | src/normal.c | 1 | ||||
| -rw-r--r-- | src/restore.c | 4 |
6 files changed, 7 insertions, 9 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 0cfae21..4a99dec 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,6 +4,7 @@ AM_CFLAGS = \ $(libirecovery_CFLAGS) \ $(libimobiledevice_CFLAGS) \ $(libplist_CFLAGS) \ + $(limd_glue_CFLAGS) \ $(libzip_CFLAGS) \ $(zlib_CFLAGS) \ $(openssl_CFLAGS) \ @@ -14,6 +15,7 @@ AM_LDFLAGS = \ $(libirecovery_LIBS) \ $(libimobiledevice_LIBS) \ $(libplist_LIBS) \ + $(limd_glue_LIBS) \ $(libzip_LIBS) \ $(zlib_LIBS) \ $(openssl_LIBS) \ @@ -44,8 +46,6 @@ idevicerestore_SOURCES = \ limera1n.c limera1n.h \ download.c download.h \ locking.c locking.h \ - socket.c socket.h \ - thread.c thread.h \ jsmn.c jsmn.h \ json_plist.c json_plist.h if USE_INTERNAL_SHA diff --git a/src/common.h b/src/common.h index 3a4c069..40112dc 100644 --- a/src/common.h +++ b/src/common.h @@ -37,9 +37,9 @@ extern "C" { #include <plist/plist.h> #include <libirecovery.h> +#include <libimobiledevice-glue/thread.h> #include "idevicerestore.h" -#include "thread.h" #define _MODE_UNKNOWN 0 #define _MODE_WTF 1 @@ -28,8 +28,8 @@ #include <string.h> #include <unistd.h> #include <libimobiledevice/libimobiledevice.h> +#include <libimobiledevice-glue/socket.h> -#include "socket.h" /* from libimobiledevice/common */ #include "common.h" #include "idevicerestore.h" #include "fdr.h" @@ -415,7 +415,7 @@ static int fdr_handle_sync_cmd(fdr_client_t fdr_ctrl) { idevice_error_t device_error = IDEVICE_E_SUCCESS; fdr_client_t fdr; - thread_t fdr_thread = (thread_t)NULL; + THREAD_T fdr_thread = THREAD_T_NULL; int res = 0; uint32_t bytes = 0; char buf[4096]; @@ -27,7 +27,6 @@ extern "C" { #endif #include <libimobiledevice/libimobiledevice.h> -#include "thread.h" /* from libimobiledevice/common */ typedef enum { FDR_CTRL, diff --git a/src/normal.c b/src/normal.c index 301dbbe..15d3e29 100644 --- a/src/normal.c +++ b/src/normal.c @@ -33,7 +33,6 @@ #include "common.h" #include "normal.h" #include "recovery.h" -#include "thread.h" static int normal_idevice_new(struct idevicerestore_client_t* client, idevice_t* device) { diff --git a/src/restore.c b/src/restore.c index d5d1463..69e5191 100644 --- a/src/restore.c +++ b/src/restore.c @@ -3372,7 +3372,7 @@ int restore_device(struct idevicerestore_client_t* client, plist_t build_identit idevice_t device = NULL; restored_client_t restore = NULL; restored_error_t restore_error = RESTORE_E_SUCCESS; - thread_t fdr_thread = (thread_t)NULL; + THREAD_T fdr_thread = THREAD_T_NULL; restore_finished = 0; @@ -3458,7 +3458,7 @@ int restore_device(struct idevicerestore_client_t* client, plist_t build_identit if (!fdr_connect(device, FDR_CTRL, &fdr_control_channel)) { if(thread_new(&fdr_thread, fdr_listener_thread, fdr_control_channel)) { error("ERROR: Failed to start FDR listener thread\n"); - fdr_thread = (thread_t)NULL; /* undefined after failure */ + fdr_thread = THREAD_T_NULL; /* undefined after failure */ } } else { error("ERROR: Failed to start FDR Ctrl channel\n"); |