refspec: convert valid_fetch_refspec to use parse_refspec

diff --git a/refspec.h b/refspec.h
index 62625c23a3e2273d9334b5c37e14be3f849c6e3c..1063c64ccc245350f03c3066fc6c90026cd7dc60 100644 (file)
--- a/refspec.h
+++ b/refspec.h
@@ -2,9 +2,9 @@
 #define REFSPEC_H
 
 #define TAG_REFSPEC "refs/tags/*:refs/tags/*"
-extern const struct refspec *tag_refspec;
+extern const struct refspec_item *tag_refspec;
 
-struct refspec {
+struct refspec_item {
        unsigned force : 1;
        unsigned pattern : 1;
        unsigned matching : 1;
@@ -14,10 +14,36 @@ struct refspec {
        char *dst;
 };
 
-int valid_fetch_refspec(const char *refspec);
-struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec);
-struct refspec *parse_push_refspec(int nr_refspec, const char **refspec);
+struct refspec_item *parse_fetch_refspec(int nr_refspec, const char **refspec);
+struct refspec_item *parse_push_refspec(int nr_refspec, const char **refspec);
+
+void free_refspec(int nr_refspec, struct refspec_item *refspec);
+
+#define REFSPEC_FETCH 1
+#define REFSPEC_PUSH 0
+
+#define REFSPEC_INIT_FETCH { .fetch = REFSPEC_FETCH }
+#define REFSPEC_INIT_PUSH { .fetch = REFSPEC_PUSH }
+
+struct refspec {
+       struct refspec_item *items;
+       int alloc;
+       int nr;
+
+       const char **raw;
+       int raw_alloc;
+       int raw_nr;
+
+       int fetch;
+};
+
+void refspec_item_init(struct refspec_item *item, const char *refspec, int fetch);
+void refspec_item_clear(struct refspec_item *item);
+void refspec_init(struct refspec *rs, int fetch);
+void refspec_append(struct refspec *rs, const char *refspec);
+void refspec_appendn(struct refspec *rs, const char **refspecs, int nr);
+void refspec_clear(struct refspec *rs);
 
-void free_refspec(int nr_refspec, struct refspec *refspec);
+int valid_fetch_refspec(const char *refspec);
 
 #endif /* REFSPEC_H */