diff options
author | benl <benl@FreeBSD.org> | 2011-05-18 21:04:29 +0000 |
---|---|---|
committer | benl <benl@FreeBSD.org> | 2011-05-18 21:04:29 +0000 |
commit | be96174f193f154a18117e3f36172d4a6632ee6b (patch) | |
tree | 13999d29e25b0e4b9974be8e9a492e86afe15606 /contrib/groff | |
parent | cd538f65b0333c57b6e33e5bbae8f94517ac08cc (diff) | |
download | FreeBSD-src-be96174f193f154a18117e3f36172d4a6632ee6b.zip FreeBSD-src-be96174f193f154a18117e3f36172d4a6632ee6b.tar.gz |
Fix clang warnings.
Note: possible minor security issues fixed (untrusted string used as
printf format string).
Approved by: philip (mentor)
Diffstat (limited to 'contrib/groff')
-rw-r--r-- | contrib/groff/src/devices/grohtml/post-html.cpp | 2 | ||||
-rw-r--r-- | contrib/groff/src/libs/libdriver/input.cpp | 2 | ||||
-rw-r--r-- | contrib/groff/src/roff/troff/mtsm.cpp | 6 | ||||
-rw-r--r-- | contrib/groff/src/roff/troff/node.cpp | 2 | ||||
-rw-r--r-- | contrib/groff/src/utils/hpftodit/hpftodit.cpp | 4 |
5 files changed, 9 insertions, 7 deletions
diff --git a/contrib/groff/src/devices/grohtml/post-html.cpp b/contrib/groff/src/devices/grohtml/post-html.cpp index 1283e06..6834e84 100644 --- a/contrib/groff/src/devices/grohtml/post-html.cpp +++ b/contrib/groff/src/devices/grohtml/post-html.cpp @@ -1587,7 +1587,7 @@ void header_desc::write_headings (FILE *f, int force) buffer += as_string(h); buffer += '\0'; - fprintf(f, buffer.contents()); + fputs(buffer.contents(), f); } else fputs(g->text_string, f); h++; diff --git a/contrib/groff/src/libs/libdriver/input.cpp b/contrib/groff/src/libs/libdriver/input.cpp index bf8a74e..c2b262a 100644 --- a/contrib/groff/src/libs/libdriver/input.cpp +++ b/contrib/groff/src/libs/libdriver/input.cpp @@ -995,7 +995,7 @@ next_command(void) inline bool odd(const int n) { - return (n & 1 == 1) ? true : false; + return ((n & 1) == 1) ? true : false; } ////////////////////////////////////////////////////////////////////// diff --git a/contrib/groff/src/roff/troff/mtsm.cpp b/contrib/groff/src/roff/troff/mtsm.cpp index 630e973..38efc0a 100644 --- a/contrib/groff/src/roff/troff/mtsm.cpp +++ b/contrib/groff/src/roff/troff/mtsm.cpp @@ -611,14 +611,16 @@ int state_set::is_in(int_value_state i) return (intset & (1 << (int)i)) != 0; } +// Note: this used to have a bug s.t. it always tested for bit 0 (benl 18/5/11) int state_set::is_in(units_value_state u) { - return (unitsset & (1 << (int)u) != 0); + return (unitsset & (1 << (int)u)) != 0; } +// Note: this used to have a bug s.t. it always tested for bit 0 (benl 18/5/11) int state_set::is_in(string_value_state s) { - return (stringset & (1 << (int)s) != 0); + return (stringset & (1 << (int)s)) != 0; } void state_set::add(units_value_state, int n) diff --git a/contrib/groff/src/roff/troff/node.cpp b/contrib/groff/src/roff/troff/node.cpp index 0d874d3..0e440b2 100644 --- a/contrib/groff/src/roff/troff/node.cpp +++ b/contrib/groff/src/roff/troff/node.cpp @@ -2157,7 +2157,7 @@ void glyph_node::debug_node() if (c) fprintf(stderr, "%c", c); else - fprintf(stderr, ci->nm.contents()); + fputs(ci->nm.contents(), stderr); if (push_state) fprintf(stderr, " <push_state>"); if (state) diff --git a/contrib/groff/src/utils/hpftodit/hpftodit.cpp b/contrib/groff/src/utils/hpftodit/hpftodit.cpp index 5910fb2..d5d524f 100644 --- a/contrib/groff/src/utils/hpftodit/hpftodit.cpp +++ b/contrib/groff/src/utils/hpftodit/hpftodit.cpp @@ -870,9 +870,9 @@ output_charset(const int tfm_type) else if (!all_flag) continue; else if (tfm_type == MSL) - printf(hp_msl_to_ucode_name(charcode)); + fputs(hp_msl_to_ucode_name(charcode), stdout); else - printf(unicode_to_ucode_name(charcode)); + fputs(unicode_to_ucode_name(charcode), stdout); printf("\t%d,%d", scale(char_table[i].width), scale(char_table[i].ascent)); |