ovs-ofctl: Avoid impossible check for !osm in fetch_port_by_stats().
authorBen Pfaff <blp@nicira.com>
Sun, 13 May 2012 23:41:05 +0000 (16:41 -0700)
committerBen Pfaff <blp@nicira.com>
Mon, 14 May 2012 16:37:18 +0000 (09:37 -0700)
At the time of the call to ofpbuf_at(), we know that the ofp_stats_msg is
present because ofputil_decode_msg_type() reported that it was.  Therefore,
we can use ofpbuf_at_assert() and don't have to check for a null pointer.

Found by clang.

Signed-off-by: Ben Pfaff <blp@nicira.com>
utilities/ovs-ofctl.c

index c1fce83cf181865ea591319c39cbf0847bf50eb3..92808d943e5ad09e009135755a1928c32ac412d1 100644 (file)
@@ -620,8 +620,8 @@ fetch_port_by_stats(const char *vconn_name,
                                         verbosity + 1));
             }
 
-            osm = ofpbuf_at(reply, 0, sizeof *osm);
-            done = !osm || !(ntohs(osm->flags) & OFPSF_REPLY_MORE);
+            osm = ofpbuf_at_assert(reply, 0, sizeof *osm);
+            done = !(ntohs(osm->flags) & OFPSF_REPLY_MORE);
 
             if (found) {
                 /* We've already found the port, but we need to drain