summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2018-03-06 14:32:16 +1030
committerSamuel Mendoza-Jonas <sam@mendozajonas.com>2018-03-07 16:24:31 +1100
commita5f80e0a9a40732b9d7606ad369b288ce04cec29 (patch)
tree19bbf1b82f163e053b4cb40f52677a81d54a283c
parent526d4b3d959d3d108f38f35dae0855a29692a069 (diff)
downloadtalos-petitboot-a5f80e0a9a40732b9d7606ad369b288ce04cec29.zip
talos-petitboot-a5f80e0a9a40732b9d7606ad369b288ce04cec29.tar.gz
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 <joel@jms.id.au> Reviewed-by: Cyril Bur <cyrilbur@gmail.com> Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
-rw-r--r--discover/device-handler.c3
1 files changed, 1 insertions, 2 deletions
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;
OpenPOWER on IntegriCloud