localized/util/merge.h: include string.h and fix up some warnings

diff --git a/cde/programs/localized/util/merge.c b/cde/programs/localized/util/merge.c
index 553e503acb18b8bf704c998d80132909705acae2..379d64ff7c0a2d47e74c19705d182caafd2ad77c 100644 (file)
--- a/cde/programs/localized/util/merge.c
+++ b/cde/programs/localized/util/merge.c
@@ -93,6 +93,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <locale.h>
 #include <nl_types.h>
 
@@ -310,17 +311,20 @@ int file; /* 0: Primary message file, 1: Default message file */
 
 /*
  * Display error message and exit program.
+ *
+ * file == file in which the error found  0: Primary message file 
+ *                                1: Default message file 
+ *                                2: Template file        
+ *                                9: N/A                  
  */
-void fatal (m, line, file)
-char *m;
-int line; /* line where the error found */
-int file; /* file in which the error found  0: Primary message file */
+void fatal (char *m, int line, int file)
+/* file in which the error found  0: Primary message file */
           /*                                1: Default message file */
           /*                                2: Template file        */
           /*                                9: N/A                  */
 {
     fprintf (stderr, "*** Fatal: ");
-    fprintf (stderr, m);
+    fprintf (stderr, "%s", m);
     switch(file)
     {
     case 0: