dtprintinfo: Coverity 88650

[oweals/cde.git] / cde / programs / localized / util / merge.c

diff --git a/cde/programs/localized/util/merge.c b/cde/programs/localized/util/merge.c
index 7e247d62b1cc501fbccc35a2ac44b4c36005a2c2..cca339377e57a66a87bd1c6c9d0bca8cf2b948ac 100644 (file)
--- a/cde/programs/localized/util/merge.c
+++ b/cde/programs/localized/util/merge.c
@@ -16,7 +16,7 @@
  * details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with these librararies and programs; if not, write
+ * License along with these libraries and programs; if not, write
  * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
  * Floor, Boston, MA 02110-1301 USA
  */
@@ -93,6 +93,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <locale.h>
 #include <nl_types.h>
 
@@ -117,9 +118,7 @@ void fatal ();
 void get_option ();
 
 
-void main (argc, argv)
-int argc;
-char *argv [];
+void main (int argc, char *argv [])
 {
     int c;
 
@@ -181,7 +180,7 @@ char *argv [];
  * If the pattern "%|nls-???-###|" is found in the template file, replace it
  * by big_buff.
  */
-void process_message ()
+void process_message (void)
 {
     int c;
     int m = 0;
@@ -219,7 +218,7 @@ void process_message ()
 /*
  * Get a character from template. Incriment line count if new line is found.
  */
-int get_char ()
+int get_char (void)
 {
     int c;
 
@@ -232,7 +231,7 @@ int get_char ()
 /*
  * Open message files
  */
-void cat_open ()
+void cat_open (void)
 {
     char line[255];
 
@@ -241,18 +240,10 @@ void cat_open ()
 
     if(pfile != NULL)
     {
-#if defined(USL) || defined(__uxp__)
-        sprintf(line,"/usr/bin/gencat -m ./.dt_pfile.cat %s",pfile);
-#else
         sprintf(line,"/usr/bin/gencat ./.dt_pfile.cat %s",pfile);
-#endif
         if ( system(line) != 0 )
        {
-       /* Utter Linux HACK, it seems the return value of GNU gencat is != 0
-          even on success */
-#if !defined(linux)
            fatal("primary .tmsg file would not gencat\n",0,9);
-#endif
        }
     }
 
@@ -260,18 +251,10 @@ void cat_open ()
 
     if(dfile != NULL)
     {
-#if defined(USL) || defined(__uxp__)
-        sprintf(line,"/usr/bin/gencat -m ./.dt_dfile.cat %s",dfile);
-#else
         sprintf(line,"/usr/bin/gencat ./.dt_dfile.cat %s",dfile);
-#endif
         if ( system(line) != 0 )
        {
-       /* Utter Linux HACK, it seems the return value of GNU gencat is != 0
-          even on success */
-#if !defined(linux)
            fatal("default .tmsg file would not gencat\n",0,9);
-#endif
        }
 
     }
@@ -287,9 +270,9 @@ void cat_open ()
 /*
  * Search a message by specified number. If found, returns 1 and the message
  * will be set in big_buff. If not found, returns 0.
+ * msg, message number to be searched
  */
-int find_message (msg)
-int msg; /* message number to be searched */
+int find_message (int msg)
 {
     int ret = 0;
 
@@ -304,10 +287,11 @@ int msg; /* message number to be searched */
  * Search a line starts with the message number in specified file. If found,
  * the line will be passed to get_message() and returns 1.
  * If not found, returns 0.
+ *
+ * msg, message number to be searched
+ * file, 0: Primary message file, 1: Default message file
  */
-int find_msg_in_file (msg, file)
-int msg; /* message number to be searched */
-int file; /* 0: Primary message file, 1: Default message file */
+int find_msg_in_file (int msg, int file)
 {
         big_buff = catgets(catfile[file],1,msg,"MSG_NOT_FOUND");
         if ( strcmp(big_buff,"MSG_NOT_FOUND") )
@@ -318,17 +302,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:
@@ -346,9 +333,7 @@ int file; /* file in which the error found  0: Primary message file */
 /*
  * Parse command line options.
  */
-void get_option (argc, argv)
-int *argc;
-char *argv[];
+void get_option (int *argc, char *argv[])
 {
     int i;