diff options
| -rw-r--r-- | src/common.h | 8 | ||||
| -rw-r--r-- | src/patch.c | 2 | ||||
| -rw-r--r-- | src/pch.c | 7 |
3 files changed, 12 insertions, 5 deletions
diff --git a/src/common.h b/src/common.h index ec50b40..904a3f8 100644 --- a/src/common.h +++ b/src/common.h @@ -218,3 +218,11 @@ bool merge_hunk (int hunk, struct outstate *, lin where, bool *); #else # define merge_hunk(hunk, outstate, where, somefailed) false #endif + +#ifndef FALLTHROUGH +# if __GNUC__ < 7 +# define FALLTHROUGH ((void) 0) +# else +# define FALLTHROUGH __attribute__ ((__fallthrough__)) +# endif +#endif diff --git a/src/patch.c b/src/patch.c index 0fe6d72..1ae91d9 100644 --- a/src/patch.c +++ b/src/patch.c @@ -1381,7 +1381,7 @@ abort_hunk_context (bool header, bool reverse) break; case ' ': case '-': case '+': case '!': fprintf (rejfp, "%c ", pch_char (i)); - /* fall into */ + FALLTHROUGH; case '\n': pch_write_line (i, rejfp); break; @@ -1735,7 +1735,7 @@ another_hunk (enum diff difftype, bool rev) break; case '=': ch = ' '; - /* FALL THROUGH */ + FALLTHROUGH; case ' ': if (fillsrc > p_ptrn_lines) { free(s); @@ -1756,7 +1756,7 @@ another_hunk (enum diff difftype, bool rev) p_end = fillsrc-1; return -1; } - /* FALL THROUGH */ + FALLTHROUGH; case '+': if (filldst > p_end) { free(s); @@ -2394,8 +2394,7 @@ do_ed_script (char const *inname, char const *outname, size_t chars_read; FILE *tmpfp = 0; char const *tmpname; - int tmpfd; - pid_t pid; + int tmpfd = -1; /* placate gcc's -Wmaybe-uninitialized */ int exclusive = *outname_needs_removal ? 0 : O_EXCL; char const **ed_argv; int stdin_dup, status; |