From: Joel Stanley Date: Tue, 6 Mar 2018 04:02:17 +0000 (+1030) Subject: ncurses: Fix bad strncmp X-Git-Tag: v1.7.1~4 X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=352f5c2729dc8b40524e45ddde4f560ded717ec8 ncurses: Fix bad strncmp ui/ncurses/nc-cui.c:967:58: warning: size argument in 'strncmp' call is a comparison [-Wmemsize-comparison] if (strncmp(cod->opt->id, "dummy", strlen("dummy") == 0 && ~~~~~~~~~~~~~~~~~~~~~^~ ui/ncurses/nc-cui.c:967:6: note: did you mean to compare the result of 'strncmp' instead? if (strncmp(cod->opt->id, "dummy", strlen("dummy") == 0 && ^ There appears to be two bonus conditions inside the length field. I chose to drop the pointless strncmp(foo, bar, strlen(bar)), as this is equivalent to strcmp(foo, bar). Signed-off-by: Joel Stanley Reviewed-by: Cyril Bur Signed-off-by: Samuel Mendoza-Jonas [Fixed up commit message typo] --- diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c index 372da1e..20a9048 100644 --- a/ui/ncurses/nc-cui.c +++ b/ui/ncurses/nc-cui.c @@ -964,8 +964,8 @@ fallback: * If this option was faked above move the context under * the item so it is cleaned up later in cui_plugins_remove(). */ - if (strncmp(cod->opt->id, "dummy", strlen("dummy") == 0 && - cod->dev->type == DEVICE_TYPE_UNKNOWN)) { + if (strcmp(cod->opt->id, "dummy") == 0 && + cod->dev->type == DEVICE_TYPE_UNKNOWN) { talloc_steal(item, cod->dev); talloc_steal(item, cod->opt); }