@@ -2751,8 +2751,8 @@ static char *
mf_from_integer_string(const struct mf_field *mf, const char *s,
uint8_t *valuep, uint8_t *maskp)
{
+ const char *err_str;
char *tail;
- const char *err_str = "";
int err;
err = parse_int_string(s, valuep, mf->n_bytes, &tail);
@@ -2785,8 +2785,8 @@ syntax_error:
static char *
mf_from_packet_type_string(const char *s, ovs_be32 *packet_type)
{
+ const char *err_str;
char *tail;
- const char *err_str = "";
int err;
if (*s != '(') {
@@ -4230,10 +4230,12 @@ encode_DELETE_FIELD(const struct ofpact_delete_field *delete_field,
enum ofp_version ofp_version OVS_UNUSED,
struct ofpbuf *out)
{
- struct nx_action_delete_field *nadf = put_NXAST_DELETE_FIELD(out);
- size_t size = out->size;
+ size_t size;
- out->size = size - sizeof nadf->pad;
+ put_NXAST_DELETE_FIELD(out);
+ size = out->size;
+
+ out->size = size - MEMBER_SIZEOF(struct nx_action_delete_field, pad);
nx_put_mff_header(out, delete_field->field, 0, false);
out->size = size;
}