diff options
| author | Brad King <brad.king@kitware.com> | 2017-02-10 18:36:11 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2017-02-10 18:36:11 (GMT) |
| commit | bb72fff2f09ef307b74de35ab00dfc08e6da83ee (patch) | |
| tree | b919209648ec35acaf9ce10c23471bc9cbd7d549 /Utilities/cmcurl/lib/nwlib.c | |
| parent | f236c9cff9dcb4d4534e5532a9792e648d48d921 (diff) | |
| parent | d4da4755cdab41679ae7c2fa6ef2984a2d6837ec (diff) | |
| download | CMake-bb72fff2f09ef307b74de35ab00dfc08e6da83ee.zip CMake-bb72fff2f09ef307b74de35ab00dfc08e6da83ee.tar.gz CMake-bb72fff2f09ef307b74de35ab00dfc08e6da83ee.tar.bz2 | |
Merge topic 'update-curl'
d4da4755 Help: Add notes for topic 'update-curl'
14c77153 Tests: Fix `file://` URLs given to curl
73ae6700 curl: Fix passing _WINSOCKAPI_ macro to compiler
1df9d5f9 Merge branch 'upstream-curl' into update-curl
4cc2908f curl 2016-12-22 (44b9b4d4)
f4a3290a curl: Update script to get curl 7.52.1
Diffstat (limited to 'Utilities/cmcurl/lib/nwlib.c')
| -rw-r--r-- | Utilities/cmcurl/lib/nwlib.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Utilities/cmcurl/lib/nwlib.c b/Utilities/cmcurl/lib/nwlib.c index 42b6aa0..290cbe3 100644 --- a/Utilities/cmcurl/lib/nwlib.c +++ b/Utilities/cmcurl/lib/nwlib.c @@ -184,7 +184,8 @@ int GetOrSetUpData(int id, libdata_t **appData, */ NXLock(gLibLock); - if(!(app_data = (libdata_t *) get_app_data(id))) { + app_data = (libdata_t *) get_app_data(id); + if(!app_data) { app_data = malloc(sizeof(libdata_t)); if(app_data) { @@ -259,7 +260,8 @@ int GetOrSetUpData(int id, libdata_t **appData, err = ENOMEM; } - if((err = NXKeySetValue(key, thread_data))) { + err = NXKeySetValue(key, thread_data); + if(err) { free(thread_data->twentybytes); free(thread_data); thread_data = (libthreaddata_t *) NULL; @@ -303,14 +305,14 @@ void DisposeThreadData(void *data) /* For native CLib-based NLM seems we can do a bit more simple. */ #include <nwthread.h> -int main (void) +int main(void) { /* initialize any globals here... */ /* do this if any global initializing was done SynchronizeStart(); */ - ExitThread (TSR_THREAD, 0); + ExitThread(TSR_THREAD, 0); return 0; } |