From e2d4f89c4999327c8eb1cf47b38fab43756b6c13 Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Sat, 8 Jun 2019 17:28:35 -0500 Subject: oid: `is_zero` instead of `iszero` 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. --- examples/blame.c | 4 ++-- examples/fetch.c | 2 +- include/git2/deprecated.h | 14 ++++++++++++++ include/git2/oid.h | 2 +- src/blame.c | 4 ++-- src/diff_file.c | 2 +- src/diff_generate.c | 12 ++++++------ src/diff_print.c | 8 ++++---- src/diff_tform.c | 4 ++-- src/filter.c | 2 +- src/odb.c | 10 +++++----- src/oid.c | 2 +- src/push.c | 8 ++++---- src/refs.c | 4 ++-- src/status.c | 6 +++--- src/transports/local.c | 2 +- src/transports/smart.c | 2 +- src/transports/smart_protocol.c | 2 +- src/tree.c | 2 +- tests/diff/blob.c | 20 ++++++++++---------- 20 files changed, 63 insertions(+), 49 deletions(-) diff --git a/examples/blame.c b/examples/blame.c index fa586b31e..8484c9f05 100644 --- a/examples/blame.c +++ b/examples/blame.c @@ -72,7 +72,7 @@ int lg2_blame(git_repository *repo, int argc, char *argv[]) * Get the raw data inside the blob for output. We use the * `commitish:path/to/file.txt` format to find it. */ - if (git_oid_iszero(&blameopts.newest_commit)) + if (git_oid_is_zero(&blameopts.newest_commit)) strcpy(spec, "HEAD"); else git_oid_tostr(spec, sizeof(spec), &blameopts.newest_commit); @@ -101,7 +101,7 @@ int lg2_blame(git_repository *repo, int argc, char *argv[]) if (hunk) { char sig[128] = {0}; break_on_null_hunk = 1; - + git_oid_tostr(oid, 10, &hunk->final_commit_id); snprintf(sig, 30, "%s <%s>", hunk->final_signature->name, hunk->final_signature->email); diff --git a/examples/fetch.c b/examples/fetch.c index 7f8e2317f..3b1fad11a 100644 --- a/examples/fetch.c +++ b/examples/fetch.c @@ -21,7 +21,7 @@ static int update_cb(const char *refname, const git_oid *a, const git_oid *b, vo git_oid_fmt(b_str, b); b_str[GIT_OID_HEXSZ] = '\0'; - if (git_oid_iszero(a)) { + if (git_oid_is_zero(a)) { printf("[new] %.20s %s\n", b_str, refname); } else { git_oid_fmt(a_str, a); diff --git a/include/git2/deprecated.h b/include/git2/deprecated.h index 9fe986116..858362cfc 100644 --- a/include/git2/deprecated.h +++ b/include/git2/deprecated.h @@ -246,6 +246,20 @@ GIT_EXTERN(void) giterr_set_oom(void); /**@}*/ +/** @name Deprecated Object ID Types + * + * These types are retained for backward compatibility. The newer + * versions of these values should be preferred in all new code. + * + * There is no plan to remove these backward compatibility values at + * this time. + */ +/**@{*/ + +GIT_EXTERN(int) git_oid_iszero(const git_oid *id); + +/**@}*/ + /** @name Deprecated Transfer Progress Types * * These types are retained for backward compatibility. The newer diff --git a/include/git2/oid.h b/include/git2/oid.h index 7e071bac7..8f27c1365 100644 --- a/include/git2/oid.h +++ b/include/git2/oid.h @@ -207,7 +207,7 @@ GIT_EXTERN(int) git_oid_strcmp(const git_oid *id, const char *str); * * @return 1 if all zeros, 0 otherwise. */ -GIT_EXTERN(int) git_oid_iszero(const git_oid *id); +GIT_EXTERN(int) git_oid_is_zero(const git_oid *id); /** * OID Shortener object diff --git a/src/blame.c b/src/blame.c index be10c15d6..0ed9c0d1d 100644 --- a/src/blame.c +++ b/src/blame.c @@ -204,7 +204,7 @@ static int normalize_options( memcpy(out, in, sizeof(git_blame_options)); /* No newest_commit => HEAD */ - if (git_oid_iszero(&out->newest_commit)) { + if (git_oid_is_zero(&out->newest_commit)) { if (git_reference_name_to_id(&out->newest_commit, repo, "HEAD") < 0) { return -1; } @@ -408,7 +408,7 @@ on_error: static bool hunk_is_bufferblame(git_blame_hunk *hunk) { - return git_oid_iszero(&hunk->final_commit_id); + return git_oid_is_zero(&hunk->final_commit_id); } static int buffer_hunk_cb( diff --git a/src/diff_file.c b/src/diff_file.c index ae1016d9a..d507c755f 100644 --- a/src/diff_file.c +++ b/src/diff_file.c @@ -232,7 +232,7 @@ static int diff_file_content_load_blob( int error = 0; git_odb_object *odb_obj = NULL; - if (git_oid_iszero(&fc->file->id)) + if (git_oid_is_zero(&fc->file->id)) return 0; if (fc->file->mode == GIT_FILEMODE_COMMIT) 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( diff --git a/src/diff_print.c b/src/diff_print.c index 8705615a0..e1a25a959 100644 --- a/src/diff_print.c +++ b/src/diff_print.c @@ -325,10 +325,10 @@ static int diff_delta_format_with_paths( const char *oldpath, const char *newpath) { - if (git_oid_iszero(&delta->old_file.id)) + if (git_oid_is_zero(&delta->old_file.id)) oldpath = "/dev/null"; - if (git_oid_iszero(&delta->new_file.id)) + if (git_oid_is_zero(&delta->new_file.id)) newpath = "/dev/null"; return git_buf_printf(out, template, oldpath, newpath); @@ -381,8 +381,8 @@ done: static bool delta_is_unchanged(const git_diff_delta *delta) { - if (git_oid_iszero(&delta->old_file.id) && - git_oid_iszero(&delta->new_file.id)) + if (git_oid_is_zero(&delta->old_file.id) && + git_oid_is_zero(&delta->new_file.id)) return true; if (delta->old_file.mode == GIT_FILEMODE_COMMIT || diff --git a/src/diff_tform.c b/src/diff_tform.c index 00ce1cbf6..a87661eae 100644 --- a/src/diff_tform.c +++ b/src/diff_tform.c @@ -560,13 +560,13 @@ static int similarity_measure( /* if exact match is requested, force calculation of missing OIDs now */ if (exact_match) { - if (git_oid_iszero(&a_file->id) && + if (git_oid_is_zero(&a_file->id) && diff->old_src == GIT_ITERATOR_TYPE_WORKDIR && !git_diff__oid_for_file(&a_file->id, diff, a_file->path, a_file->mode, a_file->size)) a_file->flags |= GIT_DIFF_FLAG_VALID_ID; - if (git_oid_iszero(&b_file->id) && + if (git_oid_is_zero(&b_file->id) && diff->new_src == GIT_ITERATOR_TYPE_WORKDIR && !git_diff__oid_for_file(&b_file->id, diff, b_file->path, b_file->mode, b_file->size)) diff --git a/src/filter.c b/src/filter.c index 33ddfe2a5..96c27fdf8 100644 --- a/src/filter.c +++ b/src/filter.c @@ -385,7 +385,7 @@ uint16_t git_filter_source_filemode(const git_filter_source *src) const git_oid *git_filter_source_id(const git_filter_source *src) { - return git_oid_iszero(&src->oid) ? NULL : &src->oid; + return git_oid_is_zero(&src->oid) ? NULL : &src->oid; } git_filter_mode_t git_filter_source_mode(const git_filter_source *src) diff --git a/src/odb.c b/src/odb.c index 1c923c5e6..0ede4a36b 100644 --- a/src/odb.c +++ b/src/odb.c @@ -766,7 +766,7 @@ int git_odb_exists(git_odb *db, const git_oid *id) assert(db && id); - if (git_oid_iszero(id)) + if (git_oid_is_zero(id)) return 0; if ((object = git_cache_get_raw(odb_cache(db), id)) != NULL) { @@ -994,7 +994,7 @@ int git_odb__read_header_or_object( *out = NULL; - if (git_oid_iszero(id)) + if (git_oid_is_zero(id)) return error_null_oid(GIT_ENOTFOUND, "cannot read object"); if ((object = git_cache_get_raw(odb_cache(db), id)) != NULL) { @@ -1099,7 +1099,7 @@ int git_odb_read(git_odb_object **out, git_odb *db, const git_oid *id) assert(out && db && id); - if (git_oid_iszero(id)) + if (git_oid_is_zero(id)) return error_null_oid(GIT_ENOTFOUND, "cannot read object"); *out = git_cache_get_raw(odb_cache(db), id); @@ -1123,7 +1123,7 @@ static int odb_otype_fast(git_object_t *type_p, git_odb *db, const git_oid *id) size_t _unused; int error; - if (git_oid_iszero(id)) + if (git_oid_is_zero(id)) return error_null_oid(GIT_ENOTFOUND, "cannot get object type"); if ((object = git_cache_get_raw(odb_cache(db), id)) != NULL) { @@ -1283,7 +1283,7 @@ int git_odb_write( git_odb_hash(oid, data, len, type); - if (git_oid_iszero(oid)) + if (git_oid_is_zero(oid)) return error_null_oid(GIT_EINVALID, "cannot write object"); if (git_odb__freshen(db, oid)) diff --git a/src/oid.c b/src/oid.c index 8d45e4d7d..e46b643d6 100644 --- a/src/oid.c +++ b/src/oid.c @@ -237,7 +237,7 @@ int git_oid_streq(const git_oid *oid_a, const char *str) return git_oid_strcmp(oid_a, str) == 0 ? 0 : -1; } -int git_oid_iszero(const git_oid *oid_a) +int git_oid_is_zero(const git_oid *oid_a) { const unsigned char *a = oid_a->id; unsigned int i; diff --git a/src/push.c b/src/push.c index 9d09e18bb..6b0a4ce73 100644 --- a/src/push.c +++ b/src/push.c @@ -196,7 +196,7 @@ int git_push_update_tips(git_push *push, const git_remote_callbacks *callbacks) continue; /* Update the remote ref */ - if (git_oid_iszero(&push_spec->loid)) { + if (git_oid_is_zero(&push_spec->loid)) { error = git_reference_lookup(&remote_ref, push->remote->repo, git_buf_cstr(&remote_ref_name)); if (error >= 0) { @@ -281,7 +281,7 @@ static int queue_objects(git_push *push) git_object_t type; size_t size; - if (git_oid_iszero(&spec->loid)) + if (git_oid_is_zero(&spec->loid)) /* * Delete reference on remote side; * nothing to do here. @@ -319,7 +319,7 @@ static int queue_objects(git_push *push) if (!spec->refspec.force) { git_oid base; - if (git_oid_iszero(&spec->roid)) + if (git_oid_is_zero(&spec->roid)) continue; if (!git_odb_exists(push->repo->_odb, &spec->roid)) { @@ -346,7 +346,7 @@ static int queue_objects(git_push *push) } git_vector_foreach(&push->remote->refs, i, head) { - if (git_oid_iszero(&head->oid)) + if (git_oid_is_zero(&head->oid)) continue; /* TODO */ diff --git a/src/refs.c b/src/refs.c index 4604d4c4c..dce9e7954 100644 --- a/src/refs.c +++ b/src/refs.c @@ -386,7 +386,7 @@ const git_oid *git_reference_target_peel(const git_reference *ref) { assert(ref); - if (ref->type != GIT_REFERENCE_DIRECT || git_oid_iszero(&ref->peel)) + if (ref->type != GIT_REFERENCE_DIRECT || git_oid_is_zero(&ref->peel)) return NULL; return &ref->peel; @@ -1380,7 +1380,7 @@ int git_reference_peel( * to a commit. So we only want to use the peeled value * if it is not zero and the target is not a tag. */ - if (target_type != GIT_OBJECT_TAG && !git_oid_iszero(&resolved->peel)) { + if (target_type != GIT_OBJECT_TAG && !git_oid_is_zero(&resolved->peel)) { error = git_object_lookup(&target, git_reference_owner(ref), &resolved->peel, GIT_OBJECT_ANY); } else { diff --git a/src/status.c b/src/status.c index ef32a0a8e..b8ae17026 100644 --- a/src/status.c +++ b/src/status.c @@ -85,14 +85,14 @@ static unsigned int workdir_delta2status( /* if OIDs don't match, we might need to calculate them now to * discern between RENAMED vs RENAMED+MODIFED */ - if (git_oid_iszero(&idx2wd->old_file.id) && + if (git_oid_is_zero(&idx2wd->old_file.id) && diff->old_src == GIT_ITERATOR_TYPE_WORKDIR && !git_diff__oid_for_file( &idx2wd->old_file.id, diff, idx2wd->old_file.path, idx2wd->old_file.mode, idx2wd->old_file.size)) idx2wd->old_file.flags |= GIT_DIFF_FLAG_VALID_ID; - if (git_oid_iszero(&idx2wd->new_file.id) && + if (git_oid_is_zero(&idx2wd->new_file.id) && diff->new_src == GIT_ITERATOR_TYPE_WORKDIR && !git_diff__oid_for_file( &idx2wd->new_file.id, diff, idx2wd->new_file.path, @@ -280,7 +280,7 @@ int git_status_list_new( if ((error = git_repository__ensure_not_bare(repo, "status")) < 0 || (error = git_repository_index(&index, repo)) < 0) return error; - + if (opts != NULL && opts->baseline != NULL) { head = opts->baseline; } else { diff --git a/src/transports/local.c b/src/transports/local.c index c8b4291f0..591dd3b60 100644 --- a/src/transports/local.c +++ b/src/transports/local.c @@ -309,7 +309,7 @@ static int local_push_update_remote_ref( if (lref[0] != '\0') { /* Create or update a ref */ error = git_reference_create(NULL, remote_repo, rref, loid, - !git_oid_iszero(roid), NULL); + !git_oid_is_zero(roid), NULL); } else { /* Delete a ref */ if ((error = git_reference_lookup(&remote_ref, remote_repo, rref)) < 0) { diff --git a/src/transports/smart.c b/src/transports/smart.c index 7f66ae0dc..f3d55b25b 100644 --- a/src/transports/smart.c +++ b/src/transports/smart.c @@ -286,7 +286,7 @@ static int git_smart__connect( if ((error = git_smart__detect_caps(first, &t->caps, &symrefs)) == 0) { /* If the only ref in the list is capabilities^{} with OID_ZERO, remove it */ if (1 == t->refs.length && !strcmp(first->head.name, "capabilities^{}") && - git_oid_iszero(&first->head.oid)) { + git_oid_is_zero(&first->head.oid)) { git_vector_clear(&t->refs); git_pkt_free((git_pkt *)first); } diff --git a/src/transports/smart_protocol.c b/src/transports/smart_protocol.c index 9c93a7f93..c251eb844 100644 --- a/src/transports/smart_protocol.c +++ b/src/transports/smart_protocol.c @@ -963,7 +963,7 @@ static int update_refs_from_report( /* Remove any refs which we updated to have a zero OID. */ git_vector_rforeach(refs, i, ref) { - if (git_oid_iszero(&ref->head.oid)) { + if (git_oid_is_zero(&ref->head.oid)) { git_vector_remove(refs, i); git_pkt_free((git_pkt *)ref); } diff --git a/src/tree.c b/src/tree.c index 12317540c..5a48bfcf8 100644 --- a/src/tree.c +++ b/src/tree.c @@ -479,7 +479,7 @@ static int check_entry(git_repository *repo, const char *filename, const git_oid if (!valid_entry_name(repo, filename)) return tree_error("failed to insert entry: invalid name for a tree entry", filename); - if (git_oid_iszero(id)) + if (git_oid_is_zero(id)) return tree_error("failed to insert entry: invalid null OID", filename); if (filemode != GIT_FILEMODE_COMMIT && diff --git a/tests/diff/blob.c b/tests/diff/blob.c index 37898adcf..5976083d1 100644 --- a/tests/diff/blob.c +++ b/tests/diff/blob.c @@ -315,7 +315,7 @@ void test_diff_blob__can_compare_against_null_blobs_with_patch(void) cl_assert_equal_i(GIT_DELTA_DELETED, delta->status); cl_assert_equal_oid(git_blob_id(d), &delta->old_file.id); cl_assert_equal_sz(git_blob_rawsize(d), delta->old_file.size); - cl_assert(git_oid_iszero(&delta->new_file.id)); + cl_assert(git_oid_is_zero(&delta->new_file.id)); cl_assert_equal_sz(0, delta->new_file.size); cl_assert_equal_i(1, (int)git_patch_num_hunks(p)); @@ -338,7 +338,7 @@ void test_diff_blob__can_compare_against_null_blobs_with_patch(void) delta = git_patch_get_delta(p); cl_assert(delta != NULL); cl_assert_equal_i(GIT_DELTA_ADDED, delta->status); - cl_assert(git_oid_iszero(&delta->old_file.id)); + cl_assert(git_oid_is_zero(&delta->old_file.id)); cl_assert_equal_sz(0, delta->old_file.size); cl_assert_equal_oid(git_blob_id(d), &delta->new_file.id); cl_assert_equal_sz(git_blob_rawsize(d), delta->new_file.size); @@ -445,9 +445,9 @@ void test_diff_blob__can_compare_identical_blobs_with_patch(void) cl_assert(delta != NULL); cl_assert_equal_i(GIT_DELTA_UNMODIFIED, delta->status); cl_assert_equal_sz(0, delta->old_file.size); - cl_assert(git_oid_iszero(&delta->old_file.id)); + cl_assert(git_oid_is_zero(&delta->old_file.id)); cl_assert_equal_sz(0, delta->new_file.size); - cl_assert(git_oid_iszero(&delta->new_file.id)); + cl_assert(git_oid_is_zero(&delta->new_file.id)); cl_assert_equal_i(0, (int)git_patch_num_hunks(p)); git_patch_free(p); @@ -520,19 +520,19 @@ void test_diff_blob__can_compare_a_binary_blob_and_a_text_blob(void) * +++ b/a0f7217 * @@ -1,6 +1,6 @@ * Here is some stuff at the start - * + * * -This should go in one hunk * +This should go in one hunk (first) - * + * * Some additional lines - * + * * @@ -8,7 +8,7 @@ Down here below the other lines - * + * * With even more at the end - * + * * -Followed by a second hunk of stuff * +Followed by a second hunk of stuff (second) - * + * * That happens down here */ void test_diff_blob__comparing_two_text_blobs_honors_interhunkcontext(void) -- cgit v1.2.1