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

Merge branch 'tr/merge-recursive-flush'

Browse Source 
Remove unnecessary code.

* tr/merge-recursive-flush:
  merge-recursive: eliminate flush_buffer() in favor of write_in_full()
This commit is contained in:
Junio C Hamano 2012-08-22 11:52:19 -07:00
commit 8d35c11457
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
merge-recursive.c
View File

@ -614,23 +614,6 @@ static char *unique_path(struct merge_options *o, const char *path, const char *
return newpath; return newpath;
} }
static void flush_buffer(int fd, const char *buf, unsigned long size)
{
while (size > 0) {
long ret = write_in_full(fd, buf, size);
if (ret < 0) {
/* Ignore epipe */
if (errno == EPIPE)
break;
die_errno("merge-recursive");
} else if (!ret) {
die(_("merge-recursive: disk full?"));
}
size -= ret;
buf += ret;
}
}
static int dir_in_way(const char *path, int check_working_copy) static int dir_in_way(const char *path, int check_working_copy)
{ {
int pos, pathlen = strlen(path); int pos, pathlen = strlen(path);
@ -789,7 +772,7 @@ static void update_file_flags(struct merge_options *o,
fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode); fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
if (fd < 0) if (fd < 0)
die_errno(_("failed to open '%s'"), path); die_errno(_("failed to open '%s'"), path);
flush_buffer(fd, buf, size); write_in_full(fd, buf, size);
close(fd); close(fd);
} else if (S_ISLNK(mode)) { } else if (S_ISLNK(mode)) {
char *lnk = xmemdupz(buf, size); char *lnk = xmemdupz(buf, size);