wt-status: avoid strbuf_split*()

strbuf is a very good data structure to work with string data
without having to worry about running past the end of the string,
but strbuf_split() is a wrong API and an array of strbuf that the
function produces is a wrong thing to use in general.  You do not
edit these N strings split out of a single strbuf simultaneously.
Often it is much better off to split a string into string_list and
work with the resulting strings.

wt-status.c:abbrev_oid_in_line() takes one line of rebase todo list
(like "pick e813a0200a7121b97fec535f0d0b460b0a33356c title"), and
for instructions that has an object name as the second token on the
line, replace the object name with its unique abbreviation.  After
splitting these tokens out of a single line, no simultaneous edit on
any of these pieces of string that takes advantage of strbuf API
takes place.  The final string is composed with strbuf API, but
these split pieces are merely used as pieces of strings and there is
no need for them to be stored in individual strbuf.

Instead, split the line into a string_list, and compose the final
string using these pieces.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/wt-status.c b/wt-status.c
index 454601afa15a951adb6b70ae0687485a4448ed68..a34dc144ee36168d993947a4ada6841100773ba0 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -1351,8 +1351,8 @@ static int split_commit_in_progress(struct wt_status *s)
  */
 static void abbrev_oid_in_line(struct strbuf *line)
 {
-       struct strbuf **split;
-       int i;
+       struct string_list split = STRING_LIST_INIT_DUP;
+       struct object_id oid;
 
        if (starts_with(line->buf, "exec ") ||
            starts_with(line->buf, "x ") ||
@@ -1360,26 +1360,15 @@ static void abbrev_oid_in_line(struct strbuf *line)
            starts_with(line->buf, "l "))
                return;
 
-       split = strbuf_split_max(line, ' ', 3);
-       if (split[0] && split[1]) {
-               struct object_id oid;
-
-               /*
-                * strbuf_split_max left a space. Trim it and re-add
-                * it after abbreviation.
-                */
-               strbuf_trim(split[1]);
-               if (!repo_get_oid(the_repository, split[1]->buf, &oid)) {
-                       strbuf_reset(split[1]);
-                       strbuf_add_unique_abbrev(split[1], &oid,
-                                                DEFAULT_ABBREV);
-                       strbuf_addch(split[1], ' ');
-                       strbuf_reset(line);
-                       for (i = 0; split[i]; i++)
-                               strbuf_addbuf(line, split[i]);
-               }
+       if ((2 <= string_list_split(&split, line->buf, " ", 2)) &&
+           !repo_get_oid(the_repository, split.items[1].string, &oid)) {
+               strbuf_reset(line);
+               strbuf_addf(line, "%s ", split.items[0].string);
+               strbuf_add_unique_abbrev(line, &oid, DEFAULT_ABBREV);
+               for (size_t i = 2; i < split.nr; i++)
+                       strbuf_addf(line, " %s", split.items[i].string);
        }
-       strbuf_list_free(split);
+       string_list_clear(&split, 0);
 }
 
 static int read_rebase_todolist(const char *fname, struct string_list *lines)