Merge pull request libgit2#3539 from libgit2/typedef-submodule-cb

carlosmn · carlosmn · commit 21b1e015a358 · 2015-12-08T21:11:58.000+01:00
Use a typedef for the submodule_foreach callback.
diff --git a/include/git2/submodule.h b/include/git2/submodule.h
@@ -107,6 +107,17 @@ typedef enum {
 	GIT_SUBMODULE_STATUS_WD_WD_MODIFIED | \
 	GIT_SUBMODULE_STATUS_WD_UNTRACKED)) != 0)
 
+/**
+ * Function pointer to receive each submodule
+ *
+ * @param sm git_submodule currently being visited
+ * @param name name of the submodule
+ * @param payload value you passed to the foreach function as payload
+ * @return 0 on success or error code
+ */
+typedef int (*git_submodule_cb)(
+	git_submodule *sm, const char *name, void *payload);
+
 /**
  * Submodule update options structure
  *
@@ -239,7 +250,7 @@ GIT_EXTERN(void) git_submodule_free(git_submodule *submodule);
  */
 GIT_EXTERN(int) git_submodule_foreach(
 	git_repository *repo,
-	int (*callback)(git_submodule *sm, const char *name, void *payload),
+	git_submodule_cb callback,
 	void *payload);
 
 /**
diff --git a/src/submodule.c b/src/submodule.c
@@ -495,7 +495,7 @@ static int all_submodules(git_repository *repo, git_strmap *map)
 
 int git_submodule_foreach(
 	git_repository *repo,
-	int (*callback)(git_submodule *sm, const char *name, void *payload),
+	git_submodule_cb callback,
 	void *payload)
 {
 	git_vector snapshot = GIT_VECTOR_INIT;

Original file line number	Diff line number	Diff line change
`@@ -495,7 +495,7 @@ static int all_submodules(git_repository repo, git_strmap map)`
`495`	`495`
`496`	`496`	`int git_submodule_foreach(`
`497`	`497`	`git_repository *repo,`
`498`		`- int (callback)(git_submodule sm, const char name, void payload),`
	`498`	`+ git_submodule_cb callback,`
`499`	`499`	`void *payload)`
`500`	`500`	`{`
`501`	`501`	`git_vector snapshot = GIT_VECTOR_INIT;`