regex: use regexec_buf()

diff --git a/revision.c b/revision.c
index 3c847818164481f655d2dc822ffa5ade184a3058..8b2dfe3160784f9780cf541a674fe89100d38a93 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -25,27 +25,14 @@ volatile show_early_output_fn_t show_early_output;
 static const char *term_bad;
 static const char *term_good;
 
-char *path_name(struct strbuf *path, const char *name)
+void show_object_with_name(FILE *out, struct object *obj, const char *name)
 {
-       struct strbuf ret = STRBUF_INIT;
-       if (path)
-               strbuf_addbuf(&ret, path);
-       strbuf_addstr(&ret, name);
-       return strbuf_detach(&ret, NULL);
-}
-
-void show_object_with_name(FILE *out, struct object *obj,
-                          struct strbuf *path, const char *component)
-{
-       char *name = path_name(path, component);
-       char *p;
+       const char *p;
 
        fprintf(out, "%s ", oid_to_hex(&obj->oid));
        for (p = name; *p && *p != '\n'; p++)
                fputc(*p, out);
        fputc('\n', out);
-
-       free(name);
 }
 
 static void mark_blob_uninteresting(struct blob *blob)
@@ -497,7 +484,7 @@ struct treesame_state {
 static struct treesame_state *initialise_treesame(struct rev_info *revs, struct commit *commit)
 {
        unsigned n = commit_list_count(commit->parents);
-       struct treesame_state *st = xcalloc(1, sizeof(*st) + n);
+       struct treesame_state *st = xcalloc(1, st_add(sizeof(*st), n));
        st->nparents = n;
        add_decoration(&revs->treesame, &commit->object, st);
        return st;