Re: [PATCH v3 2/2] use strbuf_write_or_die()

2014-03-02 Thread Eric Sunshine 
On Sun, Mar 2, 2014 at 2:34 AM, Faiz Kothari faiz.of...@gmail.com wrote:
 Signed-off-by: Faiz Kothari faiz.of...@gmail.com

Sign off below commit message.

 Used strbuf.c:strbuf_write_or_die() instead of
 write_or_die.c:write_or_die() at relevant places.

Imperative: Use strbuf...

Otherwise, the patch looks okay.

 ---
  builtin/cat-file.c |2 +-
  builtin/notes.c|6 +++---
  builtin/receive-pack.c |2 +-
  builtin/send-pack.c|2 +-
  builtin/stripspace.c   |2 +-
  builtin/tag.c  |2 +-
  bundle.c   |2 +-
  credential-store.c |2 +-
  fetch-pack.c   |2 +-
  http-backend.c |2 +-
  remote-curl.c  |6 +++---
  11 files changed, 15 insertions(+), 15 deletions(-)

 diff --git a/builtin/cat-file.c b/builtin/cat-file.c
 index d5a93e0..d07a0be 100644
 --- a/builtin/cat-file.c
 +++ b/builtin/cat-file.c
 @@ -255,7 +255,7 @@ static int batch_one_object(const char *obj_name, struct 
 batch_options *opt,

 strbuf_expand(buf, opt-format, expand_format, data);
 strbuf_addch(buf, '\n');
 -   write_or_die(1, buf.buf, buf.len);
 +   strbuf_write_or_die(buf, 1);
 strbuf_release(buf);

 if (opt-print_contents) {
 diff --git a/builtin/notes.c b/builtin/notes.c
 index 2b24d05..a208d56 100644
 --- a/builtin/notes.c
 +++ b/builtin/notes.c
 @@ -140,7 +140,7 @@ static void write_commented_object(int fd, const unsigned 
 char *object)
 if (strbuf_read(buf, show.out, 0)  0)
 die_errno(_(could not read 'show' output));
 strbuf_add_commented_lines(cbuf, buf.buf, buf.len);
 -   write_or_die(fd, cbuf.buf, cbuf.len);
 +   strbuf_write_or_die(cbuf, fd);

 strbuf_release(cbuf);
 strbuf_release(buf);
 @@ -167,14 +167,14 @@ static void create_note(const unsigned char *object, 
 struct msg_arg *msg,
 die_errno(_(could not create file '%s'), path);

 if (msg-given)
 -   write_or_die(fd, msg-buf.buf, msg-buf.len);
 +   strbuf_write_or_die((msg-buf), fd);
 else if (prev  !append_only)
 write_note_data(fd, prev);

 strbuf_addch(buf, '\n');
 strbuf_add_commented_lines(buf, note_template, 
 strlen(note_template));
 strbuf_addch(buf, '\n');
 -   write_or_die(fd, buf.buf, buf.len);
 +   strbuf_write_or_die(buf, fd);

 write_commented_object(fd, object);

 diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
 index 85bba35..d590993 100644
 --- a/builtin/receive-pack.c
 +++ b/builtin/receive-pack.c
 @@ -1114,7 +1114,7 @@ static void report(struct command *commands, const char 
 *unpack_status)
 if (use_sideband)
 send_sideband(1, 1, buf.buf, buf.len, use_sideband);
 else
 -   write_or_die(1, buf.buf, buf.len);
 +   strbuf_write_or_die(buf, 1);
 strbuf_release(buf);
  }

 diff --git a/builtin/send-pack.c b/builtin/send-pack.c
 index f420b74..f26ba21 100644
 --- a/builtin/send-pack.c
 +++ b/builtin/send-pack.c
 @@ -86,7 +86,7 @@ static void print_helper_status(struct ref *ref)
 }
 strbuf_addch(buf, '\n');

 -   write_or_die(1, buf.buf, buf.len);
 +   strbuf_write_or_die(buf, 1);
 }
 strbuf_release(buf);
  }
 diff --git a/builtin/stripspace.c b/builtin/stripspace.c
 index 1259ed7..33b7f85 100644
 --- a/builtin/stripspace.c
 +++ b/builtin/stripspace.c
 @@ -115,7 +115,7 @@ int cmd_stripspace(int argc, const char **argv, const 
 char *prefix)
 else
 comment_lines(buf);

 -   write_or_die(1, buf.buf, buf.len);
 +   strbuf_write_or_die(buf, 1);
 strbuf_release(buf);
 return 0;
  }
 diff --git a/builtin/tag.c b/builtin/tag.c
 index 74d3780..53ab280 100644
 --- a/builtin/tag.c
 +++ b/builtin/tag.c
 @@ -349,7 +349,7 @@ static void create_tag(const unsigned char *object, const 
 char *tag,
 strbuf_commented_addf(buf, _(tag_template), 
 comment_line_char);
 else
 strbuf_commented_addf(buf, 
 _(tag_template_nocleanup), comment_line_char);
 -   write_or_die(fd, buf.buf, buf.len);
 +   strbuf_write_or_die(buf, fd);
 strbuf_release(buf);
 }
 close(fd);
 diff --git a/bundle.c b/bundle.c
 index e99065c..c8bddd8 100644
 --- a/bundle.c
 +++ b/bundle.c
 @@ -279,7 +279,7 @@ int create_bundle(struct bundle_header *header, const 
 char *path,
 while (strbuf_getwholeline(buf, rls_fout, '\n') != EOF) {
 unsigned char sha1[20];
 if (buf.len  0  buf.buf[0] == '-') {
 -   write_or_die(bundle_fd, buf.buf, buf.len);
 +

[PATCH v3 2/2] use strbuf_write_or_die()

2014-03-01 Thread Faiz Kothari 
Signed-off-by: Faiz Kothari faiz.of...@gmail.com

Used strbuf.c:strbuf_write_or_die() instead of
write_or_die.c:write_or_die() at relevant places.
---
 builtin/cat-file.c |2 +-
 builtin/notes.c|6 +++---
 builtin/receive-pack.c |2 +-
 builtin/send-pack.c|2 +-
 builtin/stripspace.c   |2 +-
 builtin/tag.c  |2 +-
 bundle.c   |2 +-
 credential-store.c |2 +-
 fetch-pack.c   |2 +-
 http-backend.c |2 +-
 remote-curl.c  |6 +++---
 11 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index d5a93e0..d07a0be 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -255,7 +255,7 @@ static int batch_one_object(const char *obj_name, struct 
batch_options *opt,
 
strbuf_expand(buf, opt-format, expand_format, data);
strbuf_addch(buf, '\n');
-   write_or_die(1, buf.buf, buf.len);
+   strbuf_write_or_die(buf, 1);
strbuf_release(buf);
 
if (opt-print_contents) {
diff --git a/builtin/notes.c b/builtin/notes.c
index 2b24d05..a208d56 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -140,7 +140,7 @@ static void write_commented_object(int fd, const unsigned 
char *object)
if (strbuf_read(buf, show.out, 0)  0)
die_errno(_(could not read 'show' output));
strbuf_add_commented_lines(cbuf, buf.buf, buf.len);
-   write_or_die(fd, cbuf.buf, cbuf.len);
+   strbuf_write_or_die(cbuf, fd);
 
strbuf_release(cbuf);
strbuf_release(buf);
@@ -167,14 +167,14 @@ static void create_note(const unsigned char *object, 
struct msg_arg *msg,
die_errno(_(could not create file '%s'), path);
 
if (msg-given)
-   write_or_die(fd, msg-buf.buf, msg-buf.len);
+   strbuf_write_or_die((msg-buf), fd);
else if (prev  !append_only)
write_note_data(fd, prev);
 
strbuf_addch(buf, '\n');
strbuf_add_commented_lines(buf, note_template, 
strlen(note_template));
strbuf_addch(buf, '\n');
-   write_or_die(fd, buf.buf, buf.len);
+   strbuf_write_or_die(buf, fd);
 
write_commented_object(fd, object);
 
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 85bba35..d590993 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -1114,7 +1114,7 @@ static void report(struct command *commands, const char 
*unpack_status)
if (use_sideband)
send_sideband(1, 1, buf.buf, buf.len, use_sideband);
else
-   write_or_die(1, buf.buf, buf.len);
+   strbuf_write_or_die(buf, 1);
strbuf_release(buf);
 }
 
diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index f420b74..f26ba21 100644
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -86,7 +86,7 @@ static void print_helper_status(struct ref *ref)
}
strbuf_addch(buf, '\n');
 
-   write_or_die(1, buf.buf, buf.len);
+   strbuf_write_or_die(buf, 1);
}
strbuf_release(buf);
 }
diff --git a/builtin/stripspace.c b/builtin/stripspace.c
index 1259ed7..33b7f85 100644
--- a/builtin/stripspace.c
+++ b/builtin/stripspace.c
@@ -115,7 +115,7 @@ int cmd_stripspace(int argc, const char **argv, const char 
*prefix)
else
comment_lines(buf);
 
-   write_or_die(1, buf.buf, buf.len);
+   strbuf_write_or_die(buf, 1);
strbuf_release(buf);
return 0;
 }
diff --git a/builtin/tag.c b/builtin/tag.c
index 74d3780..53ab280 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -349,7 +349,7 @@ static void create_tag(const unsigned char *object, const 
char *tag,
strbuf_commented_addf(buf, _(tag_template), 
comment_line_char);
else
strbuf_commented_addf(buf, 
_(tag_template_nocleanup), comment_line_char);
-   write_or_die(fd, buf.buf, buf.len);
+   strbuf_write_or_die(buf, fd);
strbuf_release(buf);
}
close(fd);
diff --git a/bundle.c b/bundle.c
index e99065c..c8bddd8 100644
--- a/bundle.c
+++ b/bundle.c
@@ -279,7 +279,7 @@ int create_bundle(struct bundle_header *header, const char 
*path,
while (strbuf_getwholeline(buf, rls_fout, '\n') != EOF) {
unsigned char sha1[20];
if (buf.len  0  buf.buf[0] == '-') {
-   write_or_die(bundle_fd, buf.buf, buf.len);
+   strbuf_write_or_die(buf, bundle_fd);
if (!get_sha1_hex(buf.buf + 1, sha1)) {
struct object *object = 
parse_object_or_die(sha1, buf.buf);
object-flags |= UNINTERESTING;
diff --git a/credential-store.c