From: Joel Stanley Date: Tue, 6 Mar 2018 04:02:16 +0000 (+1030) Subject: discover: Fix bad check of version string X-Git-Tag: v1.7.1~5 X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=a5f80e0a9a40732b9d7606ad369b288ce04cec29 discover: Fix bad check of version string Clang says this: discover/device-handler.c:1564:27: warning: size argument in 'strncmp' call is a comparison [-Wmemsize-comparison] strlen(opt->version) == 0)) { ~~~~~~~~~~~~~~~~~~~~~^~~~ discover/device-handler.c:1563:5: note: did you mean to compare the result of 'strncmp' instead? strncmp(opt->version, tmp->version, ^ It looks like it's correct. However, we can go one better and 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 --- diff --git a/discover/device-handler.c b/discover/device-handler.c index a6eb884..569e652 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -1560,8 +1560,7 @@ void device_handler_add_plugin_option(struct device_handler *handler, tmp = handler->plugins[i]; /* If both id and version match, ignore */ if (strncmp(opt->id, tmp->id, strlen(opt->id)) == 0 && - strncmp(opt->version, tmp->version, - strlen(opt->version) == 0)) { + strcmp(opt->version, tmp->version) == 0) { pb_log("discover: Plugin '%s' already exists, ignoring\n", opt->id); return;