diff options
| author | Tim Waugh <twaugh@redhat.com> | 2017-02-22 11:03:43 +0100 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@gnu.org> | 2017-02-22 11:03:43 +0100 |
| commit | 817d7d17674b6e85281ed78c82c204d618f028df (patch) | |
| tree | c69ce7211c44eb49901992403846ae25c49322cd | |
| parent | 49705d1d8d9140a6ee79a35c8426cbf5790ccf1f (diff) | |
| download | patch-817d7d17674b6e85281ed78c82c204d618f028df.tar.gz | |
Rename canonicalize global variable
* src/common.h, src/merge.c (context_matches_file), src/patch.c
(get_some_switches, patch_match), src/pch.c(another_hunk): Rename the
global variable 'canonicalize' to 'canonicalize_ws'.
Patch uses a global variable 'canonicalize' as part of its
implementation of the --ignore-whitespace flag.
In glibc there is a function canonicalize():
https://www.gnu.org/software/libc/manual/html_node/FP-Bit-Twiddling.html#index-canonicalize
Rename the global variable so that it will not conflict.
Original bug report:
https://bugzilla.redhat.com/show_bug.cgi?id=1422463
| -rw-r--r-- | src/common.h | 2 | ||||
| -rw-r--r-- | src/merge.c | 2 | ||||
| -rw-r--r-- | src/patch.c | 4 | ||||
| -rw-r--r-- | src/pch.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/common.h b/src/common.h index 9e355fe..ec50b40 100644 --- a/src/common.h +++ b/src/common.h @@ -111,7 +111,7 @@ XTERN bool reverse; XTERN enum { DEFAULT_VERBOSITY, SILENT, VERBOSE } verbosity; XTERN bool skip_rest_of_patch; XTERN int strippath; -XTERN bool canonicalize; +XTERN bool canonicalize_ws; XTERN int patch_get; XTERN bool set_time; XTERN bool set_utc; diff --git a/src/merge.c b/src/merge.c index 0db34d0..9f761d4 100644 --- a/src/merge.c +++ b/src/merge.c @@ -541,7 +541,7 @@ context_matches_file (lin old, lin where) line = ifetch (where, false, &size); return size && - (canonicalize ? + (canonicalize_ws ? similar (pfetch (old), pch_line_len (old), line, size) : (size == pch_line_len (old) && memcmp (line, pfetch (old), size) == 0)); diff --git a/src/patch.c b/src/patch.c index 6c76276..1f353c1 100644 --- a/src/patch.c +++ b/src/patch.c @@ -927,7 +927,7 @@ get_some_switches (void) patchname = xstrdup (optarg); break; case 'l': - canonicalize = true; + canonicalize_ws = true; break; #ifdef ENABLE_MERGE case 'm': @@ -1690,7 +1690,7 @@ patch_match (lin base, lin offset, lin prefix_fuzz, lin suffix_fuzz) for (iline=base+offset+prefix_fuzz; pline <= pat_lines; pline++,iline++) { p = ifetch (iline, offset >= 0, &size); - if (canonicalize) { + if (canonicalize_ws) { if (!similar(p, size, pfetch(pline), pch_line_len(pline) )) @@ -1410,7 +1410,7 @@ another_hunk (enum diff difftype, bool rev) change_line: s = buf + 1; chars_read--; - if (*s == '\n' && canonicalize) { + if (*s == '\n' && canonicalize_ws) { strcpy (s, " \n"); chars_read = 2; } @@ -1478,7 +1478,7 @@ another_hunk (enum diff difftype, bool rev) case ' ': s = buf + 1; chars_read--; - if (*s == '\n' && canonicalize) { + if (*s == '\n' && canonicalize_ws) { strcpy (s, "\n"); chars_read = 2; } |