0
@@ -153,10 +153,8 @@
0
         case 'o': /* -output=FILE */
0
             outfilename = optarg;
0
             /* we allow "-" as a synonym for stdout here */
0
-            if (! strcmp(optarg, "-"))
0
-            {
0
+            if (strcmp(optarg, "-") == 0)
0
                 outfilename = 0;
0
-            }
0
             break;
0
         default: /* something unexpected has happened */
0
             usage(progname);

0
@@ -25,6 +25,16 @@
0
 /* TODO remove */
0
 static extensions = 0;
0
 
0
+static void print_html_string(char *str, bool obfuscate);
0
+static void print_html_element_list(element *list, bool obfuscate);
0
+static void print_html_element(element elt, bool obfuscate);
0
+static void print_latex_string(char *str);
0
+static void print_latex_element_list(element *list);
0
+static void print_latex_element(element elt);
0
+static void print_groff_string(char *str);
0
+static void print_groff_mm_element_list(element *list);
0
+static void print_groff_mm_element(element elt, int count);
0
+
0
 /**********************************************************************
0
 
0
   Utility functions for printing
0
@@ -41,7 +51,7 @@
0
 /* pad - add newlines if needed */
0
 static void pad(int num) {
0
     while (num-- > padded)
0
-        printf("\n");
0
+        printf("%s","\n");;
0
     padded = num;
0
 }
0
 
0
0
0
0
0
0
0
0
0
@@ -53,38 +63,37 @@
0
 
0
 /* print_html_string - print string, escaping for HTML  
0
  * If obfuscate selected, convert characters to hex or decimal entities at random */
