From c0f4bbb3083b56bf4f1e089a40ab059233b88495 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Sat, 6 Aug 2016 10:27:32 +0100 Subject: 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. --- test/nsoption.c | 2 -- utils/nsoption.c | 2 +- 2 files changed, 1 insertion(+), 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; } -- cgit v1.2.3