grep: move context hunk mark handling into show_line()

Move last_shown into struct grep_opt, to make it available in
show_line(), and then make the function handle the printing of hunk
marks for context lines in a central place.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/grep.c b/grep.c
index 92a47c71e7d93eef7dc8d6967cd071aa061218ce..6ee80f7fd9b014a0855f9eadb24cb71b9b97836f 100644 (file)
--- a/grep.c
+++ b/grep.c
@@ -490,6 +490,12 @@ static void show_line(struct grep_opt *opt, char *bol, char *eol,
 {
        int rest = eol - bol;
 
 {
        int rest = eol - bol;
 

+       if (opt->pre_context || opt->post_context) {
+               if (opt->last_shown && lno > opt->last_shown + 1)
+                       fputs("--\n", stdout);
+       }
+       opt->last_shown = lno;
+

        if (opt->null_following_name)
                sign = '\0';
        if (opt->pathname)
        if (opt->null_following_name)
                sign = '\0';
        if (opt->pathname)


@@ -531,12 +537,12 @@ static int grep_buffer_1(struct grep_opt *opt, const char *name,
                char *eol;
        } *prev = NULL, *pcl;
        unsigned last_hit = 0;
                char *eol;
        } *prev = NULL, *pcl;
        unsigned last_hit = 0;

-       unsigned last_shown = 0;

        int binary_match_only = 0;
        int binary_match_only = 0;

-       const char *hunk_mark = "";

        unsigned count = 0;
        enum grep_context ctx = GREP_CONTEXT_HEAD;
 
        unsigned count = 0;
        enum grep_context ctx = GREP_CONTEXT_HEAD;
 

+       opt->last_shown = 0;
+

        if (buffer_is_binary(buf, size)) {
                switch (opt->binary) {
                case GREP_BINARY_DEFAULT:
        if (buffer_is_binary(buf, size)) {
                switch (opt->binary) {
                case GREP_BINARY_DEFAULT:


@@ -552,8 +558,6 @@ static int grep_buffer_1(struct grep_opt *opt, const char *name,
 
        if (opt->pre_context)
                prev = xcalloc(opt->pre_context, sizeof(*prev));
 
        if (opt->pre_context)
                prev = xcalloc(opt->pre_context, sizeof(*prev));

-       if (opt->pre_context || opt->post_context)
-               hunk_mark = "--\n";

 
        while (left) {
                char *eol, ch;
 
        while (left) {
                char *eol, ch;


@@ -607,33 +611,25 @@ static int grep_buffer_1(struct grep_opt *opt, const char *name,
                                        from = lno - opt->pre_context;
                                else
                                        from = 1;
                                        from = lno - opt->pre_context;
                                else
                                        from = 1;

-                               if (from <= last_shown)
-                                       from = last_shown + 1;
-                               if (last_shown && from != last_shown + 1)
-                                       fputs(hunk_mark, stdout);
+                               if (from <= opt->last_shown)
+                                       from = opt->last_shown + 1;

                                while (from < lno) {
                                        pcl = &prev[lno-from-1];
                                        show_line(opt, pcl->bol, pcl->eol,
                                                  name, from, '-');
                                        from++;
                                }
                                while (from < lno) {
                                        pcl = &prev[lno-from-1];
                                        show_line(opt, pcl->bol, pcl->eol,
                                                  name, from, '-');
                                        from++;
                                }

-                               last_shown = lno-1;

                        }
                        }

-                       if (last_shown && lno != last_shown + 1)
-                               fputs(hunk_mark, stdout);

                        if (!opt->count)
                                show_line(opt, bol, eol, name, lno, ':');
                        if (!opt->count)
                                show_line(opt, bol, eol, name, lno, ':');

-                       last_shown = last_hit = lno;
+                       last_hit = lno;

                }
                else if (last_hit &&
                         lno <= last_hit + opt->post_context) {
                        /* If the last hit is within the post context,
                         * we need to show this line.
                         */
                }
                else if (last_hit &&
                         lno <= last_hit + opt->post_context) {
                        /* If the last hit is within the post context,
                         * we need to show this line.
                         */

-                       if (last_shown && lno != last_shown + 1)
-                               fputs(hunk_mark, stdout);

                        show_line(opt, bol, eol, name, lno, '-');
                        show_line(opt, bol, eol, name, lno, '-');

-                       last_shown = lno;

                }
                if (opt->pre_context) {
                        memmove(prev+1, prev,
                }
                if (opt->pre_context) {
                        memmove(prev+1, prev,

diff --git a/grep.h b/grep.h
index 464e272edf4594539915a89d68628fd3959b8ee3..0883214a0935f09ffe4aa8cb1733ce31d342a5d8 100644 (file)
--- a/grep.h
+++ b/grep.h
@@ -84,6 +84,7 @@ struct grep_opt {
        int regflags;
        unsigned pre_context;
        unsigned post_context;
        int regflags;
        unsigned pre_context;
        unsigned post_context;

+       unsigned last_shown;

 };
 
 extern void append_grep_pattern(struct grep_opt *opt, const char *pat, const char *origin, int no, enum grep_pat_token t);
 };
 
 extern void append_grep_pattern(struct grep_opt *opt, const char *pat, const char *origin, int no, enum grep_pat_token t);