path: root/merge-file.c
diff options
authorShawn Pearce <>2006-09-02 04:16:31 (GMT)
committerJunio C Hamano <>2006-09-02 10:24:37 (GMT)
commit9befac470b4cfad529032dbcffcb71242ec71f91 (patch)
treef3715172da747456dd63c6d80c3f1e0a7d6f2d56 /merge-file.c
parentad1ed5ee896ba5d7f89bc04c7441b1532efb9853 (diff)
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 <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'merge-file.c')
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)) {
return NULL;