admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

notes-cache: convert to struct object_id

Browse Source 
Convert as many instances of unsigned char [20] as possible.  Update the
callers of notes_cache_get and notes_cache_put to use the new interface.
Among the functions updated are callers of
lookup_commit_reference_gently, which we will soon convert.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson
2017-05-06 22:09:58 +00:00
committed by Junio C Hamano
parent 71f35d5cbc
commit 569aa376ea
3 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
diff.c
View File

@@ -5244,7 +5244,7 @@ size_t fill_textconv(struct userdiff_driver *driver,
if (driver->textconv_cache && df->oid_valid) { if (driver->textconv_cache && df->oid_valid) {
*outbuf = notes_cache_get(driver->textconv_cache, *outbuf = notes_cache_get(driver->textconv_cache,
df->oid.hash, &df->oid,
&size); &size);
if (*outbuf) if (*outbuf)
return size; return size;
@@ -5256,7 +5256,7 @@ size_t fill_textconv(struct userdiff_driver *driver,
if (driver->textconv_cache && df->oid_valid) { if (driver->textconv_cache && df->oid_valid) {
/* ignore errors, as we might be in a readonly repository */ /* ignore errors, as we might be in a readonly repository */
notes_cache_put(driver->textconv_cache, df->oid.hash, *outbuf, notes_cache_put(driver->textconv_cache, &df->oid, *outbuf,
size); size);
/* /*
* we could save up changes and flush them all at the end, * we could save up changes and flush them all at the end,

29
notes-cache.c
View File

@@ -5,16 +5,16 @@
static int notes_cache_match_validity(const char *ref, const char *validity) static int notes_cache_match_validity(const char *ref, const char *validity)
{ {
unsigned char sha1[20]; struct object_id oid;
struct commit *commit; struct commit *commit;
struct pretty_print_context pretty_ctx; struct pretty_print_context pretty_ctx;
struct strbuf msg = STRBUF_INIT; struct strbuf msg = STRBUF_INIT;
int ret; int ret;
if (read_ref(ref, sha1) < 0) if (read_ref(ref, oid.hash) < 0)
return 0; return 0;
commit = lookup_commit_reference_gently(sha1, 1); commit = lookup_commit_reference_gently(oid.hash, 1);
if (!commit) if (!commit)
return 0; return 0;
@@ -46,8 +46,7 @@ void notes_cache_init(struct notes_cache *c, const char *name,
int notes_cache_write(struct notes_cache *c) int notes_cache_write(struct notes_cache *c)
{ {
unsigned char tree_sha1[20]; struct object_id tree_oid, commit_oid;
unsigned char commit_sha1[20];
if (!c || !c->tree.initialized || !c->tree.update_ref || if (!c || !c->tree.initialized || !c->tree.update_ref ||
!*c->tree.update_ref) !*c->tree.update_ref)
@@ -55,19 +54,19 @@ int notes_cache_write(struct notes_cache *c)
if (!c->tree.dirty) if (!c->tree.dirty)
return 0; return 0;
if (write_notes_tree(&c->tree, tree_sha1)) if (write_notes_tree(&c->tree, tree_oid.hash))
return -1; return -1;
if (commit_tree(c->validity, strlen(c->validity), tree_sha1, NULL, if (commit_tree(c->validity, strlen(c->validity), tree_oid.hash, NULL,
commit_sha1, NULL, NULL) < 0) commit_oid.hash, NULL, NULL) < 0)
return -1; return -1;
if (update_ref("update notes cache", c->tree.update_ref, commit_sha1, if (update_ref("update notes cache", c->tree.update_ref, commit_oid.hash,
NULL, 0, UPDATE_REFS_QUIET_ON_ERR) < 0) NULL, 0, UPDATE_REFS_QUIET_ON_ERR) < 0)
return -1; return -1;
return 0; return 0;
} }
char *notes_cache_get(struct notes_cache *c, unsigned char key_sha1[20], char *notes_cache_get(struct notes_cache *c, struct object_id *key_oid,
size_t *outsize) size_t *outsize)
{ {
const unsigned char *value_sha1; const unsigned char *value_sha1;
@@ -75,7 +74,7 @@ char *notes_cache_get(struct notes_cache *c, unsigned char key_sha1[20],
char *value; char *value;
unsigned long size; unsigned long size;
value_sha1 = get_note(&c->tree, key_sha1); value_sha1 = get_note(&c->tree, key_oid->hash);
if (!value_sha1) if (!value_sha1)
return NULL; return NULL;
value = read_sha1_file(value_sha1, &type, &size); value = read_sha1_file(value_sha1, &type, &size);
@@ -84,12 +83,12 @@ char *notes_cache_get(struct notes_cache *c, unsigned char key_sha1[20],
return value; return value;
} }
int notes_cache_put(struct notes_cache *c, unsigned char key_sha1[20], int notes_cache_put(struct notes_cache *c, struct object_id *key_oid,
const char *data, size_t size) const char *data, size_t size)
{ {
unsigned char value_sha1[20]; struct object_id value_oid;
if (write_sha1_file(data, size, "blob", value_sha1) < 0) if (write_sha1_file(data, size, "blob", value_oid.hash) < 0)
return -1; return -1;
return add_note(&c->tree, key_sha1, value_sha1, NULL); return add_note(&c->tree, key_oid->hash, value_oid.hash, NULL);
} }

4
notes-cache.h
View File

@@ -12,9 +12,9 @@ void notes_cache_init(struct notes_cache *c, const char *name,
const char *validity); const char *validity);
int notes_cache_write(struct notes_cache *c); int notes_cache_write(struct notes_cache *c);
char *notes_cache_get(struct notes_cache *c, unsigned char sha1[20], size_t char *notes_cache_get(struct notes_cache *c, struct object_id *oid, size_t
*outsize); *outsize);
int notes_cache_put(struct notes_cache *c, unsigned char sha1[20], int notes_cache_put(struct notes_cache *c, struct object_id *oid,
const char *data, size_t size); const char *data, size_t size);
#endif /* NOTES_CACHE_H */ #endif /* NOTES_CACHE_H */