Browse Source

Merge branch 'rs/retire-strbuf-write-fd'

A misdesigned strbuf_write_fd() function has been retired.

* rs/retire-strbuf-write-fd:
  strbuf: remove unreferenced strbuf_write_fd method.
  bugreport.c: replace strbuf_write_fd with write_in_full
maint
Junio C Hamano 5 years ago
parent
commit
610486749a
  1. 4
      bugreport.c
  2. 5
      strbuf.c
  3. 1
      strbuf.h

4
bugreport.c

@ -180,7 +180,9 @@ int cmd_main(int argc, const char **argv) @@ -180,7 +180,9 @@ int cmd_main(int argc, const char **argv)
die(_("couldn't create a new file at '%s'"), report_path.buf);
}

strbuf_write_fd(&buffer, report);
if (write_in_full(report, buffer.buf, buffer.len) < 0)
die_errno(_("unable to write to %s"), report_path.buf);

close(report);

/*

5
strbuf.c

@ -556,11 +556,6 @@ ssize_t strbuf_write(struct strbuf *sb, FILE *f) @@ -556,11 +556,6 @@ ssize_t strbuf_write(struct strbuf *sb, FILE *f)
return sb->len ? fwrite(sb->buf, 1, sb->len, f) : 0;
}

ssize_t strbuf_write_fd(struct strbuf *sb, int fd)
{
return sb->len ? write(fd, sb->buf, sb->len) : 0;
}

#define STRBUF_MAXLINK (2*PATH_MAX)

int strbuf_readlink(struct strbuf *sb, const char *path, size_t hint)

1
strbuf.h

@ -473,7 +473,6 @@ int strbuf_readlink(struct strbuf *sb, const char *path, size_t hint); @@ -473,7 +473,6 @@ int strbuf_readlink(struct strbuf *sb, const char *path, size_t hint);
* NUL bytes.
*/
ssize_t strbuf_write(struct strbuf *sb, FILE *stream);
ssize_t strbuf_write_fd(struct strbuf *sb, int fd);

/**
* Read a line from a FILE *, overwriting the existing contents of

Loading…
Cancel
Save