Newsgroups: comp.os.minix
Path: sserve!newshost.anu.edu.au!harbinger.cc.monash.edu.au!simtel!daffy!uwvax!zebu.heurikon.com!news.sprintlink.net!crash!hall
From: hall@crash.cts.com (Robert R. Hall)
Subject: Minicom cleaned up
Organization: CTS Network Services (CTSNET), San Diego, CA
Date: Mon, 24 Jul 1995 15:48:32 GMT
Message-ID: <DC898w.GCJ@crash.cts.com>
Sender: news@crash.cts.com (news subsystem)
Nntp-Posting-Host: crash.cts.com
Lines: 822

I look upon compiler warning message as possible subtle errors.
The program Minicom produce an excess number of them. Here is
my work in cleaning them out.  These patches are against version
1.7.0 as gotten from:
   ftp.hampshire.edu
in the directory:
   /ftp/asw/minix
and the file:
   mcom1.5.c.tar.Z

Robert R. Hall <hall@crash.cts.com>

echo x - crclist
sed '/^X/s///' > crclist << '/'
X22795   2544 Makefile
X18563   1761 charmap.h
X02480  37194 config.c
X17438   2684 config.h
X14944   4060 configsym.h
X41519  27179 dial.c
X22995   1137 functions.c
X61015   2042 help.c
X00477   1091 install.sh
X39638   6317 ipc.c
X54155    868 keyboard.h
X06443   4938 keyserv.c
X07708  12874 main.c
X12449  20023 minicom.c
X40899   7410 minicom.h
X41539    748 minicom.users
X10079    269 patchlevel.h
X13763   2410 port.h
X03396   8925 rwconf.c
X22708  18976 script.c
X30984   3624 sysdep.h
X37710   9830 sysdep1.c
X50338   5793 sysdep2.c
X20392  10773 updown.c
X63166   5091 util.c
X02313  22922 vt100.c
X63863    903 vt100.h
X28569   5037 windiv.c
X40977  40319 window.c
X60469   6336 window.h
X33739   6988 wkeys.c
X08713    732 xminicom
/
echo x - Makefile.d
sed '/^X/s///' > Makefile.d << '/'
X*** orig/Makefile  crc=11396   2368	Mon Jun 19 09:13:42 1995
X--- Makefile  crc=22795   2544	Sun Jul 23 20:47:44 1995
X***************
X*** 14,17 ****
X  # Minix 1.7.0
X! FLAGS   = -wo -D_MINIX -D_POSIX
X! LFLAGS  = -s  
X  PROGS   = minicom runscript keyserv
X--- 14,17 ----
X  # Minix 1.7.0
X! FLAGS   = -D_MINIX -D_POSIX
X! LFLAGS  = -i  
X  PROGS   = minicom runscript keyserv
X***************
X*** 67,68 ****
X--- 67,69 ----
X  keyserv.o:	keyserv.c $(HDRS)
X+ 		$(CC) -c $(CFLAGS) -D_POSIX_SOURCE keyserv.c
X  
X***************
X*** 71,72 ****
X--- 72,74 ----
X  main.o:		main.c $(HDRS)
X+ 		$(CC) -c $(CFLAGS) -D_POSIX_SOURCE main.c
X  
X***************
X*** 86,87 ****
X--- 88,90 ----
X  updown.o:	updown.c $(HDRS)
X+ 		$(CC) -c $(CFLAGS) -D_POSIX_SOURCE updown.c
X  
X***************
X*** 92,93 ****
X--- 95,97 ----
X  ipc.o:		ipc.c $(HDRS)
X+ 		$(CC) -c $(CFLAGS) -D_POSIX_SOURCE ipc.c
X  
/
echo x - config.c.d
sed '/^X/s///' > config.c.d << '/'
X*** orig/config.c  crc=39853  36724	Thu Mar 30 03:36:50 1995
X--- config.c  crc=02480  37194	Fri Jul 21 16:31:52 1995
X***************
X*** 19,20 ****
X--- 19,40 ----
X  
X+ /* fmg 1/11/94 Color names for menu */
X+ 
X+ static char *J_col[] =
X+   { "BLACK", "RED", "GREEN", "YELLOW", "BLUE", "MAGENTA", "CYAN", "WHITE", };
X+ 
X+ static char *speeds[] =
X+    { "300", "1200", "2400", "9600", "19200", "38400", "57600", "115200", "Curr" };
X+ 
X+ _PROTO(static void pgets, (WIN *, int, int, char *, int, int) );
X+ _PROTO(static void markch, (char *) );
X+ _PROTO(static void psets, (char *, char *) );
X+ _PROTO(static int rgetch, (void) );
X+ _PROTO(static void dopath, (void) );
X+ _PROTO(static void inputproto, (WIN *, int) );
X+ _PROTO(static void doproto, (void) );
X+ _PROTO(static void doserial, (void) );
X+ _PROTO(static void domodem, (void) );
X+ _PROTO(static void doscrkeyb, (void) );
X+ _PROTO(static void donamsave, (void) );
X+ 
X  #if _HAVE_MACROS
X***************
X*** 1065,1067 ****
X  
X! static void (*funcs1[])() = {
X    dopath,
X--- 1085,1087 ----
X  
X! static void (*funcs1[])(void) = {
X    dopath,
X***************
X*** 1110,1119 ****
X  
X- /* fmg 1/11/94 Color names for menu */
X- 
X- static char *J_col[] =
X-   { "BLACK", "RED", "GREEN", "YELLOW", "BLUE", "MAGENTA", "CYAN", "WHITE", };
X- 
X- static char *speeds[] =
X-    { "300", "1200", "2400", "9600", "19200", "38400", "57600", "115200", "Curr" };
X- 
X  /*
X--- 1130,1131 ----
/
echo x - config.h.d
sed '/^X/s///' > config.h.d << '/'
X*** orig/config.h  crc=10515   2685	Mon Jun 19 08:02:32 1995
X--- config.h  crc=17438   2684	Sat Jul 15 16:31:35 1995
X***************
X*** 35,37 ****
X  #  define DFL_PORT "/dev/tty1"
X! #  define DEF_BAUD "19200"
X  #  define CALLOUT  ""
X--- 35,37 ----
X  #  define DFL_PORT "/dev/tty1"
X! #  define DEF_BAUD "2400"
X  #  define CALLOUT  ""
/
echo x - dial.c.d
sed '/^X/s///' > dial.c.d << '/'
X*** orig/dial.c  crc=46560  26614	Tue Jun 20 07:10:22 1995
X--- dial.c  crc=41519  27179	Fri Jul 21 18:56:54 1995
X***************
X*** 90,91 ****
X--- 90,103 ----
X  
X+ _PROTO(static int dialfailed, (char *, int) );
X+ _PROTO(static struct dialent *mkstdent, (void) );
X+ _PROTO(static void v2_read, (FILE *, struct dialent *) );
X+ _PROTO(static void v1_read, (FILE *, struct dialent *) );
X+ _PROTO(static void v0_read, (FILE *, struct dialent *) );
X+ _PROTO(static void writedialdir, (void) );
X+ _PROTO(static struct dialent *getno, (int) );
X+ _PROTO(static void dedit, (struct dialent *) );
X+ _PROTO(static void dhili, (int) );
X+ _PROTO(static void prdir, (WIN *, int, int) );
X+ _PROTO(static void dial_entry, (struct dialent *) );
X+ 
X  /*
X***************
X*** 523,525 ****
X  /* Read version 2 of the dialing directory. */
X! void v2_read(fp, d)
X  struct dialent *d;
X--- 535,537 ----
X  /* Read version 2 of the dialing directory. */
X! static void v2_read(fp, d)
X  struct dialent *d;
X***************
X*** 531,533 ****
X  /* Read version 1 of the dialing directory. */
X! void v1_read(fp, d)
X  FILE *fp;
X--- 543,545 ----
X  /* Read version 1 of the dialing directory. */
X! static void v1_read(fp, d)
X  FILE *fp;
X***************
X*** 545,547 ****
X  /* Read version 0 of the dialing directory. */
X! void v0_read(fp, d)
X  FILE *fp;
X--- 557,559 ----
X  /* Read version 0 of the dialing directory. */
X! static void v0_read(fp, d)
X  FILE *fp;
/
echo x - ipc.d.d
sed '/^X/s///' > ipc.d.d << '/'
X*** orig/ipc.c  crc=52853   6139	Mon Jun 19 02:28:32 1995
X--- ipc.c  crc=39638   6317	Sat Jul 22 04:50:49 1995
X***************
X*** 28,29 ****
X--- 28,34 ----
X  
X+ _PROTO(static void ksigio, (int) );
X+ _PROTO(static void sigack, (int) );
X+ _PROTO(static void kinstall, (void) );
X+ _PROTO(static void dummy, (int) );
X+ 
X  /*
X***************
X*** 161,163 ****
X  		read(0, &ch, 1);
X! 		c = ch;
X  	}
X--- 166,168 ----
X  		read(0, &ch, 1);
X! 		c = ch[0];
X  	}
X***************
X*** 189,192 ****
X  /* Dummy sigalarm handler. */
X! static void dummy()
X! {
X  }
X--- 194,199 ----
X  /* Dummy sigalarm handler. */
X! static void dummy(code)
X! int code;
X! {
X!   (void)code;
X  }
/
echo x - main.c.d
sed '/^X/s///' > main.c.d << '/'
X*** orig/main.c  crc=42216  12630	Mon Jun 19 07:54:36 1995
X--- main.c  crc=07708  12874	Sat Jul 22 20:53:52 1995
X***************
X*** 26,28 ****
X  
X! void curs_status();
X  
X--- 26,33 ----
X  
X! _PROTO(static void get_alrm, (int) );
X! _PROTO(static void do_output, (char *, int) );
X! _PROTO(static void kb_handler, (int, int) );
X! _PROTO(static void ret_csr, (void) );
X! _PROTO(static void updtime, (void) );
X! _PROTO(static void showtemp, (void) );
X  
X***************
X*** 73,75 ****
X    }
X! #if defined(_COHERENT) || defined(linux)
X    sprintf(buf, "ALT-");
X--- 78,80 ----
X    }
X! #if defined(_COHERENT) || defined(linux) || defined(_MINIX)
X    sprintf(buf, "ALT-");
/
echo x - minicom.c.d
sed '/^X/s///' > minicom.c.d << '/'
X*** orig/minicom.c  crc=33923  19751	Tue Jun 20 07:10:52 1995
X--- minicom.c  crc=12449  20023	Sun Jul 23 09:06:01 1995
X***************
X*** 16,17 ****
X--- 16,18 ----
X  #define EXTERN
X+ #include <stdlib.h>
X  #include "port.h"
X***************
X*** 27,28 ****
X--- 28,39 ----
X  
X+ _PROTO(static void do_hang, (int) );
X+ _PROTO(static void hangsig, (int) );
X+ _PROTO(static void shjump, (int) );
X+ _PROTO(static ELM *getline, (WIN *, int) );
X+ _PROTO(static void drawhist, (WIN *, int, int) );
X+ _PROTO(static void scrollback, (void) );
X+ _PROTO(static char *getword, (char **) );
X+ _PROTO(static void usage, (int, int, char *) );
X+ _PROTO(static void helpthem, (void) );
X+ 
X  #ifdef DEBUG
X***************
X*** 350,353 ****
X    int argk = 1;			/* New argc */
X-   extern int getopt(), optind;
X-   extern char *optarg;		/* From getopt (3) package */
X    extern int use_status;	/* Use status line. */
X--- 361,362 ----
X***************
X*** 636,639 ****
X  
X!   if (strcmp(P_BACKSPACE, "BS") != 0) 
X! 	keyboard(KSETBS, P_BACKSPACE[0] == 'B' ? 8 : 127);
X    if (alt_override)
X--- 645,647 ----
X  
X!   keyboard(KSETBS, P_BACKSPACE[0] == 'B' ? 8 : 127);
X    if (alt_override)
/
echo x - minicom.h.d
sed '/^X/s///' > minicom.h.d << '/'
X*** orig/minicom.h  crc=00197   7338	Mon Jun 19 02:32:22 1995
X--- minicom.h  crc=40899   7410	Sat Jul 22 17:50:40 1995
X***************
X*** 162,164 ****
X  
X! _PROTO(void port_init, ( ));
X  
X--- 162,164 ----
X  
X! _PROTO(void port_init, (void));
X  
X***************
X*** 219,222 ****
X  /* Should use stdarg et al. */
X! WIN *tell();
X! void werror();
X  _PROTO(int ask, ( char *what , char *s []));
X--- 219,222 ----
X  /* Should use stdarg et al. */
X! _PROTO(WIN *tell, (const char *_format, ...) );
X! _PROTO(void werror, (const char *_format, ...));
X  _PROTO(int ask, ( char *what , char *s []));
/
echo x - patchlevel.h.d
sed '/^X/s///' > patchlevel.h.d << '/'
X*** orig/patchlevel.h  crc=61390    269	Mon Jun 19 07:49:28 1995
X--- patchlevel.h  crc=10079    269	Mon Jul 24 07:29:16 1995
X***************
X*** 7,10 ****
X   */
X! #define SCCS_ID "@(#)Minicom V1.71 1995"
X! #define ST_VERSION "1.71M 1995"
X! #define CR_VERSION "\nMinicom 1.71 Copyright (c) Miquel van Smoorenburg\r\n"
X--- 7,10 ----
X   */
X! #define SCCS_ID "@(#)Minicom V1.72 1995"
X! #define ST_VERSION "1.72M 1995"
X! #define CR_VERSION "\nMinicom 1.72 Copyright (c) Miquel van Smoorenburg\r\n"
/
echo x - port.h.d
sed '/^X/s///' > port.h.d << '/'
X*** orig/port.h  crc=15152   2391	Mon Jun 19 02:25:18 1995
X--- port.h  crc=13763   2410	Thu Jul 20 08:00:03 1995
X***************
X*** 24,26 ****
X  #endif
X! #if defined (__linux__)
X  #  include <termcap.h>
X--- 24,26 ----
X  #endif
X! #if defined (__linux__) || defined(_MINIX)
X  #  include <termcap.h>
/
echo x - script.c.d
sed '/^X/s///' > script.c.d << '/'
X*** orig/script.c  crc=62920  17806	Wed Mar 15 03:00:58 1995
X--- script.c  crc=22708  18976	Mon Jul 24 06:39:52 1995
X***************
X*** 20,21 ****
X--- 20,22 ----
X   */
X+ #include <stdarg.h>
X  #include "port.h"
X***************
X*** 78,81 ****
X  /* Forward declarations */
X! int s_exec();
X! int execscript();
X  
X--- 79,115 ----
X  /* Forward declarations */
X! _PROTO(void s_error, (const char *, ...) );
X! _PROTO(void init_env, (void) );
X! _PROTO(char *mygetenv, (char *) );
X! _PROTO(void syntaxerr, (char *) );
X! _PROTO(void skipspace, (char **) );
X! _PROTO(void myclock, (int) );
X! _PROTO(char *getword, (char **) );
X! _PROTO(char *strsave, (char *) );
X! _PROTO(void freemem, (void) );
X! _PROTO(int readscript, (char *) );
X! _PROTO(void readchar, (void) );
X! _PROTO(int expfound, (char *) );
X! _PROTO(int output, (char *, FILE *) );
X! _PROTO(struct var *getvar, (char *, int) );
X! _PROTO(int getnum, (char *) );
X! _PROTO(struct line **buildexpect, (void) );
X! _PROTO(int expect, (char *) );
X! _PROTO(int shell, (char *) );
X! _PROTO(int dosend, (char *) );
X! _PROTO(int doexit, (char *) );
X! _PROTO(int dogoto, (char *) );
X! _PROTO(int dogosub, (char *) );
X! _PROTO(int doreturn, (char *) );
X! _PROTO(int print, (char *) );
X! _PROTO(int doset, (char *) );
X! _PROTO(int dodec, (char *) );
X! _PROTO(int doinc, (char *) );
X! _PROTO(int doif, (char *) );
X! _PROTO(int dotimeout, (char *) );
X! _PROTO(int doverbose, (char *) );
X! _PROTO(int dosleep, (char *) );
X! _PROTO(int dobreak, (void) );
X! _PROTO(int docall, (char *) );
X! _PROTO(int s_exec, (char *) );
X! _PROTO(int execscript, (char *) );
X  
X***************
X*** 85,91 ****
X  /*VARARGS*/ 
X! void s_error(fmt, a1, a2, a3)
X! char *fmt;
X! char *a1, *a2, *a3;
X! {
X!   fprintf(stderr, fmt, a1, a2, a3);
X  }
X--- 119,127 ----
X  /*VARARGS*/ 
X! void s_error(const char *fmt, ...)
X! {
X!   va_list ap;
X! 
X!   va_start(ap, fmt);
X!   vfprintf(stderr, fmt, ap);
X!   va_end(ap);
X  }
/
echo x - sysdep1.c.d
sed '/^X/s///' > sysdep1.c.d << '/'
X*** orig/sysdep1.c  crc=11852   9700	Wed Mar 15 02:42:26 1995
X--- sysdep1.c  crc=37710   9830	Sat Jul 22 05:51:41 1995
X***************
X*** 25,27 ****
X   */
X! #include "sysdep.h"
X  
X--- 25,32 ----
X   */
X! #include "port.h"
X! #include "minicom.h"
X! #include "sysdep.h"
X! 
X! _PROTO(static void m_setrts, (int) );
X! _PROTO(static int m_readchk, (int) );
X  
X***************
X*** 48,50 ****
X  /* Set RTS line. Sometimes dropped. Linux specific? */
X! void m_setrts(fd)
X  int fd;
X--- 53,55 ----
X  /* Set RTS line. Sometimes dropped. Linux specific? */
X! static void m_setrts(fd)
X  int fd;
X***************
X*** 285,287 ****
X   */
X! int m_readchk(fd)
X  int fd;
X--- 290,292 ----
X   */
X! static int m_readchk(fd)
X  int fd;
/
echo x - sysdep2.c.d
sed '/^X/s///' > sysdep2.c.d << '/'
X*** orig/sysdep2.c  crc=49721   5745	Thu Mar 30 03:43:24 1995
X--- sysdep2.c  crc=50338   5793	Sat Jul 22 08:21:13 1995
X***************
X*** 17,18 ****
X--- 17,21 ----
X   */
X+ #include <stdlib.h>
X+ #include "port.h"
X+ #include "minicom.h"
X  #include "sysdep.h"
X***************
X*** 31,33 ****
X  {
X! 	char *p, *getenv();
X  
X--- 34,36 ----
X  {
X! 	char *p;
X  
/
echo x - updown.c.d
sed '/^X/s///' > updown.c.d << '/'
X*** orig/updown.c  crc=55377  10558	Wed May 24 23:22:32 1995
X--- updown.c  crc=20392  10773	Fri Jul 21 16:46:52 1995
X***************
X*** 17,18 ****
X--- 17,24 ----
X  
X+ _PROTO(static int mcd, (char *) );
X+ _PROTO(static void udcatch, (int) );
X+ _PROTO(static char *translate, (char *) );
X+ _PROTO(static int varcmp, (char *, char *) );
X+ _PROTO(static char *makenv, (char *, char *) );
X+ 
X  /*
X***************
X*** 232,234 ****
X  	/* then at least make some beeps! */
X! 	if (P_SOUND[0] == 'Y') wprintf("\007\007\007");
X  	sleep(1);
X--- 238,240 ----
X  	/* then at least make some beeps! */
X! 	if (P_SOUND[0] == 'Y') wprintf(win, "\007\007\007");
X  	sleep(1);
/
echo x - util.c.d
sed '/^X/s///' > util.c.d << '/'
X*** orig/util.c  crc=15091   4988	Fri Jan  6 21:43:32 1995
X--- util.c  crc=63166   5091	Fri Jul 21 18:38:13 1995
X***************
X*** 16,17 ****
X--- 16,20 ----
X  
X+ _PROTO(static int getargs, (char *, char *arps[], int) );
X+ _PROTO(static int anys, (char *, char *) );
X+ 
X  /*
/
echo x - vt100.c.d
sed '/^X/s///' > vt100.c.d << '/'
X*** orig/vt100.c  crc=46052  22490	Mon Jun 19 02:26:28 1995
X--- vt100.c  crc=02313  22922	Sat Jul 22 09:05:39 1995
X***************
X*** 134,136 ****
X  };
X! static char *vt_trans[2];
X  static int vt_charset = 0;	/* Character set. */
X--- 134,136 ----
X  };
X! static unsigned char *vt_trans[2];
X  static int vt_charset = 0;	/* Character set. */
X***************
X*** 155,158 ****
X  static FILE *vt_capfp;		/* Capture file. */
X! static void (*vt_keyb)();	/* Gets called for NORMAL/APPL switch. */
X! static void (*termout)();	/* Gets called to output a string. */
X  
X--- 155,158 ----
X  static FILE *vt_capfp;		/* Capture file. */
X! static void (*vt_keyb)(int, int);	/* Gets called for NORMAL/APPL switch. */
X! static void (*termout)(char *, int);	/* Gets called to output a string. */
X  
X***************
X*** 170,174 ****
X  static short savecharset;
X! static char *savetrans[2];
X! #endif
X! 
X  /*
X--- 170,184 ----
X  static short savecharset;
X! static unsigned char *savetrans[2];
X! #endif
X! 
X! _PROTO(static void v_termout, (char *, int) );
X! _PROTO(static void ansi_mode, (int) );
X! _PROTO(static void dec_mode, (int) );
X! _PROTO(static void state1, (int) );
X! _PROTO(static void state2, (int) );
X! _PROTO(static void state3, (int) );
X! _PROTO(static void state4, (int) );
X! _PROTO(static void state5, (int) );
X! _PROTO(static void state6, (int) );
X! _PROTO(static void state7, (int) );
X  /*
X***************
X*** 177,180 ****
X  void vt_install(fun1, fun2, win)
X! void (*fun1)();
X! void (*fun2)();
X  WIN *win;
X--- 187,190 ----
X  void vt_install(fun1, fun2, win)
X! void (*fun1)(char *, int);
X! void (*fun2)(int, int);
X  WIN *win;
/
echo x - vt100.h.d
sed '/^X/s///' > vt100.h.d << '/'
X*** orig/vt100.h  crc=19806    884	Wed Mar 15 02:50:28 1995
X--- vt100.h  crc=63863    903	Fri Jul 21 07:16:30 1995
X***************
X*** 21,23 ****
X  /* Prototypes from vt100.c */
X! _PROTO( void vt_install, (void(*)(), void (*)(), WIN *));
X  _PROTO( void vt_init, (int, int, int, int, int));
X--- 21,23 ----
X  /* Prototypes from vt100.c */
X! _PROTO( void vt_install, (void(*)(char *, int), void (*)(int, int), WIN *));
X  _PROTO( void vt_init, (int, int, int, int, int));
/
echo x - windiv.c.d
sed '/^X/s///' > windiv.c.d << '/'
X*** orig/windiv.c  crc=18834   5026	Thu Mar 30 05:16:10 1995
X--- windiv.c  crc=28569   5037	Sun Jul 23 17:38:47 1995
X***************
X*** 12,13 ****
X--- 12,14 ----
X   */
X+ #include <stdarg.h>
X  #include "port.h"
X***************
X*** 19,22 ****
X  /*VARARGS1*/
X! WIN *tell(s, a1, a2, a3, a4)
X! char *s, *a1, *a2, *a3, *a4;
X  {
X--- 20,22 ----
X  /*VARARGS1*/
X! WIN *tell(const char *s, ...)
X  {
X***************
X*** 24,25 ****
X--- 24,26 ----
X    char buf[128];
X+   va_list ap;
X  
X***************
X*** 27,29 ****
X  
X!   sprintf(buf, s, a1, a2, a3, a4);
X  
X--- 28,32 ----
X  
X!   va_start(ap, s);
X!   vsprintf(buf, s, ap);
X!   va_end(ap);
X  
X***************
X*** 43,52 ****
X  /*VARARGS1*/
X! void werror(s, a1, a2, a3, a4)
X! char *s, *a1, *a2, *a3, *a4;
X! {
X!   WIN *tellwin;
X!   
X!   tellwin = tell(s, a1, a2, a3, a4);
X!   sleep(2);
X!   wclose(tellwin, 1);
X  }
X--- 46,57 ----
X  /*VARARGS1*/
X! void werror(const char *s, ...)
X! {
X!   WIN *tellwin;
X!   va_list ap;
X!   
X!   va_start(ap, s);
X!   tellwin = tell(s, ap);
X!   sleep(2);
X!   wclose(tellwin, 1);
X!   va_end(ap);
X  }
X***************
X*** 129,132 ****
X  
X- extern int editline();
X- 
X  /*
X--- 134,135 ----
/
echo x - window.c.d
sed '/^X/s///' > window.c.d << '/'
X*** orig/window.c  crc=04740  39877	Thu Mar 30 05:15:44 1995
X--- window.c  crc=40977  40319	Sun Jul 23 17:34:53 1995
X***************
X*** 14,15 ****
X--- 14,16 ----
X  
X+ #include <stdarg.h>
X  #include "port.h"
X***************
X*** 117,118 ****
X--- 118,132 ----
X  
X+ _PROTO(static void outchar, (int) );
X+ _PROTO(static void outstr, (char *) );
X+ _PROTO(static void _attroff, (void) );
X+ _PROTO(static void _attron, (int) );
X+ _PROTO(static void _colson, (int) );
X+ _PROTO(static void _setattr, (int, int) );
X+ _PROTO(static void _gotoxy, (int, int) );
X+ _PROTO(static void _write, (int, int, int, int, int, int) );
X+ _PROTO(static void _cursor, (int) );
X+ _PROTO(static int _wclreol, (WIN *) );
X+ _PROTO(static void lredraw, (WIN *, int, int, char *, int) );
X+ _PROTO(static int acmap, (int) );
X+ 
X  #if DEBUG
X***************
X*** 159,161 ****
X   */
X! static int outchar(c)
X  int c;
X--- 173,175 ----
X   */
X! static void outchar(c)
X  int c;
X***************
X*** 167,169 ****
X  #endif
X-   return(0);
X  }
X--- 181,182 ----
X***************
X*** 1045,1049 ****
X  /*VARARGS1*/
X! int wprintf(win, s, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10)
X! WIN *win;
X! char *s, *a1, *a2, *a3, *a4, *a5, *a6, *a7, *a8, *a9, *a10;
X  {
X--- 1058,1060 ----
X  /*VARARGS1*/
X! int wprintf(WIN *win, const char *s, ...)
X  {
X***************
X*** 1051,1052 ****
X--- 1062,1064 ----
X    char *t;
X+   va_list ap;
X  
X***************
X*** 1055,1057 ****
X    _intern = 1;
X!   sprintf(buf, s, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10);
X    while(*t) wputc(win, *t++);
X--- 1067,1071 ----
X    _intern = 1;
X!   va_start(ap, s);
X!   vsprintf(buf, s, ap);
X!   va_end(ap);
X    while(*t) wputc(win, *t++);
X***************
X*** 1168,1170 ****
X  char **choices;
X! void (**funlist)();
X  char *title;
X--- 1182,1184 ----
X  char **choices;
X! void (**funlist)(void);
X  char *title;
/
echo x - window.h.d
sed '/^X/s///' > window.h.d << '/'
X*** orig/window.h  crc=15612   6337	Wed Feb  8 01:01:48 1995
X--- window.h  crc=60469   6336	Sun Jul 23 07:40:46 1995
X***************
X*** 70,72 ****
X  extern int sbcolor;     /* Status Bar Background Color */
X- extern char *J_col[];   /* Color's names */
X   
X--- 70,71 ----
X***************
X*** 164,166 ****
X  /* Should use stdarg et al. */
X! int wprintf();
X  _PROTO(void wbell, ( void ));
X--- 163,165 ----
X  /* Should use stdarg et al. */
X! _PROTO(int wprintf, (WIN *win, const char *s, ...) );
X  _PROTO(void wbell, ( void ));
X***************
X*** 169,171 ****
X  _PROTO(void wcurbar, ( WIN *w , int y , int attr ));
X! _PROTO(int wselect, ( int x , int y , char **choices , void (**funlist)() ,
X  	char *title , int attr , int fg , int bg ));
X--- 168,170 ----
X  _PROTO(void wcurbar, ( WIN *w , int y , int attr ));
X! _PROTO(int wselect, ( int x , int y , char **choices , void (**funlist)(void) ,
X  	char *title , int attr , int fg , int bg ));
/
echo x - wkeys.c.d
sed '/^X/s///' > wkeys.c.d << '/'
X*** orig/wkeys.c  crc=46429   6907	Mon Jun 19 02:31:18 1995
X--- wkeys.c  crc=33739   6988	Fri Jul 21 21:03:37 1995
X***************
X*** 30,32 ****
X  static int keys_in_buf;
X- extern int setcbreak();
X  
X--- 30,31 ----
X***************
X*** 53,54 ****
X--- 52,57 ----
X  #endif
X+ 
X+ _PROTO(static void _initkeys, (void) );
X+ _PROTO(static void dummy, (int) );
X+ 
X  #if KEY_KLUDGE
X***************
X*** 143,146 ****
X  #ifndef _SELECT
X! static void dummy()
X! {
X    gotalrm = 1;
X--- 146,151 ----
X  #ifndef _SELECT
X! static void dummy(code)
X! int code;
X! {
X!   (void)code;
X    gotalrm = 1;
/
