diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2019-06-08 17:28:35 -0500 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2019-06-08 17:28:35 -0500 |
| commit | e2d4f89c4999327c8eb1cf47b38fab43756b6c13 (patch) | |
| tree | ff7b387caad5bba97799f150b51cd972158f0de1 /src/diff_generate.c | |
| parent | e50d138e898dd034161663873f75716086266f86 (diff) | |
| download | libgit2-ethomson/is_and_from.tar.gz | |
oid: `is_zero` instead of `iszero`ethomson/is_and_from
The only function that is named `issomething` (without underscore) was
`git_oid_iszero`. Rename it to `git_oid_is_zero` for consistency with
the rest of the library.
Diffstat (limited to 'src/diff_generate.c')
| -rw-r--r-- | src/diff_generate.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/diff_generate.c b/src/diff_generate.c index 5579dc214..001cefd54 100644 --- a/src/diff_generate.c +++ b/src/diff_generate.c @@ -179,7 +179,7 @@ static int diff_delta__from_one( delta->old_file.flags |= GIT_DIFF_FLAG_VALID_ID; - if (has_old || !git_oid_iszero(&delta->new_file.id)) + if (has_old || !git_oid_is_zero(&delta->new_file.id)) delta->new_file.flags |= GIT_DIFF_FLAG_VALID_ID; return diff_insert_delta(diff, delta, matched_pathspec); @@ -240,7 +240,7 @@ static int diff_delta__from_two( delta->old_file.flags |= GIT_DIFF_FLAG_EXISTS; delta->new_file.flags |= GIT_DIFF_FLAG_EXISTS; - if (!git_oid_iszero(&new_entry->id)) + if (!git_oid_is_zero(&new_entry->id)) delta->new_file.flags |= GIT_DIFF_FLAG_VALID_ID; } @@ -797,13 +797,13 @@ static int maybe_modified( /* if oids and modes match (and are valid), then file is unmodified */ } else if (git_oid_equal(&oitem->id, &nitem->id) && omode == nmode && - !git_oid_iszero(&oitem->id)) { + !git_oid_is_zero(&oitem->id)) { status = GIT_DELTA_UNMODIFIED; /* if we have an unknown OID and a workdir iterator, then check some * circumstances that can accelerate things or need special handling */ - } else if (git_oid_iszero(&nitem->id) && new_is_workdir) { + } else if (git_oid_is_zero(&nitem->id) && new_is_workdir) { bool use_ctime = ((diff->diffcaps & GIT_DIFFCAPS_TRUST_CTIME) != 0); git_index *index = git_iterator_index(info->new_iter); @@ -843,7 +843,7 @@ static int maybe_modified( /* if we got here and decided that the files are modified, but we * haven't calculated the OID of the new item, then calculate it now */ - if (modified_uncertain && git_oid_iszero(&nitem->id)) { + if (modified_uncertain && git_oid_is_zero(&nitem->id)) { const git_oid *update_check = DIFF_FLAG_IS_SET(diff, GIT_DIFF_UPDATE_INDEX) && omode == nmode ? &oitem->id : NULL; @@ -877,7 +877,7 @@ static int maybe_modified( return diff_delta__from_two( diff, status, oitem, omode, nitem, nmode, - git_oid_iszero(&noid) ? NULL : &noid, matched_pathspec); + git_oid_is_zero(&noid) ? NULL : &noid, matched_pathspec); } static bool entry_is_prefixed( |