undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup remove_path

Browse Source 
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Alex Riesen 2008-09-26 08:21:39 -07:00 committed by Shawn O. Pearce
parent ed520a8f27
commit eb53586ba9
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
merge-recursive.c
View File

@ -394,12 +394,10 @@ static int update_stages(const char *path, struct diff_filespec *o,
static int remove_path(const char *name) static int remove_path(const char *name)
{ {
int ret;
char *slash, *dirs; char *slash, *dirs;
ret = unlink(name); if (unlink(name))
if (ret) return -1;
return ret;
dirs = xstrdup(name); dirs = xstrdup(name);
while ((slash = strrchr(name, '/'))) { while ((slash = strrchr(name, '/'))) {
*slash = '\0'; *slash = '\0';
@ -407,7 +405,7 @@ static int remove_path(const char *name)
break; break;
} }
free(dirs); free(dirs);
return ret; return 0;
} }
static int remove_file(struct merge_options *o, int clean, static int remove_file(struct merge_options *o, int clean,