ubusd_event: move strmatch_len to ubus_common.h

Rename strmatch_len into ubus_strmatch_len and move it to ubus_common.h

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>

diff --git a/ubus_common.h b/ubus_common.h
index 4bb992793d5f9921074721118f3412471d2995cd..5e4d0ad94f8f11d242ac9e7948f445e727cb20b6 100644 (file)
--- a/ubus_common.h
+++ b/ubus_common.h
@@ -21,4 +21,13 @@
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 #endif
 
+static inline bool ubus_strmatch_len(const char *s1, const char *s2, int *len)
+{
+       for (*len = 0; s1[*len] == s2[*len]; (*len)++)
+               if (!s1[*len])
+                       return true;
+
+       return false;
+}
+
 #endif

diff --git a/ubusd_event.c b/ubusd_event.c
index 0469c20aed590f7b3757e4fbb2485a23794a8aa9..f07f8267869b3806125b279f67d95f45e10c7ee0 100644 (file)
--- a/ubusd_event.c
+++ b/ubusd_event.c
@@ -132,15 +132,6 @@ static void ubusd_send_event_msg(struct ubus_msg_buf **ub, struct ubus_client *c
        ubus_msg_send(obj->client, *ub);
 }
 
-static bool strmatch_len(const char *s1, const char *s2, int *len)
-{
-       for (*len = 0; s1[*len] == s2[*len]; (*len)++)
-               if (!s1[*len])
-                       return true;
-
-       return false;
-}
-
 int ubusd_send_event(struct ubus_client *cl, const char *id,
                     event_fill_cb fill_cb, void *cb_priv)
 {
@@ -160,7 +151,7 @@ int ubusd_send_event(struct ubus_client *cl, const char *id,
                int cur_match_len;
                bool full_match;
 
-               full_match = strmatch_len(id, key, &cur_match_len);
+               full_match = ubus_strmatch_len(id, key, &cur_match_len);
                if (cur_match_len < match_len)
                        break;