d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix clang warnings.

Browse Source 
Note: possible minor security issues fixed (untrusted string used as
printf format string).

Approved by:	philip (mentor)
This commit is contained in:
Ben Laurie 2011-05-18 21:04:29 +00:00
parent 7f49567fa4
commit d74336e632
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/groff/src/devices/grohtml/post-html.cpp
View File

@ -1587,7 +1587,7 @@ void header_desc::write_headings (FILE *f, int force)
buffer += as_string(h); buffer += as_string(h);
buffer += '\0'; buffer += '\0';
fprintf(f, buffer.contents()); fputs(buffer.contents(), f);
} else } else
fputs(g->text_string, f); fputs(g->text_string, f);
h++; h++;

2
contrib/groff/src/libs/libdriver/input.cpp
View File

@ -995,7 +995,7 @@ next_command(void)
inline bool inline bool
odd(const int n) odd(const int n)
{ {
return (n & 1 == 1) ? true : false; return ((n & 1) == 1) ? true : false;
} }
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////

6
contrib/groff/src/roff/troff/mtsm.cpp
View File

@ -611,14 +611,16 @@ int state_set::is_in(int_value_state i)
return (intset & (1 << (int)i)) != 0; 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) 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) 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) void state_set::add(units_value_state, int n)

2
contrib/groff/src/roff/troff/node.cpp
View File

@ -2157,7 +2157,7 @@ void glyph_node::debug_node()
if (c) if (c)
fprintf(stderr, "%c", c); fprintf(stderr, "%c", c);
else else
fprintf(stderr, ci->nm.contents()); fputs(ci->nm.contents(), stderr);
if (push_state) if (push_state)
fprintf(stderr, " <push_state>"); fprintf(stderr, " <push_state>");
if (state) if (state)

4
contrib/groff/src/utils/hpftodit/hpftodit.cpp
View File

@ -870,9 +870,9 @@ output_charset(const int tfm_type)
else if (!all_flag) else if (!all_flag)
continue; continue;
else if (tfm_type == MSL) else if (tfm_type == MSL)
printf(hp_msl_to_ucode_name(charcode)); fputs(hp_msl_to_ucode_name(charcode), stdout);
else else
printf(unicode_to_ucode_name(charcode)); fputs(unicode_to_ucode_name(charcode), stdout);
printf("\t%d,%d", printf("\t%d,%d",
scale(char_table[i].width), scale(char_table[i].ascent)); scale(char_table[i].width), scale(char_table[i].ascent));