Changeset 1517 for trunk/src/emx/gnu/termcap/tparam.c

Timestamp:

Sep 19, 2004, 5:53:31 PM (21 years ago)

Author:

bird

Message:

Fixing warnings. -Znofork

File:

• trunk/src/emx/gnu/termcap/tparam.c (modified) (5 diffs, 1 prop)

trunk/src/emx/gnu/termcap/tparam.c

@@ -19 +19 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
+#include <stdarg.h>
 #else /* not HAVE_CONFIG_H */
 
@@ -85 +86 @@
    The fourth and following args to tparam serve as the parameter values.  */
 
-static char *tparam1 ();
+static char *tparam1 (const char *string, char *outstring, int len, char *up, char *left, int *argp);
 
 /* VARARGS 2 */
 char *
-tparam (string, outstring, len, arg0, arg1, arg2, arg3)
-     char *string;
-     char *outstring;
-     int len;
-     int arg0, arg1, arg2, arg3;
-{
-  int arg[4];
-
-  arg[0] = arg0;
-  arg[1] = arg1;
-  arg[2] = arg2;
-  arg[3] = arg3;
-  return tparam1 (string, outstring, len, NULL, NULL, arg);
+tparam (const char *string, char *outstring, int len, ...)
+{
+  int args[4];
+  va_list arg;
+  va_start (arg, len);
+  args[0] = va_arg (arg, int);
+  args[1] = va_arg (arg, int);
+  args[2] = va_arg (arg, int);
+  args[3] = va_arg (arg, int);
+  va_end (arg);
+  return tparam1 (string, outstring, len, NULL, NULL, args);
 }
 
@@ -111 +110 @@
 char *
 tgoto (cm, hpos, vpos)
-     char *cm;
+     const char *cm;
      int hpos, vpos;
 {
@@ -124 +123 @@
 static char *
 tparam1 (string, outstring, len, up, left, argp)
-     char *string;
+     const char *string;
      char *outstring;
      int len;
@@ -131 +130 @@
 {
   register int c;
-  register char *p = string;
+  register const char *p = string;
   register char *op = outstring;
   char *outend;