diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2020-04-05 18:27:51 +0100 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2020-11-27 11:09:20 +0000 |
| commit | 1a724625e76d9127cf03fb780a924650345f7f60 (patch) | |
| tree | 9d10b057f2efd70d60675fd402a6d86630c010e3 | |
| parent | 4dba9303359e45cb5a7cfe58740131140760b122 (diff) | |
| download | libgit2-1a724625e76d9127cf03fb780a924650345f7f60.tar.gz | |
patch: use GIT_ASSERT
| -rw-r--r-- | src/patch.c | 16 | ||||
| -rw-r--r-- | src/patch_generate.c | 4 | ||||
| -rw-r--r-- | src/patch_parse.c | 3 |
3 files changed, 13 insertions, 10 deletions
diff --git a/src/patch.c b/src/patch.c index 82181bb3d..8f8bd7a08 100644 --- a/src/patch.c +++ b/src/patch.c @@ -65,7 +65,7 @@ size_t git_patch_size( { size_t out; - assert(patch); + GIT_ASSERT_ARG(patch); out = patch->content_size; @@ -129,13 +129,13 @@ int git_patch_line_stats( const git_diff_delta *git_patch_get_delta(const git_patch *patch) { - assert(patch); + GIT_ASSERT_ARG_WITH_RETVAL(patch, NULL); return patch->delta; } size_t git_patch_num_hunks(const git_patch *patch) { - assert(patch); + GIT_ASSERT_ARG(patch); return git_array_size(patch->hunks); } @@ -152,7 +152,7 @@ int git_patch_get_hunk( size_t hunk_idx) { git_patch_hunk *hunk; - assert(patch); + GIT_ASSERT_ARG(patch); hunk = git_array_get(patch->hunks, hunk_idx); @@ -170,7 +170,7 @@ int git_patch_get_hunk( int git_patch_num_lines_in_hunk(const git_patch *patch, size_t hunk_idx) { git_patch_hunk *hunk; - assert(patch); + GIT_ASSERT_ARG(patch); if (!(hunk = git_array_get(patch->hunks, hunk_idx))) return patch_error_outofrange("hunk"); @@ -186,7 +186,7 @@ int git_patch_get_line_in_hunk( git_patch_hunk *hunk; git_diff_line *line; - assert(patch); + GIT_ASSERT_ARG(patch); if (!(hunk = git_array_get(patch->hunks, hunk_idx))) { if (out) *out = NULL; @@ -206,7 +206,9 @@ int git_patch_get_line_in_hunk( int git_patch_from_diff(git_patch **out, git_diff *diff, size_t idx) { - assert(out && diff && diff->patch_fn); + GIT_ASSERT_ARG(out); + GIT_ASSERT_ARG(diff); + GIT_ASSERT_ARG(diff->patch_fn); return diff->patch_fn(out, diff, idx); } diff --git a/src/patch_generate.c b/src/patch_generate.c index 6dd61c18f..38cd714a9 100644 --- a/src/patch_generate.c +++ b/src/patch_generate.c @@ -561,7 +561,7 @@ static int patch_from_sources( patch_generated_with_delta *pd; git_xdiff_output xo; - assert(out); + GIT_ASSERT_ARG(out); *out = NULL; if ((error = patch_generated_with_delta_alloc( @@ -840,7 +840,7 @@ static int patch_generated_line_cb( GIT_UNUSED(hunk_); hunk = git_array_last(patch->base.hunks); - assert(hunk); /* programmer error if no hunk is available */ + GIT_ASSERT(hunk); /* programmer error if no hunk is available */ line = git_array_alloc(patch->base.lines); GIT_ERROR_CHECK_ALLOC(line); diff --git a/src/patch_parse.c b/src/patch_parse.c index 2bf94c2cb..2cc5c5995 100644 --- a/src/patch_parse.c +++ b/src/patch_parse.c @@ -1168,7 +1168,8 @@ int git_patch_parse( size_t start, used; int error = 0; - assert(out && ctx); + GIT_ASSERT_ARG(out); + GIT_ASSERT_ARG(ctx); *out = NULL; |