fixup! job-list: add state matching library

Author: chu11

src/modules/job-list/state_match.c

@@ -122,6 +122,47 @@ static void state_constraint_destructor (void **item)
     }
 }
 
+/* zlistx_set_destructor */
+static void wrap_free (void **item)
+{
+    if (item) {
+        free (*item);
+        (*item) = NULL;
+    }
+}
+
+static state_match_t match_states (struct state_constraint *c,
+                                   flux_job_state_t state)
+{
+    int *states = zlistx_first (c->values);
+    if ((*states) & state)
+        return MATCH_ALWAYS;
+    return MATCH_NEVER;
+}
+
+static struct state_constraint *create_states_constraint (json_t *values,
+                                                          flux_error_t *errp)
+{
+    struct state_constraint *c;
+    int *bitmask = NULL;
+    int tmp;
+    if ((tmp = array_to_states_bitmask (values, errp)) < 0)
+        return NULL;
+    /* if no states specified, returns MATCH_ALWAYS */
+    if (!tmp)
+        return state_constraint_new (match_always, NULL, errp);
+    if (!(bitmask = malloc (sizeof (*bitmask))))
+        return NULL;
+    (*bitmask) = tmp;
+    if (!(c = state_constraint_new (match_states, wrap_free, errp))
+        || !zlistx_add_end (c->values, bitmask)) {
+        state_constraint_destroy (c);
+        free (bitmask);
+        return NULL;
+    }
+    return c;
+}
+
 static state_match_t match_and (struct state_constraint *c,
                                 flux_job_state_t state)
 {
@@ -237,47 +278,6 @@ static struct state_constraint *conditional_constraint (const char *type,
     return NULL;
 }
 
-/* zlistx_set_destructor */
-static void wrap_free (void **item)
-{
-    if (item) {
-        free (*item);
-        (*item) = NULL;
-    }
-}
-
-static state_match_t match_states (struct state_constraint *c,
-                                   flux_job_state_t state)
-{
-    int *states = zlistx_first (c->values);
-    if ((*states) & state)
-        return MATCH_ALWAYS;
-    return MATCH_NEVER;
-}
-
-static struct state_constraint *create_states_constraint (json_t *values,
-                                                          flux_error_t *errp)
-{
-    struct state_constraint *c;
-    int *bitmask = NULL;
-    int tmp;
-    if ((tmp = array_to_states_bitmask (values, errp)) < 0)
-        return NULL;
-    /* if no states specified, returns MATCH_ALWAYS */
-    if (!tmp)
-        return state_constraint_new (match_always, NULL, errp);
-    if (!(bitmask = malloc (sizeof (*bitmask))))
-        return NULL;
-    (*bitmask) = tmp;
-    if (!(c = state_constraint_new (match_states, wrap_free, errp))
-        || !zlistx_add_end (c->values, bitmask)) {
-        state_constraint_destroy (c);
-        free (bitmask);
-        return NULL;
-    }
-    return c;
-}
-
 void state_constraint_destroy (struct state_constraint *constraint)
 {
     if (constraint) {