aboutsummaryrefslogtreecommitdiffstats
path: root/ctl-lib
diff options
context:
space:
mode:
authorThierry Bultel <thierry.bultel@iot.bzh>2018-05-22 10:51:52 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2018-12-13 15:02:54 +0100
commitd0253b51ca38dde4358446edf92e2baeafa5f12f (patch)
tree4d5e5ab58cfe9497f62f51a586b981c8b6d85e82 /ctl-lib
parentddb150437e863dd95ae0e58005a99771a050fef3 (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')
-rw-r--r--ctl-lib/ctl-action.c2
-rw-r--r--ctl-lib/ctl-config.c8
-rw-r--r--ctl-lib/ctl-lua.c4
-rw-r--r--ctl-lib/ctl-plugin.c4
4 files changed, 9 insertions, 9 deletions
diff --git a/ctl-lib/ctl-action.c b/ctl-lib/ctl-action.c
index f25e137..d460a27 100644
--- a/ctl-lib/ctl-action.c
+++ b/ctl-lib/ctl-action.c
@@ -338,7 +338,7 @@ CtlActionT *ActionConfig(AFB_ApiT apiHandle, json_object *actionsJ, int exportAp
// action array is close with a nullvalue;
if (json_object_is_type(actionsJ, json_type_array)) {
- size_t count = json_object_array_length(actionsJ);
+ int count = json_object_array_length(actionsJ);
actions = calloc(count + 1, sizeof (CtlActionT));
for (int idx = 0; idx < count; idx++) {
diff --git a/ctl-lib/ctl-config.c b/ctl-lib/ctl-config.c
index 4e9d01d..de9f10e 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;
@@ -184,7 +184,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)) {
@@ -199,7 +199,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");
@@ -242,7 +242,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);
diff --git a/ctl-lib/ctl-lua.c b/ctl-lib/ctl-lua.c
index 15e1fd8..7008cc4 100644
--- a/ctl-lib/ctl-lua.c
+++ b/ctl-lib/ctl-lua.c
@@ -114,7 +114,7 @@ static int LuaPushArgument(CtlSourceT *source, json_object *argsJ) {
}
case json_type_array:
{
- size_t length = json_object_array_length(argsJ);
+ int length = json_object_array_length(argsJ);
lua_newtable(luaState);
for (int idx = 0; idx < length; idx++) {
json_object *val = json_object_array_get_idx(argsJ, idx);
@@ -861,7 +861,7 @@ static int LuaDoString(const char *script, CtlSourceT *source) {
// Execute LUA code from received API request
static void LuaDoAction(LuaDoActionT action, AFB_ReqT request) {
- int err, count = 0;
+ int err = 0, count = 0;
CtlSourceT *source = alloca(sizeof (CtlSourceT));
source->request = request;
diff --git a/ctl-lib/ctl-plugin.c b/ctl-lib/ctl-plugin.c
index d20950f..505daf1 100644
--- a/ctl-lib/ctl-plugin.c
+++ b/ctl-lib/ctl-plugin.c
@@ -194,7 +194,7 @@ static int LoadFoundPlugins(AFB_ApiT apiHandle, json_object *scanResult, json_ob
char *fullpath;
char *ext;
int i;
- size_t len;
+ int len;
json_object *object = NULL;
pluginpath[CONTROL_MAXPATH_LEN - 1] = '\0';
@@ -365,7 +365,7 @@ static int PluginLoad (AFB_ApiT apiHandle, CtlPluginT *ctlPlugin, json_object *p
int PluginConfig(AFB_ApiT apiHandle, CtlSectionT *section, json_object *pluginsJ) {
int err = 0;
int idx = 0;
- size_t length = 0;
+ int length = 0;
if (ctlPlugins)
{