diff options
| author | Shawn Pearce <spearce@spearce.org> | 2006-09-02 00:16:31 -0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-09-02 03:24:37 -0700 |
| commit | 9befac470b4cfad529032dbcffcb71242ec71f91 (patch) | |
| tree | f3715172da747456dd63c6d80c3f1e0a7d6f2d56 /merge-tree.c | |
| parent | ad1ed5ee896ba5d7f89bc04c7441b1532efb9853 (diff) | |
| download | git-9befac470b4cfad529032dbcffcb71242ec71f91.tar.gz git-9befac470b4cfad529032dbcffcb71242ec71f91.tar.xz | |
Replace uses of strdup with xstrdup.
Like xmalloc and xrealloc xstrdup dies with a useful message if
the native strdup() implementation returns NULL rather than a
valid pointer.
I just tried to use xstrdup in new code and found it to be missing.
However I expected it to be present as xmalloc and xrealloc are
already commonly used throughout the code.
[jc: removed the part that deals with last_XXX, which I am
finding more and more dubious these days.]
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-tree.c')
| -rw-r--r-- | merge-tree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/merge-tree.c b/merge-tree.c index c2e9a867e..60df758c4 100644 --- a/merge-tree.c +++ b/merge-tree.c @@ -177,7 +177,7 @@ static void resolve(const char *base, struct name_entry *branch1, struct name_en if (!branch1) return; - path = strdup(mkpath("%s%s", base, result->path)); + path = xstrdup(mkpath("%s%s", base, result->path)); orig = create_entry(2, branch1->mode, branch1->sha1, path); final = create_entry(0, result->mode, result->sha1, path); @@ -233,7 +233,7 @@ static struct merge_list *link_entry(unsigned stage, const char *base, struct na if (entry) path = entry->path; else - path = strdup(mkpath("%s%s", base, n->path)); + path = xstrdup(mkpath("%s%s", base, n->path)); link = create_entry(stage, n->mode, n->sha1, path); link->link = entry; return link; |