diff options
| author |   Thierry Bultel <thierry.bultel@iot.bzh> | 2018-05-22 10:51:52 +0200 |
|---|---|---|
| committer |   Romain Forlot <romain.forlot@iot.bzh> | 2018-06-29 19:38:23 +0200 |
| commit | 75ae498dd19d5a10945421d69ae86c0a16f109c8 (patch) | |
| tree | e625c6e455a825e2b20c0a564de1c8f1c602b6eb /ctl-lib/ctl-config.c | |
| parent | 598fe2f3ce3bc091208fe29402c2ac2613558b19 (diff) | |
Fixed compilation warnings with gcc-7.2.0
Replaced some 'size_t' by 'int'
Change-Id: Iaf58b4b65f9aa2e82c0a87af45f21ca62fa4d84e
Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
Diffstat (limited to 'ctl-lib/ctl-config.c')
| -rw-r--r-- | ctl-lib/ctl-config.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ctl-lib/ctl-config.c b/ctl-lib/ctl-config.c index d508b78..334b586 100644 --- a/ctl-lib/ctl-config.c +++ b/ctl-lib/ctl-config.c @@ -65,7 +65,7 @@ json_object* CtlConfigScan(const char *dirList, const char *prefix) { char* ConfigSearch(AFB_ApiT apiHandle, json_object *responseJ) { // We load 1st file others are just warnings size_t p_length; - char *filepath; + char *filepath = NULL; const char *filename; const char*fullpath; @@ -185,7 +185,7 @@ json_object* LoadAdditionalsFiles(AFB_ApiT apiHandle, CtlConfigT *ctlHandle, con json_object* CtlUpdateSectionConfig(AFB_ApiT apiHandle, CtlConfigT *ctlHandle, const char *key, json_object *sectionJ, json_object *filesJ) { json_object *sectionArrayJ; - char *oneFile; + char *oneFile = NULL; const char *bindingPath = GetBindingDirPath(apiHandle); if(! json_object_is_type(sectionJ, json_type_array)) { @@ -200,7 +200,7 @@ json_object* CtlUpdateSectionConfig(AFB_ApiT apiHandle, CtlConfigT *ctlHandle, c json_object_object_add(ctlHandle->configJ, key, sectionArrayJ); if (json_object_get_type(filesJ) == json_type_array) { - size_t length = json_object_array_length(filesJ); + int length = json_object_array_length(filesJ); for (int idx=0; idx < length; idx++) { json_object *oneFileJ = json_object_array_get_idx(filesJ, idx); json_object *responseJ = ScanForConfig(CONTROL_CONFIG_PATH ,CTL_SCAN_RECURSIVE, json_object_get_string(oneFileJ), ".json"); @@ -243,7 +243,7 @@ json_object* LoadAdditionalsFiles(AFB_ApiT apiHandle, CtlConfigT *ctlHandle, con { json_object *filesJ, *filesArrayJ = json_object_new_array(); if (json_object_get_type(sectionJ) == json_type_array) { - size_t length = json_object_array_length(sectionJ); + int length = json_object_array_length(sectionJ); for (int idx=0; idx < length; idx++) { json_object *obj = json_object_array_get_idx(sectionJ, idx); int hasFiles = json_object_object_get_ex(obj, "files", &filesJ); |