pretty: split color parsing into a separate function

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/pretty.c b/pretty.c
index 59472750ada226df15ac90092723b044f4eece6f..e0413e3939335047f9efc12dc41329c8a7c9c69b 100644 (file)
--- a/pretty.c
+++ b/pretty.c
@@ -954,6 +954,44 @@ static int format_reflog_person(struct strbuf *sb,
        return format_person_part(sb, part, ident, strlen(ident), dmode);
 }
 
        return format_person_part(sb, part, ident, strlen(ident), dmode);
 }
 

+static size_t parse_color(struct strbuf *sb, /* in UTF-8 */
+                         const char *placeholder,
+                         struct format_commit_context *c)
+{
+       if (placeholder[1] == '(') {
+               const char *begin = placeholder + 2;
+               const char *end = strchr(begin, ')');
+               char color[COLOR_MAXLEN];
+
+               if (!end)
+                       return 0;
+               if (!prefixcmp(begin, "auto,")) {
+                       if (!want_color(c->pretty_ctx->color))
+                               return end - placeholder + 1;
+                       begin += 5;
+               }
+               color_parse_mem(begin,
+                               end - begin,
+                               "--pretty format", color);
+               strbuf_addstr(sb, color);
+               return end - placeholder + 1;
+       }
+       if (!prefixcmp(placeholder + 1, "red")) {
+               strbuf_addstr(sb, GIT_COLOR_RED);
+               return 4;
+       } else if (!prefixcmp(placeholder + 1, "green")) {
+               strbuf_addstr(sb, GIT_COLOR_GREEN);
+               return 6;
+       } else if (!prefixcmp(placeholder + 1, "blue")) {
+               strbuf_addstr(sb, GIT_COLOR_BLUE);
+               return 5;
+       } else if (!prefixcmp(placeholder + 1, "reset")) {
+               strbuf_addstr(sb, GIT_COLOR_RESET);
+               return 6;
+       } else
+               return 0;
+}
+

 static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
                                const char *placeholder,
                                void *context)
 static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
                                const char *placeholder,
                                void *context)


@@ -967,38 +1005,7 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
        /* these are independent of the commit */
        switch (placeholder[0]) {
        case 'C':
        /* these are independent of the commit */
        switch (placeholder[0]) {
        case 'C':

-               if (placeholder[1] == '(') {
-                       const char *begin = placeholder + 2;
-                       const char *end = strchr(begin, ')');
-                       char color[COLOR_MAXLEN];
-
-                       if (!end)
-                               return 0;
-                       if (!prefixcmp(begin, "auto,")) {
-                               if (!want_color(c->pretty_ctx->color))
-                                       return end - placeholder + 1;
-                               begin += 5;
-                       }
-                       color_parse_mem(begin,
-                                       end - begin,
-                                       "--pretty format", color);
-                       strbuf_addstr(sb, color);
-                       return end - placeholder + 1;
-               }
-               if (!prefixcmp(placeholder + 1, "red")) {
-                       strbuf_addstr(sb, GIT_COLOR_RED);
-                       return 4;
-               } else if (!prefixcmp(placeholder + 1, "green")) {
-                       strbuf_addstr(sb, GIT_COLOR_GREEN);
-                       return 6;
-               } else if (!prefixcmp(placeholder + 1, "blue")) {
-                       strbuf_addstr(sb, GIT_COLOR_BLUE);
-                       return 5;
-               } else if (!prefixcmp(placeholder + 1, "reset")) {
-                       strbuf_addstr(sb, GIT_COLOR_RESET);
-                       return 6;
-               } else
-                       return 0;
+               return parse_color(sb, placeholder, c);

        case 'n':               /* newline */
                strbuf_addch(sb, '\n');
                return 1;
        case 'n':               /* newline */
                strbuf_addch(sb, '\n');
                return 1;