builtin/grep: convert to struct object_id
Convert several functions to use struct object_id, and rename them so that they no longer refer to SHA-1. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
brian m. carlson committed
Feb 21, 2017 at 23:47 UTC
1db1108654d55e44e3814b0881bcdb4f0ebf8756
1 file changed
+12
-12
builtin/grep.c
+12
-12
@@ -294,17 +294,17 @@ static int grep_cmd_config(const char *var, const char *value, void *cb)
294
return st;
295
}
296
297
-static void *lock_and_read_sha1_file(const unsigned char *sha1, enum object_type *type, unsigned long *size)
297
+static void *lock_and_read_oid_file(const struct object_id *oid, enum object_type *type, unsigned long *size)
298
{
299
void *data;
300
301
grep_read_lock();
302
- data = read_sha1_file(sha1, type, size);
302
+ data = read_sha1_file(oid->hash, type, size);
303
grep_read_unlock();
304
return data;
305
}
306
307
-static int grep_sha1(struct grep_opt *opt, const unsigned char *sha1,
307
+static int grep_oid(struct grep_opt *opt, const struct object_id *oid,
308
const char *filename, int tree_name_len,
309
const char *path)
310
{
@@ -323,7 +323,7 @@ static int grep_sha1(struct grep_opt *opt, const unsigned char *sha1,
323
324
#ifndef NO_PTHREADS
325
if (num_threads) {
326
- add_work(opt, GREP_SOURCE_SHA1, pathbuf.buf, path, sha1);
326
+ add_work(opt, GREP_SOURCE_SHA1, pathbuf.buf, path, oid);
327
strbuf_release(&pathbuf);
328
return 0;
329
} else
@@ -332,7 +332,7 @@ static int grep_sha1(struct grep_opt *opt, const unsigned char *sha1,
332
struct grep_source gs;
333
int hit;
334
335
- grep_source_init(&gs, GREP_SOURCE_SHA1, pathbuf.buf, path, sha1);
335
+ grep_source_init(&gs, GREP_SOURCE_SHA1, pathbuf.buf, path, oid);
336
strbuf_release(&pathbuf);
337
hit = grep_source(opt, &gs);
338
@@ -690,7 +690,7 @@ static int grep_cache(struct grep_opt *opt, const struct pathspec *pathspec,
690
ce_skip_worktree(ce)) {
691
if (ce_stage(ce) || ce_intent_to_add(ce))
692
continue;
693
- hit |= grep_sha1(opt, ce->oid.hash, ce->name,
693
+ hit |= grep_oid(opt, &ce->oid, ce->name,
694
0, ce->name);
695
} else {
696
hit |= grep_file(opt, ce->name);
@@ -750,7 +750,7 @@ static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec,
750
strbuf_add(base, entry.path, te_len);
751
752
if (S_ISREG(entry.mode)) {
753
- hit |= grep_sha1(opt, entry.oid->hash, base->buf, tn_len,
753
+ hit |= grep_oid(opt, entry.oid, base->buf, tn_len,
754
check_attr ? base->buf + tn_len : NULL);
755
} else if (S_ISDIR(entry.mode)) {
756
enum object_type type;
@@ -758,7 +758,7 @@ static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec,
758
void *data;
759
unsigned long size;
760
761
- data = lock_and_read_sha1_file(entry.oid->hash, &type, &size);
761
+ data = lock_and_read_oid_file(entry.oid, &type, &size);
762
if (!data)
763
die(_("unable to read tree (%s)"),
764
oid_to_hex(entry.oid));
@@ -787,7 +787,7 @@ static int grep_object(struct grep_opt *opt, const struct pathspec *pathspec,
787
struct object *obj, const char *name, const char *path)
788
{
789
if (obj->type == OBJ_BLOB)
790
- return grep_sha1(opt, obj->oid.hash, name, 0, path);
790
+ return grep_oid(opt, &obj->oid, name, 0, path);
791
if (obj->type == OBJ_COMMIT || obj->type == OBJ_TREE) {
792
struct tree_desc tree;
793
void *data;
@@ -1152,11 +1152,11 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
1152
/* Check revs and then paths */
1153
for (i = 0; i < argc; i++) {
1154
const char *arg = argv[i];
1155
- unsigned char sha1[20];
1155
+ struct object_id oid;
1156
struct object_context oc;
1157
/* Is it a rev? */
1158
- if (!get_sha1_with_context(arg, 0, sha1, &oc)) {
1159
- struct object *object = parse_object_or_die(sha1, arg);
1158
+ if (!get_sha1_with_context(arg, 0, oid.hash, &oc)) {
1159
+ struct object *object = parse_object_or_die(oid.hash, arg);
1160
if (!seen_dashdash)
1161
verify_non_filename(prefix, arg);
1162
add_object_array_with_path(object, arg, &list, oc.mode, oc.path);