From: Simon Horman Date: Mon, 30 Jul 2012 02:03:02 +0000 (+0900) Subject: ofp-util: Reduce scope of variables in ofputil_encode_flow_mod() X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f192f2330cf2630c98b587e7fc5cd93165c5b48;p=openvswitch ofp-util: Reduce scope of variables in ofputil_encode_flow_mod() Reduce scope of per-protocol variables in ofputil_encode_flow_mod() These variables are only needed in one of the cases covered by the switch statement and will increase in number as more cases (protocols) are supported. Signed-off-by: Simon Horman Signed-off-by: Ben Pfaff --- diff --git a/lib/ofp-util.c b/lib/ofp-util.c index 7f66fa72..85c25ddb 100644 --- a/lib/ofp-util.c +++ b/lib/ofp-util.c @@ -1266,11 +1266,8 @@ struct ofpbuf * ofputil_encode_flow_mod(const struct ofputil_flow_mod *fm, enum ofputil_protocol protocol) { - struct ofp10_flow_mod *ofm; - struct nx_flow_mod *nfm; struct ofpbuf *msg; uint16_t command; - int match_len; command = (protocol & OFPUTIL_P_TID ? (fm->command & 0xff) | (fm->table_id << 8) @@ -1278,7 +1275,9 @@ ofputil_encode_flow_mod(const struct ofputil_flow_mod *fm, switch (protocol) { case OFPUTIL_P_OF10: - case OFPUTIL_P_OF10_TID: + case OFPUTIL_P_OF10_TID: { + struct ofp10_flow_mod *ofm; + msg = ofpraw_alloc(OFPRAW_OFPT10_FLOW_MOD, OFP10_VERSION, fm->ofpacts_len); ofm = ofpbuf_put_zeros(msg, sizeof *ofm); @@ -1292,9 +1291,13 @@ ofputil_encode_flow_mod(const struct ofputil_flow_mod *fm, ofm->out_port = htons(fm->out_port); ofm->flags = htons(fm->flags); break; + } case OFPUTIL_P_NXM: - case OFPUTIL_P_NXM_TID: + case OFPUTIL_P_NXM_TID: { + struct nx_flow_mod *nfm; + int match_len; + msg = ofpraw_alloc(OFPRAW_NXT_FLOW_MOD, OFP10_VERSION, NXM_TYPICAL_LEN + fm->ofpacts_len); nfm = ofpbuf_put_zeros(msg, sizeof *nfm); @@ -1311,6 +1314,7 @@ ofputil_encode_flow_mod(const struct ofputil_flow_mod *fm, nfm->flags = htons(fm->flags); nfm->match_len = htons(match_len); break; + } case OFPUTIL_P_OF12: default: