Commit 3351506a by Edward Thomson

tree functions: return an int

Stop returning a void for functions, future-proofing them to allow them
to fail.
parent 2e8c3b0b
...@@ -258,8 +258,9 @@ GIT_EXTERN(int) git_treebuilder_new( ...@@ -258,8 +258,9 @@ GIT_EXTERN(int) git_treebuilder_new(
* Clear all the entires in the builder * Clear all the entires in the builder
* *
* @param bld Builder to clear * @param bld Builder to clear
* @return 0 on success; error code otherwise
*/ */
GIT_EXTERN(void) git_treebuilder_clear(git_treebuilder *bld); GIT_EXTERN(int) git_treebuilder_clear(git_treebuilder *bld);
/** /**
* Get the number of entries listed in a treebuilder * Get the number of entries listed in a treebuilder
...@@ -357,8 +358,9 @@ typedef int GIT_CALLBACK(git_treebuilder_filter_cb)( ...@@ -357,8 +358,9 @@ typedef int GIT_CALLBACK(git_treebuilder_filter_cb)(
* @param bld Tree builder * @param bld Tree builder
* @param filter Callback to filter entries * @param filter Callback to filter entries
* @param payload Extra data to pass to filter callback * @param payload Extra data to pass to filter callback
* @return 0 on success, non-zero callback return value, or error code
*/ */
GIT_EXTERN(void) git_treebuilder_filter( GIT_EXTERN(int) git_treebuilder_filter(
git_treebuilder *bld, git_treebuilder *bld,
git_treebuilder_filter_cb filter, git_treebuilder_filter_cb filter,
void *payload); void *payload);
......
...@@ -834,7 +834,7 @@ out: ...@@ -834,7 +834,7 @@ out:
return error; return error;
} }
void git_treebuilder_filter( int git_treebuilder_filter(
git_treebuilder *bld, git_treebuilder *bld,
git_treebuilder_filter_cb filter, git_treebuilder_filter_cb filter,
void *payload) void *payload)
...@@ -850,9 +850,11 @@ void git_treebuilder_filter( ...@@ -850,9 +850,11 @@ void git_treebuilder_filter(
git_tree_entry_free(entry); git_tree_entry_free(entry);
} }
}); });
return 0;
} }
void git_treebuilder_clear(git_treebuilder *bld) int git_treebuilder_clear(git_treebuilder *bld)
{ {
git_tree_entry *e; git_tree_entry *e;
...@@ -860,6 +862,8 @@ void git_treebuilder_clear(git_treebuilder *bld) ...@@ -860,6 +862,8 @@ void git_treebuilder_clear(git_treebuilder *bld)
git_strmap_foreach_value(bld->map, e, git_tree_entry_free(e)); git_strmap_foreach_value(bld->map, e, git_tree_entry_free(e));
git_strmap_clear(bld->map); git_strmap_clear(bld->map);
return 0;
} }
void git_treebuilder_free(git_treebuilder *bld) void git_treebuilder_free(git_treebuilder *bld)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment