Merge pull request #5163 from garlick/convert_streq

cleanup:  use ccan/str in place of strcmp(), strncmp()

Author: mergify[bot]

src/bindings/lua/Makefile.am

@@ -4,6 +4,7 @@ AM_LDFLAGS =	$(CODE_COVERAGE_LIBS)
 AM_CPPFLAGS =	\
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/src/include \
+	-I$(top_srcdir)/src/common/libccan \
 	-I$(top_builddir)/src/common/libflux \
 	$(LUA_INCLUDE)
 

src/bindings/lua/flux-lua.c

@@ -25,6 +25,8 @@
 
 #include "flux/core.h"
 
+#include "ccan/str/str.h"
+
 #include "jansson-lua.h"
 #include "zmsg-lua.h"
 #include "lutil.h"
@@ -242,9 +244,9 @@ static int l_flux_index (lua_State *L)
     if (key == NULL)
         return luaL_error (L, "flux: invalid index");
 
-    if (strcmp (key, "size") == 0)
+    if (streq (key, "size"))
         return l_flux_size (L);
-    if (strcmp (key, "rank") == 0)
+    if (streq (key, "rank"))
         return l_flux_rank (L);
 
     lua_getmetatable (L, 1);
@@ -786,7 +788,7 @@ static int l_msghandler_index (lua_State *L)
     /*
      *  Check for method names
      */
