fixup! job-list: add job-list matching library

Author: chu11

src/modules/job-list/match.c

@@ -60,72 +60,6 @@ static void list_constraint_destructor (void **item)
     }
 }
 
-static bool match_and (struct list_constraint *c, const struct job *job)
-{
-    struct list_constraint *cp = zlistx_first (c->values);
-    while (cp) {
-        if (!cp->match (cp, job))
-            return false;
-        cp = zlistx_next (c->values);
-    }
-    return true;
-}
-
-static bool match_or (struct list_constraint *c, const struct job *job)
-{
-    struct list_constraint *cp = zlistx_first (c->values);
-    /* no values in "or" defined as true per RFC31 */
-    if (!cp)
-        return true;
-    while (cp) {
-        if (cp->match (cp, job))
-            return true;
-        cp = zlistx_next (c->values);
-    }
-    return false;
-}
-
-static bool match_not (struct list_constraint *c, const struct job *job)
-{
-    return !match_and (c, job);
-}
-
-static struct list_constraint *conditional_constraint (const char *type,
-                                                       json_t *values,
-                                                       flux_error_t *errp)
-{
-    json_t *entry;
-    size_t index;
-    struct list_constraint *c;
-    match_f match_cb;
-
-    if (streq (type, "and"))
-        match_cb = match_and;
-    else if (streq (type, "or"))
-        match_cb = match_or;
-    else /* streq (type, "not") */
-        match_cb = match_not;
-
-    if (!(c = list_constraint_new (match_cb, list_constraint_destructor, errp)))
-        return NULL;
-
-    json_array_foreach (values, index, entry) {
-        struct list_constraint *cp = list_constraint_create (entry, errp);
-        if (!cp)
-            goto error;
-        if (!zlistx_add_end (c->values, cp)) {
-            errprintf (errp, "Out of memory");
-            list_constraint_destroy (cp);
-            goto error;
-        }
-    }
-    return c;
-
- error:
-    list_constraint_destroy (c);
-    return NULL;
-}
-
 /* zlistx_set_destructor */
 static void wrap_free (void **item)
 {
@@ -382,6 +316,72 @@ static struct list_constraint *create_since_constraint (json_t *values,
     return c;
 }
 
+static bool match_and (struct list_constraint *c, const struct job *job)
+{
+    struct list_constraint *cp = zlistx_first (c->values);
+    while (cp) {
+        if (!cp->match (cp, job))
+            return false;
+        cp = zlistx_next (c->values);
+    }
+    return true;
+}
+
+static bool match_or (struct list_constraint *c, const struct job *job)
+{
+    struct list_constraint *cp = zlistx_first (c->values);
+    /* no values in "or" defined as true per RFC31 */
+    if (!cp)
+        return true;
+    while (cp) {
+        if (cp->match (cp, job))
+            return true;
+        cp = zlistx_next (c->values);
+    }
+    return false;
+}
+
+static bool match_not (struct list_constraint *c, const struct job *job)
+{
+    return !match_and (c, job);
+}
+
+static struct list_constraint *conditional_constraint (const char *type,
+                                                       json_t *values,
+                                                       flux_error_t *errp)
+{
+    json_t *entry;
+    size_t index;
+    struct list_constraint *c;
+    match_f match_cb;
+
+    if (streq (type, "and"))
+        match_cb = match_and;
+    else if (streq (type, "or"))
+        match_cb = match_or;
+    else /* streq (type, "not") */
+        match_cb = match_not;
+
+    if (!(c = list_constraint_new (match_cb, list_constraint_destructor, errp)))
+        return NULL;
+
+    json_array_foreach (values, index, entry) {
+        struct list_constraint *cp = list_constraint_create (entry, errp);
+        if (!cp)
+            goto error;
+        if (!zlistx_add_end (c->values, cp)) {
+            errprintf (errp, "Out of memory");
+            list_constraint_destroy (cp);
+            goto error;
+        }
+    }
+    return c;
+
+ error:
+    list_constraint_destroy (c);
+    return NULL;
+}
+
 void list_constraint_destroy (struct list_constraint *constraint)
 {
     if (constraint) {