0
-void print_html_string(char *str, bool obfuscate) {
0
+static void print_html_string(char *str, bool obfuscate) {
0
     while (*str != '\0') {
0
         switch (*str) {
0
         case '&':
0
-            printf("&");
0
+            printf("%s","&");;
0
             break;
0
         case '<':
0
-            printf("&lt;");
0
+            printf("%s","&lt;");;
0
             break;
0
         case '>':
0
-            printf("&gt;");
0
+            printf("%s","&gt;");;
0
             break;
0
         case '"':
0
-            printf("&quot;");
0
+            printf("%s","&quot;");;
0
             break;
0
         default:
0
             if (obfuscate) {
0
                 if (rand() % 2 == 0)
0
-                    printf("&#%d;",  *str);
0
+                    printf("&#%d;", (int) *str);
0
                 else
0
-                    printf("&#x%x;",  *str);
0
+                    printf("&#x%x;", (unsigned int) *str);
0
             }
0
             else
0
                 putchar(*str);
0
-            break;
0
         }
0
     str++;
0
     }
0
 }
0
 
0
 /* print_html_element_list - print a list of elements as HTML */
0
-void print_html_element_list(element *list, bool obfuscate) {
0
+static void print_html_element_list(element *list, bool obfuscate) {
0
     while (list != NULL) {
0
         print_html_element(*list, obfuscate);
0
         list = list->next;
0
@@ -92,7 +101,7 @@
0
 }
0
 
0
 /* print_html_element - print an element as HTML */
0
-void print_html_element(element elt, bool obfuscate) {
0
+static void print_html_element(element elt, bool obfuscate) {
0
     int lev;
0
     char *contents;
0
     switch (elt.key) {
0
0
0
0
0
0
0
0
0
0
0
0
@@ -100,40 +109,40 @@
0
         printf("%s", elt.contents.str);
0
         break;
0
     case LINEBREAK:
0
-        printf("<br/>");
0
+        printf("%s","<br/>");;
0
         break;
0
     case STR:
0
         print_html_string(elt.contents.str, obfuscate);
0
         break;
0
     case ELLIPSIS:
0
-        printf("&hellip;");
0
+        printf("%s","&hellip;");;
0
         break;
0
     case EMDASH:
0
-        printf("&mdash;");
0
+        printf("%s","&mdash;");;
0
         break;
0
     case ENDASH:
0
-        printf("&ndash;");
0
+        printf("%s","&ndash;");;
0
         break;
0
     case APOSTROPHE:
0
-        printf("&rsquo;");
0
+        printf("%s","&rsquo;");;
0
         break;
0
     case SINGLEQUOTED:
0
-        printf("&lsquo;");
0
+        printf("%s","&lsquo;");;
0
         print_html_element_list(elt.children, obfuscate);
0
-        printf("&rsquo;");
0
+        printf("%s","&rsquo;");;
0
         break;
0
     case DOUBLEQUOTED:
0
-        printf("&ldquo;");
0
+        printf("%s","&ldquo;");;
0
         print_html_element_list(elt.children, obfuscate);
0
-        printf("&rdquo;");
0
+        printf("%s","&rdquo;");;
0
         break;
0
     case CODE:
0
-        printf("<code>");
0
+        printf("%s","<code>");;
0
         print_html_string(elt.contents.str, obfuscate);
0
-        printf("</code>");
0
+        printf("%s","</code>");;
0
         break;
0
     case HTML:
0
-        printf(elt.contents.str);
0
+        printf("%s", elt.contents.str);
0
         break;
0
     case LINK:
0
         if (strstr(elt.contents.link.url, "mailto:") == elt.contents.link.url)
0
0
@@ -146,9 +155,9 @@
0
             print_html_string(elt.contents.link.title, obfuscate);
0
             printf("\"");
0
         }
0
-        printf(">");     
0
+        printf("%s",">");;     
0
         print_html_element_list(elt.contents.link.label, obfuscate);
0
-        printf("</a>");
0
+        printf("%s","</a>");;
0
         break;
0
     case IMAGE:
0
         printf("<img src=\"");
0
0
0
0
0
@@ -161,17 +170,17 @@
0
             print_html_string(elt.contents.link.title, obfuscate);
0
             printf("\"");
0
         }
0
-        printf(" />");
0
+        printf("%s"," />");;
0
         break;
0
     case EMPH:
0
-        printf("<em>");
0
+        printf("%s","<em>");;
0
         print_html_element_list(elt.children, obfuscate);
0
-        printf("</em>");
0
+        printf("%s","</em>");;
0
         break;
0
     case STRONG:
0
-        printf("<strong>");
0
+        printf("%s","<strong>");;
0
         print_html_element_list(elt.children, obfuscate);
0
-        printf("</strong>");
0
+        printf("%s","</strong>");;
0
         break;
0
     case LIST:
0
         print_html_element_list(elt.children, obfuscate);
0
0
0
0
0
0
0
0
0
0
0
0
0
0
@@ -200,61 +209,61 @@
0
         break;
0
     case PARA:
0
         pad(2);
0
-        printf("<p>");
0
+        printf("%s","<p>");;
0
         print_html_element_list(elt.children, obfuscate);
0
-        printf("</p>");
0
+        printf("%s","</p>");;
0
         padded = 0;
0
         break;
0
     case HRULE:
0
         pad(2);
0
-        printf("<hr />");
0
+        printf("%s","<hr />");;
0
         padded = 0;
0
         break;
0
     case HTMLBLOCK:
0
         pad(2);
0
-        printf(elt.contents.str);
0
+        printf("%s", elt.contents.str);
0
         padded = 0;
0
         break;
0
     case VERBATIM:
0
         pad(2);
0
-        printf(""<pre><code>");
0
+        printf("%s", "<pre><code>");
0
         print_html_string(elt.contents.str, obfuscate);
0
-        printf(""</code></pre>");
0
+        printf("%s", "</code></pre>");
0
         padded = 0;
0
         break;
0
     case BULLETLIST:
0
         pad(2);
0
-        printf(""<ul>");
0
+        printf("%s", "<ul>");
0
         padded = 0;
0
         print_html_element_list(elt.children, obfuscate);
0
         pad(1);
0
-        printf(""</ul>");
0
+        printf("%s", "</ul>");
0
         padded = 0;
0
         break;
0
     case ORDEREDLIST:
0
         pad(2);
0
-        printf(""<ol>");
0
+        printf("%s", "<ol>");
0
         padded = 0;
0
         print_html_element_list(elt.children, obfuscate);
0
         pad(1);
0
-        printf("</ol>");
0
+        printf("%s","</ol>");;
0
         padded = 0;
0
         break;
0
     case LISTITEM:
0
         pad(1);
0
-        printf("<li>");
0
+        printf("%s","<li>");;
0
         padded = 2;
0
         print_html_element_list(elt.children, obfuscate);
0
-        printf("</li>");
0
+        printf("%s","</li>");;
0
         padded = 0;
0
         break;
0
     case BLOCKQUOTE:
0
         pad(2);
0
-        printf("<blockquote>\n");
0
+        printf("%s","<blockquote>\n");;
0
         padded = 2;
0
         print_html_element_list(elt.children, obfuscate);
0
         pad(1);
0
-        printf("</blockquote>");
0
+        printf("%s","</blockquote>");;
0
         padded = 0;
0
         break;
0
     case REFERENCE:
0
0
@@ -273,11 +282,10 @@
0
     default: 
0
         fprintf(stderr, "print_html_element encountered unknown element key = %d\n", elt.key); 
0
         exit(EXIT_FAILURE);
0
-        break;
0
     }
0
 }
0
 
0
-void print_html_endnotes(element *endnotes) {
0
+static void print_html_endnotes(void) {
0
     int counter = 0;
0
     if (endnotes == NULL) {
0
         return;
0
0
@@ -292,11 +300,11 @@
0
         print_html_element_list(endnotes->children, false);
0
         printf(" <a href=\"#fnref%d\" title=\"Jump back to reference\">[back]</a>", counter);
0
         pad(1);
0
-        printf(""</li>");
0
+        printf("%s","</li>");
0
         endnotes = endnotes->next;
0
     }
0
     pad(1);
0
-    printf("</ol>");
0
+    printf("%s","</ol>");;
0
 }
0
 
0
 /**********************************************************************
0
@@ -306,7 +314,7 @@
0
  ***********************************************************************/
0
 
0
 /* print_latex_string - print string, escaping for LaTeX */
0
-void print_latex_string(char *str) {
0
+static void print_latex_string(char *str) {
0
     while (*str != '\0') {
0
         switch (*str) {
0
           case '{': case '}': case '$': case '%':
0
0
0
0
0
0
0
0
@@ -314,33 +322,32 @@
0
             printf("\\%c", *str);
0
             break;
0
         case '^':
0
-            printf("\\^{}");
0
+            printf("%s","\\^{}");;
0
             break;
0
         case '\\':
0
-            printf("\\textbackslash{}");
0
+            printf("%s","\\textbackslash{}");;
0
             break;
0
         case '~':
0
-            printf("\\ensuremath{\\sim}");
0
+            printf("%s","\\ensuremath{\\sim}");;
0
             break;
0
         case '|':
0
-            printf("\\textbar{}");
0
+            printf("%s","\\textbar{}");;
0
             break;
0
         case '<':
0
-            printf("\\textless{}");
0
+            printf("%s","\\textless{}");;
0
             break;
0
         case '>':
0
-            printf("\\textgreater{}");
0
+            printf("%s","\\textgreater{}");;
0
             break;
0
         default:
0
             putchar(*str);
0
-            break;
0
         }
0
     str++;
0
     }
0
 }
0
 
0
 /* print_latex_element_list - print a list of elements as LaTeX */
0
-void print_latex_element_list(element *list) {
0
+static void print_latex_element_list(element *list) {
0
     while (list != NULL) {
0
         print_latex_element(*list);
0
         list = list->next;
0
@@ -348,7 +355,7 @@
0
 }
0
 
0
 /* print_latex_element - print an element as LaTeX */
0
-void print_latex_element(element elt) {
0
+static void print_latex_element(element elt) {
0
     int lev;
0
     int i;
0
     char *contents;
0
0
0
0
0
0
0
0
0
0
0
@@ -357,37 +364,37 @@
0
         printf("%s", elt.contents.str);
0
         break;
0
     case LINEBREAK:
0
-        printf("\\\\\n");
0
+        printf("%s","\\\\\n");;
0
         break;
0
     case STR:
0
         print_latex_string(elt.contents.str);
0
         break;
0
     case ELLIPSIS:
0
-        printf("\\ldots{}");
0
+        printf("%s","\\ldots{}");;
0
         break;
0
     case EMDASH: 
0
-        printf("---");
0
+        printf("%s","---");;
0
         break;
0
     case ENDASH: 
0
-        printf("--");
0
+        printf("%s","--");;
0
         break;
0
     case APOSTROPHE:
0
-        printf("'");
0
+        printf("%s","'");;
0
         break;
0
     case SINGLEQUOTED:
0
-        printf("`");
0
+        printf("%s","`");;
0
         print_latex_element_list(elt.children);
0
-        printf("'");
0
+        printf("%s","'");;
0
         break;
0
     case DOUBLEQUOTED:
0
-        printf("``");
0
+        printf("%s","``");;
0
         print_latex_element_list(elt.children);
0
-        printf("''");
0
+        printf("%s","''");;
0
         break;
0
     case CODE:
0
-        printf("\\texttt{");
0
+        printf("%s","\\texttt{");;
0
         print_latex_string(elt.contents.str);
0
-        printf("}");
0
+        printf("%s","}");;
0
         break;
0
     case HTML:
0
       &n