diff options
| author | Shawn Pearce <spearce@spearce.org> | 2006-09-02 04:16:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-09-02 10:24:37 (GMT) |
| commit | 9befac470b4cfad529032dbcffcb71242ec71f91 (patch) | |
| tree | f3715172da747456dd63c6d80c3f1e0a7d6f2d56 /merge-file.c | |
| parent | ad1ed5ee896ba5d7f89bc04c7441b1532efb9853 (diff) | |
| download | git-9befac470b4cfad529032dbcffcb71242ec71f91.zip git-9befac470b4cfad529032dbcffcb71242ec71f91.tar.gz git-9befac470b4cfad529032dbcffcb71242ec71f91.tar.bz2 | |
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-file.c')
| -rw-r--r-- | merge-file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-file.c b/merge-file.c index f32c653..fc9b148 100644 --- a/merge-file.c +++ b/merge-file.c @@ -21,7 +21,7 @@ static const char *write_temp_file(mmfile_t *f) fd = mkstemp(filename); if (fd < 0) return NULL; - filename = strdup(filename); + filename = xstrdup(filename); if (f->size != xwrite(fd, f->ptr, f->size)) { rm_temp_file(filename); return NULL; |