From f48667811c04d848dc345aa0bbda29d889b5f960 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Mon, 15 Nov 2010 11:43:05 -0800 Subject: [PATCH] ovs-ofctl: Simplify code by using strcasecmp() instead of strncasecmp(). I don't know why this code was written the way it was. This is more straightforward and I believe that it is equivalent, too. --- utilities/ovs-ofctl.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c index 65e2a9fc6..d39e187b5 100644 --- a/utilities/ovs-ofctl.c +++ b/utilities/ovs-ofctl.c @@ -51,12 +51,6 @@ VLOG_DEFINE_THIS_MODULE(ofctl); - -#define MOD_PORT_CMD_UP "up" -#define MOD_PORT_CMD_DOWN "down" -#define MOD_PORT_CMD_FLOOD "flood" -#define MOD_PORT_CMD_NOFLOOD "noflood" - /* Use strict matching for flow mod commands? */ static bool strict; @@ -692,17 +686,14 @@ do_mod_port(int argc OVS_UNUSED, char *argv[]) printf("modifying port: %s\n", osf->ports[port_idx].name); - if (!strncasecmp(argv[3], MOD_PORT_CMD_UP, sizeof MOD_PORT_CMD_UP)) { + if (!strcasecmp(argv[3], "up")) { opm->mask |= htonl(OFPPC_PORT_DOWN); - } else if (!strncasecmp(argv[3], MOD_PORT_CMD_DOWN, - sizeof MOD_PORT_CMD_DOWN)) { + } else if (!strcasecmp(argv[3], "down")) { opm->mask |= htonl(OFPPC_PORT_DOWN); opm->config |= htonl(OFPPC_PORT_DOWN); - } else if (!strncasecmp(argv[3], MOD_PORT_CMD_FLOOD, - sizeof MOD_PORT_CMD_FLOOD)) { + } else if (!strcasecmp(argv[3], "flood")) { opm->mask |= htonl(OFPPC_NO_FLOOD); - } else if (!strncasecmp(argv[3], MOD_PORT_CMD_NOFLOOD, - sizeof MOD_PORT_CMD_NOFLOOD)) { + } else if (!strcasecmp(argv[3], "noflood")) { opm->mask |= htonl(OFPPC_NO_FLOOD); opm->config |= htonl(OFPPC_NO_FLOOD); } else { -- 2.43.0