commit e02fc99fa16589e5287b101098e25f62e598a285 from: Stefan Sperling date: Tue Mar 19 11:40:44 2019 UTC move declaration of object labels to got_lib_object.h commit - 7baf5860e933fb606101bf5c6eba106e914b0fac commit + e02fc99fa16589e5287b101098e25f62e598a285 blob - fa6616ef2419aebe5b01db6066ef47de8b0dfed7 blob + ef0808bbfa922701a5c6a508b0dc508653a80113 --- lib/got_lib_object.h +++ lib/got_lib_object.h @@ -75,6 +75,21 @@ struct got_tag_object { int refcnt; /* > 0 if open and/or cached */ }; +#define GOT_OBJ_LABEL_COMMIT "commit" +#define GOT_OBJ_LABEL_TREE "tree" +#define GOT_OBJ_LABEL_BLOB "blob" +#define GOT_OBJ_LABEL_TAG "tag" + +#define GOT_COMMIT_LABEL_TREE "tree " +#define GOT_COMMIT_LABEL_PARENT "parent " +#define GOT_COMMIT_LABEL_AUTHOR "author " +#define GOT_COMMIT_LABEL_COMMITTER "committer " + +#define GOT_TAG_LABEL_OBJECT "object " +#define GOT_TAG_LABEL_TYPE "type " +#define GOT_TAG_LABEL_TAG "tag " +#define GOT_TAG_LABEL_TAGGER "tagger " + struct got_object_id *got_object_get_id(struct got_object *); const struct got_error *got_object_get_id_str(char **, struct got_object *); const struct got_error *got_object_open(struct got_object **, blob - 2862561715b1162c14608ed66ad76dc63d2563bc blob + 0852ad5cbf1531f45a52696be1193ee54ca13779 --- lib/object_parse.c +++ lib/object_parse.c @@ -54,21 +54,6 @@ #define nitems(_a) (sizeof(_a) / sizeof((_a)[0])) #endif -#define GOT_OBJ_LABEL_COMMIT "commit" -#define GOT_OBJ_LABEL_TREE "tree" -#define GOT_OBJ_LABEL_BLOB "blob" -#define GOT_OBJ_LABEL_TAG "tag" - -#define GOT_COMMIT_LABEL_TREE "tree " -#define GOT_COMMIT_LABEL_PARENT "parent " -#define GOT_COMMIT_LABEL_AUTHOR "author " -#define GOT_COMMIT_LABEL_COMMITTER "committer " - -#define GOT_TAG_LABEL_OBJECT "object " -#define GOT_TAG_LABEL_TYPE "type " -#define GOT_TAG_LABEL_TAG "tag " -#define GOT_TAG_LABEL_TAGGER "tagger " - int got_object_id_cmp(const struct got_object_id *id1, const struct got_object_id *id2)