Skip to content

Commit 3351506

Browse files
committed
tree functions: return an int
Stop returning a void for functions, future-proofing them to allow them to fail.
1 parent 2e8c3b0 commit 3351506

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

include/git2/tree.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,9 @@ GIT_EXTERN(int) git_treebuilder_new(
258258
* Clear all the entires in the builder
259259
*
260260
* @param bld Builder to clear
261+
* @return 0 on success; error code otherwise
261262
*/
262-
GIT_EXTERN(void) git_treebuilder_clear(git_treebuilder *bld);
263+
GIT_EXTERN(int) git_treebuilder_clear(git_treebuilder *bld);
263264

264265
/**
265266
* Get the number of entries listed in a treebuilder
@@ -357,8 +358,9 @@ typedef int GIT_CALLBACK(git_treebuilder_filter_cb)(
357358
* @param bld Tree builder
358359
* @param filter Callback to filter entries
359360
* @param payload Extra data to pass to filter callback
361+
* @return 0 on success, non-zero callback return value, or error code
360362
*/
361-
GIT_EXTERN(void) git_treebuilder_filter(
363+
GIT_EXTERN(int) git_treebuilder_filter(
362364
git_treebuilder *bld,
363365
git_treebuilder_filter_cb filter,
364366
void *payload);

src/tree.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,7 @@ int git_treebuilder_write_with_buffer(git_oid *oid, git_treebuilder *bld, git_bu
834834
return error;
835835
}
836836

837-
void git_treebuilder_filter(
837+
int git_treebuilder_filter(
838838
git_treebuilder *bld,
839839
git_treebuilder_filter_cb filter,
840840
void *payload)
@@ -850,16 +850,20 @@ void git_treebuilder_filter(
850850
git_tree_entry_free(entry);
851851
}
852852
});
853+
854+
return 0;
853855
}
854856

855-
void git_treebuilder_clear(git_treebuilder *bld)
857+
int git_treebuilder_clear(git_treebuilder *bld)
856858
{
857859
git_tree_entry *e;
858860

859861
assert(bld);
860862

861863
git_strmap_foreach_value(bld->map, e, git_tree_entry_free(e));
862864
git_strmap_clear(bld->map);
865+
866+
return 0;
863867
}
864868

865869
void git_treebuilder_free(git_treebuilder *bld)

0 commit comments

Comments
 (0)