diff options
author | Jim Meyering <meyering@redhat.com> | 2011-10-09 11:40:42 +0200 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2011-12-14 16:34:45 +0100 |
commit | 5cb38ce3903b5c33750cd52f983a8f68f945c7dd (patch) | |
tree | 8860b967c0cb2ee11834cbb5c01988c44f9e1141 /src | |
parent | 5ca55b84143a840218bcdc78120b44b02d8ef561 (diff) | |
download | patch-5cb38ce3903b5c33750cd52f983a8f68f945c7dd.tar.gz |
build: update to latest gnulib and adapt
Mark functions as pure of const, per recommendations enabled by
new gcc -W options. Apply _GL_ATTRIBUTE_PURE and _GL_ATTRIBUTE_CONST.
* src/common.h: Apply new function attributes.
* src/pch.c: Likewise.
* src/pch.h: Likewise.
* src/util.c: Likewise.
* src/util.h: Likewise.
* configure.ac: Use -Wno-format-nonliteral.
* m4/.gitignore: Update.
* gnulib: Update to latest.
* cfg.mk: Exempt src/util.c from two tests, to avoid new
"make syntax-check" failures.
Diffstat (limited to 'src')
-rw-r--r-- | src/common.h | 2 | ||||
-rw-r--r-- | src/pch.c | 6 | ||||
-rw-r--r-- | src/pch.h | 36 | ||||
-rw-r--r-- | src/util.c | 2 | ||||
-rw-r--r-- | src/util.h | 2 |
5 files changed, 24 insertions, 24 deletions
diff --git a/src/common.h b/src/common.h index 43919b8..38ecc99 100644 --- a/src/common.h +++ b/src/common.h @@ -202,7 +202,7 @@ XTERN lin out_offset; XTERN lin last_frozen_line; bool copy_till (struct outstate *, lin); -bool similar (char const *, size_t, char const *, size_t); +bool similar (char const *, size_t, char const *, size_t) _GL_ATTRIBUTE_PURE; #ifdef ENABLE_MERGE enum conflict_style { MERGE_MERGE, MERGE_DIFF3 }; @@ -315,7 +315,7 @@ there_is_another_patch (bool need_header, mode_t *file_type) return true; } -static mode_t +static mode_t _GL_ATTRIBUTE_PURE fetchmode (char const *str) { const char *s; @@ -366,7 +366,7 @@ sha1_says_nonexistent(char const *sha1, char const *end) return s == end; } -static char const * +static char const * _GL_ATTRIBUTE_PURE skip_hex_digits (char const *str) { char const *s; @@ -2248,7 +2248,7 @@ pch_mode (bool which) This accepts just a subset of the valid commands, but it's good enough in practice. */ -static char +static char _GL_ATTRIBUTE_PURE get_ed_command_letter (char const *line) { char const *p = line; @@ -19,28 +19,28 @@ enum nametype { OLD, NEW, INDEX, NONE }; -lin pch_end (void); -lin pch_first (void); -lin pch_hunk_beg (void); -char const *pch_c_function (void); -char const * pch_timestr (bool which); -mode_t pch_mode (bool which); -lin pch_newfirst (void); -lin pch_prefix_context (void); -lin pch_ptrn_lines (void); -lin pch_repl_lines (void); -lin pch_suffix_context (void); +lin pch_end (void) _GL_ATTRIBUTE_PURE; +lin pch_first (void) _GL_ATTRIBUTE_PURE; +lin pch_hunk_beg (void) _GL_ATTRIBUTE_PURE; +char const *pch_c_function (void) _GL_ATTRIBUTE_PURE; +char const * pch_timestr (bool which) _GL_ATTRIBUTE_PURE; +mode_t pch_mode (bool which) _GL_ATTRIBUTE_PURE; +lin pch_newfirst (void) _GL_ATTRIBUTE_PURE; +lin pch_prefix_context (void) _GL_ATTRIBUTE_PURE; +lin pch_ptrn_lines (void) _GL_ATTRIBUTE_PURE; +lin pch_repl_lines (void) _GL_ATTRIBUTE_PURE; +lin pch_suffix_context (void) _GL_ATTRIBUTE_PURE; bool pch_swap (void); bool pch_write_line (lin, FILE *); bool there_is_another_patch (bool, mode_t *); -char *pfetch (lin); -char pch_char (lin); +char *pfetch (lin) _GL_ATTRIBUTE_PURE; +char pch_char (lin) _GL_ATTRIBUTE_PURE; int another_hunk (enum diff, bool); -int pch_says_nonexistent (bool); -size_t pch_line_len (lin); -const char *pch_name(enum nametype); -bool pch_copy (void); -bool pch_rename (void); +int pch_says_nonexistent (bool) _GL_ATTRIBUTE_PURE; +size_t pch_line_len (lin) _GL_ATTRIBUTE_PURE; +const char *pch_name(enum nametype) _GL_ATTRIBUTE_PURE; +bool pch_copy (void) _GL_ATTRIBUTE_PURE; +bool pch_rename (void) _GL_ATTRIBUTE_PURE; void do_ed_script (char const *, char const *, int *, FILE *); void open_patch_file (char const *); void re_patch (void); @@ -123,7 +123,7 @@ file_already_seen (struct stat const *st) return hash_lookup (file_id_table, &f) != 0; } -static bool +static bool _GL_ATTRIBUTE_PURE contains_slash (const char *s) { for (; *s; s++) @@ -74,7 +74,7 @@ enum file_attributes { void set_file_attributes (char const *, enum file_attributes, char const *, struct stat *, mode_t, struct timespec *); -static inline char const * +static inline char const * _GL_ATTRIBUTE_PURE skip_spaces (char const *str) { while (ISSPACE ((unsigned char) *str)) |