Fix clang warnings.

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

Approved by:	philip (mentor)

2 files changed, 5 insertions, 3 deletions

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)