Commit 5bd139e9 by Edward Thomson

revparse: use GIT_ASSERT

parent 055fbf6d
...@@ -317,7 +317,7 @@ static int handle_at_syntax(git_object **out, git_reference **ref, const char *s ...@@ -317,7 +317,7 @@ static int handle_at_syntax(git_object **out, git_reference **ref, const char *s
git_buf identifier = GIT_BUF_INIT; git_buf identifier = GIT_BUF_INIT;
git_time_t timestamp; git_time_t timestamp;
assert(*out == NULL); GIT_ASSERT(*out == NULL);
if (git_buf_put(&identifier, spec, identifier_len) < 0) if (git_buf_put(&identifier, spec, identifier_len) < 0)
return -1; return -1;
...@@ -524,7 +524,7 @@ static int extract_curly_braces_content(git_buf *buf, const char *spec, size_t * ...@@ -524,7 +524,7 @@ static int extract_curly_braces_content(git_buf *buf, const char *spec, size_t *
{ {
git_buf_clear(buf); git_buf_clear(buf);
assert(spec[*pos] == '^' || spec[*pos] == '@'); GIT_ASSERT_ARG(spec[*pos] == '^' || spec[*pos] == '@');
(*pos)++; (*pos)++;
...@@ -550,7 +550,7 @@ static int extract_path(git_buf *buf, const char *spec, size_t *pos) ...@@ -550,7 +550,7 @@ static int extract_path(git_buf *buf, const char *spec, size_t *pos)
{ {
git_buf_clear(buf); git_buf_clear(buf);
assert(spec[*pos] == ':'); GIT_ASSERT_ARG(spec[*pos] == ':');
(*pos)++; (*pos)++;
...@@ -568,7 +568,7 @@ static int extract_how_many(int *n, const char *spec, size_t *pos) ...@@ -568,7 +568,7 @@ static int extract_how_many(int *n, const char *spec, size_t *pos)
int parsed, accumulated; int parsed, accumulated;
char kind = spec[*pos]; char kind = spec[*pos];
assert(spec[*pos] == '^' || spec[*pos] == '~'); GIT_ASSERT_ARG(spec[*pos] == '^' || spec[*pos] == '~');
accumulated = 0; accumulated = 0;
...@@ -676,7 +676,10 @@ static int revparse( ...@@ -676,7 +676,10 @@ static int revparse(
bool should_return_reference = true; bool should_return_reference = true;
assert(object_out && reference_out && repo && spec); GIT_ASSERT_ARG(object_out);
GIT_ASSERT_ARG(reference_out);
GIT_ASSERT_ARG(repo);
GIT_ASSERT_ARG(spec);
*object_out = NULL; *object_out = NULL;
*reference_out = NULL; *reference_out = NULL;
...@@ -882,7 +885,9 @@ int git_revparse( ...@@ -882,7 +885,9 @@ int git_revparse(
const char *dotdot; const char *dotdot;
int error = 0; int error = 0;
assert(revspec && repo && spec); GIT_ASSERT_ARG(revspec);
GIT_ASSERT_ARG(repo);
GIT_ASSERT_ARG(spec);
memset(revspec, 0x0, sizeof(*revspec)); memset(revspec, 0x0, sizeof(*revspec));
......
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