summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2019-11-05 00:45:30 +0100
committerPetr Štetiar <ynezz@true.cz>2019-11-14 22:01:12 +0100
commit8dd50da20de0ece65118b2b4b71f8df8ac3a1f6d (patch)
tree68452c6626b3767fb4e0e282df10bf4bfb49992a
parenta2cab3b088a29b885e33b923edb062badfb92346 (diff)
downloaduci-8dd50da20de0ece65118b2b4b71f8df8ac3a1f6d.tar.gz
lua: fix error handling
scan-build from clang version 9 has reported following issues: uci.c:389:3: warning: Value stored to 'err' is never read err = UCI_ERR_INVAL; ^ ~~~~~~~~~~~~~ uci.c:393:3: warning: Value stored to 'err' is never read err = UCI_ERR_NOTFOUND; ^ ~~~~~~~~~~~~~~~~ uci.c:417:4: warning: Value stored to 'err' is never read err = UCI_ERR_INVAL; ^ ~~~~~~~~~~~~~ uci.c:524:3: warning: Value stored to 'err' is never read err = UCI_ERR_INVAL; ^ ~~~~~~~~~~~~~ uci.c:533:3: warning: Value stored to 'err' is never read err = UCI_ERR_INVAL; ^ ~~~~~~~~~~~~~ uci.c:565:4: warning: Value stored to 'err' is never read err = UCI_ERR_INVAL; ^ ~~~~~~~~~~~~~ uci.c:575:3: warning: Value stored to 'err' is never read err = UCI_ERR_INVAL; ^ ~~~~~~~~~~~~~ uci.c:584:3: warning: Value stored to 'err' is never read err = UCI_ERR_INVAL; ^ ~~~~~~~~~~~~~ uci.c:642:3: warning: Value stored to 'err' is never read err = UCI_ERR_INVAL; ^ ~~~~~~~~~~~~~ uci.c:651:3: warning: Value stored to 'err' is never read err = UCI_ERR_INVAL; ^ ~~~~~~~~~~~~~ Signed-off-by: Petr Štetiar <ynezz@true.cz>
-rw-r--r--lua/uci.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/lua/uci.c b/lua/uci.c
index ad08299..ecfb299 100644
--- a/lua/uci.c
+++ b/lua/uci.c
@@ -386,11 +386,11 @@ uci_lua_get_any(lua_State *L, bool all)
lookup_ptr(ctx, &ptr, NULL, true);
if (!all && !ptr.s) {
- err = UCI_ERR_INVAL;
+ ctx->err = UCI_ERR_INVAL;
goto error;
}
if (!(ptr.flags & UCI_LOOKUP_COMPLETE)) {
- err = UCI_ERR_NOTFOUND;
+ ctx->err = UCI_ERR_NOTFOUND;
goto error;
}
@@ -414,7 +414,7 @@ uci_lua_get_any(lua_State *L, bool all)
uci_push_option(L, ptr.o);
break;
default:
- err = UCI_ERR_INVAL;
+ ctx->err = UCI_ERR_INVAL;
goto error;
}
if (s)
@@ -521,7 +521,7 @@ uci_lua_rename(lua_State *L)
ptr.option = NULL;
break;
default:
- err = UCI_ERR_INVAL;
+ ctx->err = UCI_ERR_INVAL;
goto error;
}
@@ -530,7 +530,7 @@ uci_lua_rename(lua_State *L)
goto error;
if (((ptr.s == NULL) && (ptr.option != NULL)) || (ptr.value == NULL)) {
- err = UCI_ERR_INVAL;
+ ctx->err = UCI_ERR_INVAL;
goto error;
}
@@ -562,7 +562,7 @@ uci_lua_reorder(lua_State *L)
case 1:
/* Format: uci.set("p.s=v") or uci.set("p.s=v") */
if (ptr.option) {
- err = UCI_ERR_INVAL;
+ ctx->err = UCI_ERR_INVAL;
goto error;
}
break;
@@ -572,7 +572,7 @@ uci_lua_reorder(lua_State *L)
ptr.option = NULL;
break;
default:
- err = UCI_ERR_INVAL;
+ ctx->err = UCI_ERR_INVAL;
goto error;
}
@@ -581,7 +581,7 @@ uci_lua_reorder(lua_State *L)
goto error;
if ((ptr.s == NULL) || (ptr.value == NULL)) {
- err = UCI_ERR_INVAL;
+ ctx->err = UCI_ERR_INVAL;
goto error;
}
@@ -638,7 +638,7 @@ uci_lua_set(lua_State *L)
ptr.option = NULL;
break;
default:
- err = UCI_ERR_INVAL;
+ ctx->err = UCI_ERR_INVAL;
goto error;
}
@@ -647,7 +647,7 @@ uci_lua_set(lua_State *L)
goto error;
if (((ptr.s == NULL) && (ptr.option != NULL)) || (ptr.value == NULL)) {
- err = UCI_ERR_INVAL;
+ ctx->err = UCI_ERR_INVAL;
goto error;
}