-    if (strcmp (key, "remove") == 0) {
+    if (streq (key, "remove")) {
         lua_getmetatable (L, 1);
         lua_getfield (L, -1, "remove");
         return (1);
@@ -937,7 +939,7 @@ static int l_watcher_index (lua_State *L)
     /*
      *  Check for method names
      */
-    if (strcmp (key, "remove") == 0) {
+    if (streq (key, "remove")) {
         lua_getmetatable (L, 1);
         lua_getfield (L, -1, "remove");
         return (1);
@@ -1046,9 +1048,9 @@ static int l_flux_reactor_start (lua_State *L)
     flux_t *h;
     int mode = 0;
     if ((lua_gettop (L) > 1) && (arg = lua_tostring (L, 2))) {
-        if (strcmp (arg, "once") == 0)
+        if (streq (arg, "once"))
             mode = FLUX_REACTOR_ONCE;
-        else if (strcmp (arg, "nowait") == 0)
+        else if (streq (arg, "nowait"))
             mode = FLUX_REACTOR_NOWAIT;
         else
             return lua_pusherror (L, "flux_reactor: Invalid argument");

src/bindings/lua/zmsg-lua.c

@@ -15,6 +15,7 @@
 #include <lauxlib.h>
 
 #include "src/common/libczmqcontainers/czmq_containers.h"
+#include "ccan/str/str.h"
 
 #include "flux/core.h"
 #include "lutil.h"
@@ -121,23 +122,23 @@ static int l_zmsg_info_index (lua_State *L)
     if (key == NULL)
         return lua_pusherror (L, "zmsg: invalid member");
 
-    if (strcmp (key, "type") == 0) {
+    if (streq (key, "type")) {
         lua_pushstring (L, zmsg_type_string (zi->typemask));
         return (1);
     }
-    if (strcmp (key, "tag") == 0) {
+    if (streq (key, "tag")) {
         if (zi->tag)
             lua_pushstring (L, zi->tag);
         else
             lua_pushnil (L);
         return (1);
     }
-    if (strcmp (key, "data") == 0) {
+    if (streq (key, "data")) {
         if (!zi->o || json_object_to_lua (L, zi->o) < 0)
             lua_pushnil (L);
         return (1);
     }
-    if (strcmp (key, "errnum") == 0) {
+    if (streq (key, "errnum")) {
         int errnum;
         if (!(zi->typemask & FLUX_MSGTYPE_RESPONSE))
             return lua_pusherror (L,
@@ -146,7 +147,7 @@ static int l_zmsg_info_index (lua_State *L)
         lua_pushnumber (L, errnum);
         return (1);
     }
-    if (strcmp (key, "matchtag") == 0) {
+    if (streq (key, "matchtag")) {
         uint32_t matchtag;
         if (flux_msg_get_matchtag (zi->msg, &matchtag) < 0)
             return lua_pusherror (L, "zmsg: matchtag: %s",

src/broker/boot_config.c

@@ -24,6 +24,7 @@
 
 #include "src/common/libutil/log.h"
 #include "src/common/libutil/errno_safe.h"
+#include "ccan/str/str.h"
 
 #include "attr.h"
 #include "overlay.h"
@@ -378,7 +379,7 @@ int boot_config_getrankbyname (json_t *hosts, const char *name, uint32_t *rank)
         /* N.B. entry already validated by boot_config_parse().
          */
         if (json_unpack (entry, "{s:s}", "host", &host) == 0
-                    && !strcmp (name, host)) {
+            && streq (name, host)) {
             *rank = index;
             return 0;
         }

src/broker/boot_pmi.c

@@ -23,6 +23,7 @@
 #include "src/common/libutil/ipaddr.h"
 #include "src/common/libutil/errno_safe.h"
 #include "src/common/libpmi/upmi.h"
+#include "ccan/str/str.h"
 
 #include "attr.h"
 #include "overlay.h"
@@ -114,7 +115,7 @@ static bool use_ipc (attr_t *attrs)
     const char *val;
 
     if (attr_get (attrs, "tbon.prefertcp", &val, NULL) == 0
-        && strcmp (val, "0") != 0)
+        && !streq (val, "0"))
         goto done;
     if (attr_get (attrs, "broker.mapping", &val, NULL) < 0 || !val)
         goto done;

src/broker/broker.c

@@ -19,6 +19,7 @@
 #include <argz.h>
 #include <flux/core.h>
 #include <czmq.h>
+#undef streq // redefined by ccan/str/str.h below
 #include <jansson.h>
 #if HAVE_CALIPER
 #include <caliper/cali.h>
@@ -43,6 +44,7 @@
 #include "src/common/libutil/errprintf.h"
 #include "src/common/libfluxutil/method.h"
 #include "ccan/array_size/array_size.h"
+#include "ccan/str/str.h"
 
 #include "module.h"
 #include "brokercfg.h"
@@ -690,8 +692,8 @@ static bool is_interactive_shell (const char *argz, size_t argz_len)
         char *shell;
         char *cmd = argz_next (argz, argz_len, NULL);
         while ((shell = getusershell ())) {
-            if (strcmp (cmd, shell) == 0
-                || strcmp (cmd, basename (shell)) == 0) {
+            if (streq (cmd, shell)
+                || streq (cmd, basename (shell))) {
                 result = true;
                 break;
             }
@@ -935,7 +937,7 @@ static int init_local_uri_attr (struct overlay *ov, attr_t *attrs)
     else {
         char path[1024];
 
-        if (strncmp (uri, "local://", 8) != 0) {
+        if (!strstarts (uri, "local://")) {
             log_msg ("local-uri is malformed");
             return -1;
         }
@@ -1507,7 +1509,7 @@ static int service_allow (struct flux_msg_cred cred, const char *name)
     if ((cred.rolemask & FLUX_ROLE_OWNER))
         return 0;
     snprintf (prefix, sizeof (prefix), "%" PRIu32 "-", cred.userid);
-    if (!strncmp (prefix, name, strlen (prefix)))
+    if (strstarts (name, prefix))
         return 0;
     errno = EPERM;
     return -1;
@@ -1571,7 +1573,7 @@ static void service_remove_cb (flux_t *h, flux_msg_handler_t *w,
         errno = ENOENT;
         goto error;
     }
-    if (strcmp (uuid, sender) != 0) {
+    if (!streq (uuid, sender)) {
         errno = EINVAL;
         goto error;
     }
@@ -1793,7 +1795,7 @@ static int handle_event (broker_ctx_t *ctx, const flux_msg_t *msg)
      */
     s = zlist_first (ctx->subscriptions);
     while (s) {
-        if (!strncmp (s, topic, strlen (s))) {
+        if (strstarts (topic, s)) {
             if (flux_requeue (ctx->h, msg, FLUX_RQ_TAIL) < 0)
                 flux_log_error (ctx->h, "%s: flux_requeue\n", __FUNCTION__);
             break;

src/broker/content-cache.c

@@ -24,6 +24,7 @@
 #include "src/common/libutil/iterators.h"
 #include "src/common/libutil/log.h"
 #include "src/common/libcontent/content.h"
+#include "ccan/str/str.h"
 
 #include "attr.h"
 #include "content-cache.h"
@@ -748,7 +749,7 @@ static void content_register_backing_request (flux_t *h,
         if (!(cache->backing_name = strdup (name)))
             goto error;
     }
-    if (strcmp (cache->backing_name, name) != 0) {
+    if (!streq (cache->backing_name, name)) {
         errno = EINVAL;
         errstr = "content backing store cannot be changed on the fly";
         goto error;
@@ -999,7 +1000,7 @@ static int content_cache_getattr (const char *name, const char **val, void *arg)
 {
     struct content_cache *cache = arg;
 
-    if (!strcmp (name, "content.backing-module"))
+    if (streq (name, "content.backing-module"))
         *val = cache->backing_name;
     else
         return -1;

src/broker/groups.c

@@ -43,6 +43,7 @@
 #include "src/common/libidset/idset.h"
 #include "src/common/libutil/errno_safe.h"
 #include "src/common/libczmqcontainers/czmq_containers.h"
+#include "ccan/str/str.h"
 
 #include "overlay.h"
 #include "groups.h"
@@ -727,15 +728,16 @@ static void overlay_monitor_cb (struct overlay *ov, uint32_t rank, void *arg)
     /* Generate LEAVEs for any groups 'rank' (and subtree) may be a member
      * of if transitioning to lost (crashed) or offline (shutdown).
      */
-    if (!strcmp (status, "lost") || !strcmp (status, "offline")) {
+    if (streq (status, "lost")
+        || streq (status, "offline")) {
         auto_leave (g, status, rank, ids);
     }
     /* Update broker.torpid if torpidity has changed while subtree is in
      * one of the "online" states.
      */
-    else if (!strcmp (status, "full")
-        || !strcmp (status, "partial")
-        || !strcmp (status, "degraded")) {
+    else if (streq (status, "full")
+        || streq (status, "partial")
+        || streq (status, "degraded")) {
         torpid_update (g, rank, ids, overlay_peer_is_torpid (ov, rank));
     }
 

src/broker/log.c

@@ -23,6 +23,7 @@
 #include "src/common/libutil/wallclock.h"
 #include "src/common/libutil/stdlog.h"
 #include "src/common/libutil/timestamp.h"
+#include "ccan/str/str.h"
 
 #include "log.h"
 
@@ -255,19 +256,19 @@ static int attr_get_log (const char *name, const char **val, void *arg)
 {
     logbuf_t *logbuf = arg;
 
-    if (!strcmp (name, "log-forward-level"))
+    if (streq (name, "log-forward-level"))
         *val = int_to_string (logbuf->forward_level);
-    else if (!strcmp (name, "log-critical-level"))
+    else if (streq (name, "log-critical-level"))
         *val = int_to_string (logbuf->critical_level);
-    else if (!strcmp (name, "log-stderr-level"))
+    else if (streq (name, "log-stderr-level"))
         *val = int_to_string (logbuf->stderr_level);
-    else if (!strcmp (name, "log-stderr-mode"))
+    else if (streq (name, "log-stderr-mode"))
         *val = logbuf->stderr_mode == MODE_LEADER ? "leader" : "local";
-    else if (!strcmp (name, "log-ring-size"))
+    else if (streq (name, "log-ring-size"))
         *val = int_to_string (logbuf->ring_size);
-    else if (!strcmp (name, "log-filename"))
+    else if (streq (name, "log-filename"))
         *val = logbuf->filename;
-    else if (!strcmp (name, "log-level"))
+    else if (streq (name, "log-level"))
         *val = int_to_string (logbuf->level);
     else {
         errno = ENOENT;
@@ -281,35 +282,35 @@ static int attr_set_log (const char *name, const char *val, void *arg)
     logbuf_t *logbuf = arg;
     int rc = -1;
 
-    if (!strcmp (name, "log-forward-level")) {
+    if (streq (name, "log-forward-level")) {
         int level = strtol (val, NULL, 10);
         if (logbuf_set_forward_level (logbuf, level) < 0)
             goto done;
-    } else if (!strcmp (name, "log-critical-level")) {
+    } else if (streq (name, "log-critical-level")) {
         int level = strtol (val, NULL, 10);
         if (logbuf_set_critical_level (logbuf, level) < 0)
             goto done;
-    } else if (!strcmp (name, "log-stderr-level")) {
+    } else if (streq (name, "log-stderr-level")) {
         int level = strtol (val, NULL, 10);
         if (logbuf_set_stderr_level (logbuf, level) < 0)
             goto done;
-    } else if (!strcmp (name, "log-stderr-mode")) {
-        if (!strcmp (val, "leader"))
+    } else if (streq (name, "log-stderr-mode")) {
+        if (streq (val, "leader"))
             logbuf->stderr_mode = MODE_LEADER;
-        else if (!strcmp (val, "local"))
+        else if (streq (val, "local"))
             logbuf->stderr_mode = MODE_LOCAL;
         else {
             errno = EINVAL;
             goto done;
         }
-    } else if (!strcmp (name, "log-ring-size")) {
+    } else if (streq (name, "log-ring-size")) {
         int size = strtol (val, NULL, 10);
         if (logbuf_set_ring_size (logbuf, size) < 0)
             goto done;
-    } else if (!strcmp (name, "log-filename")) {
+    } else if (streq (name, "log-filename")) {
         if (logbuf_set_filename (logbuf, val) < 0)
             goto done;
-    } else if (!strcmp (name, "log-level")) {
+    } else if (streq (name, "log-level")) {
         int level = strtol (val, NULL, 10);
         if (logbuf_set_level (logbuf, level) < 0)
             goto done;

src/broker/modservice.c

@@ -15,6 +15,7 @@
 
 #include "src/common/libutil/errno_safe.h"
 #include "src/common/libfluxutil/method.h"
+#include "ccan/str/str.h"
 
 #include "module.h"
 #include "modservice.h"
@@ -73,13 +74,13 @@ static void debug_cb (flux_t *h, flux_msg_handler_t *mh,
         }
         flux_aux_set (h, "flux::debug_flags", debug_flags, free);
     }
-    if (!strcmp (op, "setbit"))
+    if (streq (op, "setbit"))
         *debug_flags |= flags;
-    else if (!strcmp (op, "clrbit"))
+    else if (streq (op, "clrbit"))
         *debug_flags &= ~flags;
-    else if (!strcmp (op, "set"))
+    else if (streq (op, "set"))
         *debug_flags = flags;
-    else if (!strcmp (op, "clr"))
+    else if (streq (op, "clr"))
         *debug_flags = 0;
     else {
         errno = EPROTO;