| Message ID | 1537571127-10143-10-git-send-email-bmarzins@redhat.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | christophe varoqui |
| Headers | show |
| Series | Misc Multipath patches | expand |
On Fri, 2018-09-21 at 18:05 -0500, Benjamin Marzinski wrote: > since vector_foreach_slot() already checks if the entry is NULL, > there's > no point in checking it in the loop, since it can't be NULL there. > Found > by coverity. > > Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> Let's hope nobody ever removes that NULL check from vector_foreach_slot()... Reviewed-by: Martin Wilck <mwilck@suse.com> > --- > libmultipath/print.c | 8 -------- > 1 file changed, 8 deletions(-) > > diff --git a/libmultipath/print.c b/libmultipath/print.c > index 9da6a77..7b610b9 100644 > --- a/libmultipath/print.c > +++ b/libmultipath/print.c > @@ -275,8 +275,6 @@ snprint_multipath_vpr (char * buff, size_t len, > const struct multipath * mpp) > int i, j; > > vector_foreach_slot(mpp->pg, pgp, i) { > - if (!pgp) > - continue; > vector_foreach_slot(pgp->paths, pp, j) { > if (strlen(pp->vendor_id) && strlen(pp- > >product_id)) > return snprintf(buff, len, "%s,%s", > @@ -295,8 +293,6 @@ snprint_multipath_vend (char * buff, size_t len, > const struct multipath * mpp) > int i, j; > > vector_foreach_slot(mpp->pg, pgp, i) { > - if (!pgp) > - continue; > vector_foreach_slot(pgp->paths, pp, j) { > if (strlen(pp->vendor_id)) > return snprintf(buff, len, "%s", pp- > >vendor_id); > @@ -313,8 +309,6 @@ snprint_multipath_prod (char * buff, size_t len, > const struct multipath * mpp) > int i, j; > > vector_foreach_slot(mpp->pg, pgp, i) { > - if (!pgp) > - continue; > vector_foreach_slot(pgp->paths, pp, j) { > if (strlen(pp->product_id)) > return snprintf(buff, len, "%s", pp- > >product_id); > @@ -331,8 +325,6 @@ snprint_multipath_rev (char * buff, size_t len, > const struct multipath * mpp) > int i, j; > > vector_foreach_slot(mpp->pg, pgp, i) { > - if (!pgp) > - continue; > vector_foreach_slot(pgp->paths, pp, j) { > if (strlen(pp->rev)) > return snprintf(buff, len, "%s", pp- > >rev);
diff --git a/libmultipath/print.c b/libmultipath/print.c index 9da6a77..7b610b9 100644 --- a/libmultipath/print.c +++ b/libmultipath/print.c @@ -275,8 +275,6 @@ snprint_multipath_vpr (char * buff, size_t len, const struct multipath * mpp) int i, j; vector_foreach_slot(mpp->pg, pgp, i) { - if (!pgp) - continue; vector_foreach_slot(pgp->paths, pp, j) { if (strlen(pp->vendor_id) && strlen(pp->product_id)) return snprintf(buff, len, "%s,%s", @@ -295,8 +293,6 @@ snprint_multipath_vend (char * buff, size_t len, const struct multipath * mpp) int i, j; vector_foreach_slot(mpp->pg, pgp, i) { - if (!pgp) - continue; vector_foreach_slot(pgp->paths, pp, j) { if (strlen(pp->vendor_id)) return snprintf(buff, len, "%s", pp->vendor_id); @@ -313,8 +309,6 @@ snprint_multipath_prod (char * buff, size_t len, const struct multipath * mpp) int i, j; vector_foreach_slot(mpp->pg, pgp, i) { - if (!pgp) - continue; vector_foreach_slot(pgp->paths, pp, j) { if (strlen(pp->product_id)) return snprintf(buff, len, "%s", pp->product_id); @@ -331,8 +325,6 @@ snprint_multipath_rev (char * buff, size_t len, const struct multipath * mpp) int i, j; vector_foreach_slot(mpp->pg, pgp, i) { - if (!pgp) - continue; vector_foreach_slot(pgp->paths, pp, j) { if (strlen(pp->rev)) return snprintf(buff, len, "%s", pp->rev);
since vector_foreach_slot() already checks if the entry is NULL, there's no point in checking it in the loop, since it can't be NULL there. Found by coverity. Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> --- libmultipath/print.c | 8 -------- 1 file changed, 8 deletions(-)