summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2016-08-06 10:27:32 +0100
committerVincent Sanders <vince@kyllikki.org>2016-08-06 10:27:32 +0100
commitc0f4bbb3083b56bf4f1e089a40ab059233b88495 (patch)
tree744ffbe8561c00bff877e1b260e400a72842fdf4
parent40ae120360a956daa6e29260d0a4f584632f212d (diff)
downloadnetsurf-c0f4bbb3083b56bf4f1e089a40ab059233b88495.tar.gz
netsurf-c0f4bbb3083b56bf4f1e089a40ab059233b88495.tar.bz2
remove erroneous parameter check to nsoption_snoptionf
The API check and bounds check for option indexes was from an unsigned enum so checking for negative numbers was causing "comparison is always false" errors in compilation.
-rw-r--r--test/nsoption.c2
-rw-r--r--utils/nsoption.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/test/nsoption.c b/test/nsoption.c
index de0530e8d..76cfeaf0b 100644
--- a/test/nsoption.c
+++ b/test/nsoption.c
@@ -615,8 +615,6 @@ END_TEST
START_TEST(nsoption_api_snoptionf_param_test)
{
int ret;
- ret = nsoption_snoptionf(NULL, 0, -1, "");
- ck_assert_int_eq(ret, -1);
ret = nsoption_snoptionf(NULL, 0, NSOPTION_LISTEND, "");
ck_assert_int_eq(ret, -1);
diff --git a/utils/nsoption.c b/utils/nsoption.c
index 6754d2131..92ecfc176 100644
--- a/utils/nsoption.c
+++ b/utils/nsoption.c
@@ -826,7 +826,7 @@ nsoption_snoptionf(char *string,
return -1;
}
- if ((option_idx < 0) || (option_idx >= NSOPTION_LISTEND)) {
+ if (option_idx >= NSOPTION_LISTEND) {
return -1;
}