Changeset 1517 for trunk/src/emx/gnu

Timestamp:

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

Author:

bird

Message:

Fixing warnings. -Znofork

Location:

trunk/src/emx/gnu/termcap

Files:

• config.h (modified) (1 diff, 1 prop)
• termcap.c (modified) (12 diffs, 1 prop)
• termcap.h (deleted)
• tparam.c (modified) (5 diffs, 1 prop)

trunk/src/emx/gnu/termcap/config.h

@@ -4 +4 @@
 #include <string.h>
 #include <io.h>
+#include <gnu/termcap.h>
 
 #define EMX
-#define TERMCAP_FILE    "/emx/etc/termcap.dat"
+#define TERMCAP_FILE    "/@unixroot/etc/termcap.dat"
 #define HAVE_STRING_H
 #define STDC_HEADERS

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

@@ -122 +122 @@
 static char *term_entry;
 
-static char *tgetst1 ();
+static char *tgetst1 (const char *ptr, char **area);
+
 
 /* Search entry BP for capability CAP.
@@ -128 +129 @@
    0 if not found.  */
 
-static char *
+static const char *
 find_capability (bp, cap)
-     register char *bp, *cap;
+     register const char *bp, *cap;
 {
   for (; *bp; bp++)
@@ -142 +143 @@
 int
 tgetnum (cap)
-     char *cap;
-{
-  register char *ptr = find_capability (term_entry, cap);
+     const char *cap;
+{
+  register const char *ptr = find_capability (term_entry, cap);
   if (!ptr || ptr[-1] != '#')
     return -1;
@@ -152 +153 @@
 int
 tgetflag (cap)
-     char *cap;
-{
-  register char *ptr = find_capability (term_entry, cap);
+     const char *cap;
+{
+  register const char *ptr = find_capability (term_entry, cap);
   return ptr && ptr[-1] == ':';
 }
@@ -165 +166 @@
 char *
 tgetstr (cap, area)
-     char *cap;
+     const char *cap;
      char **area;
 {
-  register char *ptr = find_capability (term_entry, cap);
+  register const char *ptr = find_capability (term_entry, cap);
   if (!ptr || (ptr[-1] != '=' && ptr[-1] != '~'))
     return NULL;
@@ -193 +194 @@
 static char *
 tgetst1 (ptr, area)
-     char *ptr;
+     const char *ptr;
      char **area;
 {
-  register char *p, *r;
+  register const char *p;
+  register char *r;
   register int c;
   register int size;
@@ -286 +288 @@
 void
 tputs (str, nlines, outfun)
-     register char *str;
+     register const char *str;
      int nlines;
      register int (*outfun) ();
@@ -361 +363 @@
 /* Forward declarations of static functions.  */
 
-static int scan_file ();
-static char *gobble_line ();
-static int compare_contin ();
-static int name_match ();
+static int scan_file (char *str, int fd, struct buffer *bufp);
+static char *gobble_line (int fd, struct buffer *bufp, char *append_end);
+static int compare_contin (const char *str1, const char *str2);
+static int name_match (char *line, char *name);
 
 #ifdef EMX
@@ -426 +428 @@
 int
 tgetent (bp, name)
-     char *bp, *name;
+     char *bp; const char *name;
 {
   register char *termcap_name;
@@ -436 +438 @@
   int malloc_size = 0;
   register int c;
-  char *tcenv;                  /* TERMCAP value, if it contains :tc=.  */
+  char *tcenv = NULL;           /* TERMCAP value, if it contains :tc=.  */
   char *indirect = NULL;        /* Terminal type in :tc= in TERMCAP value.  */
   int filep;
@@ -513 +515 @@
   /* Add 1 to size to ensure room for terminating null.  */
   buf.beg = (char *) xmalloc (buf.size + 1);
-  term = indirect ? indirect : name;
+  term = indirect ? indirect : (char *)name;
 
   if (!bp)
@@ -647 +649 @@
 static int
 compare_contin (str1, str2)
-     register char *str1, *str2;
+     register const char *str1, *str2;
 {
   register int c1, c2;

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;