commit: make ignore_non_trailer take buf/len

Make ignore_non_trailer take a buf/len pair instead of struct strbuf.

Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/commit.c b/builtin/commit.c
index 8976c3d29bf817be789f983697f7052fe5769f39..887ccc7577a12a16b40e67eb2819356e888f1965 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -790,7 +790,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
                strbuf_stripspace(&sb, 0);
 
        if (signoff)
                strbuf_stripspace(&sb, 0);
 
        if (signoff)

-               append_signoff(&sb, ignore_non_trailer(&sb), 0);
+               append_signoff(&sb, ignore_non_trailer(sb.buf, sb.len), 0);

 
        if (fwrite(sb.buf, 1, sb.len, s->fp) < sb.len)
                die_errno(_("could not write commit template"));
 
        if (fwrite(sb.buf, 1, sb.len, s->fp) < sb.len)
                die_errno(_("could not write commit template"));

diff --git a/commit.c b/commit.c
index 856fd4aeeff654c45ba0a6149f9db2c22806e0cb..2cf85158b4899b664a3cbae8d0777f5a9e473318 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -1649,7 +1649,7 @@ const char *find_commit_header(const char *msg, const char *key, size_t *out_len
 }
 
 /*
 }
 
 /*

- * Inspect sb and determine the true "end" of the log message, in
+ * Inspect the given string and determine the true "end" of the log message, in

  * order to find where to put a new Signed-off-by: line.  Ignored are
  * trailing comment lines and blank lines, and also the traditional
  * "Conflicts:" block that is not commented out, so that we can use
  * order to find where to put a new Signed-off-by: line.  Ignored are
  * trailing comment lines and blank lines, and also the traditional
  * "Conflicts:" block that is not commented out, so that we can use


@@ -1659,37 +1659,37 @@ const char *find_commit_header(const char *msg, const char *key, size_t *out_len
  * Returns the number of bytes from the tail to ignore, to be fed as
  * the second parameter to append_signoff().
  */
  * Returns the number of bytes from the tail to ignore, to be fed as
  * the second parameter to append_signoff().
  */

-int ignore_non_trailer(struct strbuf *sb)
+int ignore_non_trailer(const char *buf, size_t len)

 {
        int boc = 0;
        int bol = 0;
        int in_old_conflicts_block = 0;
 
 {
        int boc = 0;
        int bol = 0;
        int in_old_conflicts_block = 0;
 

-       while (bol < sb->len) {
-               char *next_line;
+       while (bol < len) {
+               const char *next_line = memchr(buf + bol, '\n', len - bol);

 
 

-               if (!(next_line = memchr(sb->buf + bol, '\n', sb->len - bol)))
-                       next_line = sb->buf + sb->len;
+               if (!next_line)
+                       next_line = buf + len;

                else
                        next_line++;
 
                else
                        next_line++;
 

-               if (sb->buf[bol] == comment_line_char || sb->buf[bol] == '\n') {
+               if (buf[bol] == comment_line_char || buf[bol] == '\n') {

                        /* is this the first of the run of comments? */
                        if (!boc)
                                boc = bol;
                        /* otherwise, it is just continuing */
                        /* is this the first of the run of comments? */
                        if (!boc)
                                boc = bol;
                        /* otherwise, it is just continuing */

-               } else if (starts_with(sb->buf + bol, "Conflicts:\n")) {
+               } else if (starts_with(buf + bol, "Conflicts:\n")) {

                        in_old_conflicts_block = 1;
                        if (!boc)
                                boc = bol;
                        in_old_conflicts_block = 1;
                        if (!boc)
                                boc = bol;

-               } else if (in_old_conflicts_block && sb->buf[bol] == '\t') {
+               } else if (in_old_conflicts_block && buf[bol] == '\t') {

                        ; /* a pathname in the conflicts block */
                } else if (boc) {
                        /* the previous was not trailing comment */
                        boc = 0;
                        in_old_conflicts_block = 0;
                }
                        ; /* a pathname in the conflicts block */
                } else if (boc) {
                        /* the previous was not trailing comment */
                        boc = 0;
                        in_old_conflicts_block = 0;
                }

-               bol = next_line - sb->buf;
+               bol = next_line - buf;

        }
        }

-       return boc ? sb->len - boc : 0;
+       return boc ? len - boc : 0;

 }
 }

diff --git a/commit.h b/commit.h
index afd14f318c0c4d18f3a03781d3229f2fdc0f64c6..9c12abb91110151e3a982c4d8baf8753d0382441 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -355,7 +355,7 @@ extern const char *find_commit_header(const char *msg, const char *key,
                                      size_t *out_len);
 
 /* Find the end of the log message, the right place for a new trailer. */
                                      size_t *out_len);
 
 /* Find the end of the log message, the right place for a new trailer. */

-extern int ignore_non_trailer(struct strbuf *sb);
+extern int ignore_non_trailer(const char *buf, size_t len);

 
 typedef void (*each_mergetag_fn)(struct commit *commit, struct commit_extra_header *extra,
                                 void *cb_data);
 
 typedef void (*each_mergetag_fn)(struct commit *commit, struct commit_extra_header *extra,
                                 void *cb_data);

diff --git a/trailer.c b/trailer.c
index eefe91d86500a35c573157b433d82baedaa75854..9d101dbfbbe4f580861317b57cda07dcd0d12ee6 100644 (file)
--- a/trailer.c
+++ b/trailer.c
@@ -842,7 +842,7 @@ static int find_trailer_end(struct strbuf **lines, int patch_start)
 
        for (i = 0; i < patch_start; i++)
                strbuf_addbuf(&sb, lines[i]);
 
        for (i = 0; i < patch_start; i++)
                strbuf_addbuf(&sb, lines[i]);

-       ignore_bytes = ignore_non_trailer(&sb);
+       ignore_bytes = ignore_non_trailer(sb.buf, sb.len);

        strbuf_release(&sb);
        for (i = patch_start - 1; i >= 0 && ignore_bytes > 0; i--)
                ignore_bytes -= lines[i]->len;
        strbuf_release(&sb);
        for (i = patch_start - 1; i >= 0 && ignore_bytes > 0; i--)
                ignore_bytes -= lines[i]->len;