From 56cce59ec79ad5ff6c532c20e54171d33d0ef8f7 Mon Sep 17 00:00:00 2001 From: William McBrine Date: Sat, 28 Jan 2006 14:51:16 +0000 Subject: [PATCH] Abandon non-stdarg code (it didn't work right). May as well abandon all non-ANSI code now. --- curses.h | 40 ++----------------------- pdcurses/pdcdebug.c | 12 +------- pdcurses/pdcutil.c | 16 +--------- pdcurses/printw.c | 72 +-------------------------------------------- pdcurses/scanw.c | 72 +-------------------------------------------- 5 files changed, 6 insertions(+), 206 deletions(-) diff --git a/curses.h b/curses.h index 7fdd92ef..49b4d430 100644 --- a/curses.h +++ b/curses.h @@ -16,7 +16,7 @@ * See the file maintain.er for details of the current maintainer. **************************************************************************/ -/* $Id: curses.h,v 1.108 2006/01/28 14:36:42 wmcbrine Exp $ */ +/* $Id: curses.h,v 1.109 2006/01/28 14:51:16 wmcbrine Exp $ */ /* ---------------------------------------------------------------------- PDCurses @@ -98,9 +98,6 @@ PDCurses portable platform definitions list: # ifndef HAVE_MEMORY_H # define HAVE_MEMORY_H /* have */ # endif -# ifndef HAVE_STDARG_H -# define HAVE_STDARG_H /* have */ -# endif # ifndef HAVE_MEMMOVE # define HAVE_MEMMOVE /* have memmove() */ # endif @@ -155,9 +152,6 @@ PDCurses portable platform definitions list: # ifndef HAVE_MEMORY_H # define HAVE_MEMORY_H /* have */ # endif -# ifndef HAVE_STDARG_H -# define HAVE_STDARG_H /* have */ -# endif # else # define DOS 6 /* Major release of DOS supported */ # include @@ -214,9 +208,6 @@ PDCurses portable platform definitions list: # ifndef HAVE_PROTO # define HAVE_PROTO 1 /* C Set/2 supports ANSI C prototypes */ # endif -# ifndef HAVE_STDARG_H -# define HAVE_STDARG_H /* have */ -# endif # ifndef HAVE_MEMORY_H # define HAVE_MEMORY_H /* have */ # endif @@ -245,9 +236,6 @@ PDCurses portable platform definitions list: # endif # define OS2 3 /* Major release of OS/2 supported */ # define CURSES__32BIT__ -# ifndef HAVE_STDARG_H -# define HAVE_STDARG_H /* have */ -# endif # ifndef HAVE_MEMORY_H # define HAVE_MEMORY_H /* have */ # endif @@ -280,9 +268,6 @@ PDCurses portable platform definitions list: # endif # define DOS 6 # include -# ifndef HAVE_STDARG_H -# define HAVE_STDARG_H /* have */ -# endif # ifndef HAVE_MEMORY_H # define HAVE_MEMORY_H /* have */ # endif @@ -317,9 +302,6 @@ PDCurses portable platform definitions list: # ifndef HAVE_MEMORY_H # define HAVE_MEMORY_H /* have */ # endif -# ifndef HAVE_STDARG_H -# define HAVE_STDARG_H /* have */ -# endif # ifndef HAVE_UNISTD_H # define HAVE_UNISTD_H /* have */ # endif @@ -347,9 +329,6 @@ PDCurses portable platform definitions list: # ifndef HAVE_MEMORY_H # define HAVE_MEMORY_H /* have */ # endif -# ifndef HAVE_STDARG_H -# define HAVE_STDARG_H /* have */ -# endif # ifndef HAVE_MEMMOVE # define HAVE_MEMMOVE /* have memmove() */ # endif @@ -372,9 +351,6 @@ PDCurses portable platform definitions list: # ifndef HAVE_MEMORY_H # define HAVE_MEMORY_H /* have */ # endif -# ifndef HAVE_STDARG_H -# define HAVE_STDARG_H /* have */ -# endif # ifndef HAVE_MEMMOVE # define HAVE_MEMMOVE /* have memmove() */ # endif @@ -437,9 +413,6 @@ PDCurses portable platform definitions list: # ifndef HAVE_MEMORY_H # define HAVE_MEMORY_H /* have */ # endif -# ifndef HAVE_STDARG_H -# define HAVE_STDARG_H /* have */ -# endif # ifndef HAVE_MEMMOVE # define HAVE_MEMMOVE /* have memmove() */ # endif @@ -485,9 +458,6 @@ PDCurses portable platform definitions list: # ifndef __SMALL__ # define __SMALL__ # endif -# ifndef HAVE_STDARG_H -# define HAVE_STDARG_H -# endif # ifndef HAVE_MEMMOVE # define HAVE_MEMMOVE # endif @@ -511,13 +481,7 @@ PDCurses portable platform definitions list: # include #endif -#if defined(HAVE_STDARG_H) && defined(HAVE_PROTO) -# include -# define HAVE_STDARG_H_HAVE_PROTO -#else -# include -#endif - +#include #include /* Required by X/Open usage below */ #if defined(__cplusplus) || defined(__cplusplus__) || defined(__CPLUSPLUS) diff --git a/pdcurses/pdcdebug.c b/pdcurses/pdcdebug.c index e569532e..b031e9ac 100644 --- a/pdcurses/pdcdebug.c +++ b/pdcurses/pdcdebug.c @@ -30,7 +30,7 @@ #undef PDC_debug #ifdef PDCDEBUG -char *rcsid_PDCdebug = "$Id: pdcdebug.c,v 1.8 2006/01/27 16:18:00 wmcbrine Exp $"; +char *rcsid_PDCdebug = "$Id: pdcdebug.c,v 1.9 2006/01/28 14:51:16 wmcbrine Exp $"; #endif bool trace_on = FALSE; @@ -54,13 +54,7 @@ bool trace_on = FALSE; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_STDARG_H_HAVE_PROTO void PDC_CDECL PDC_debug(char *fmt, ...) -#else -void PDC_CDECL PDC_debug(fmt, va_alist) -char *fmt; -va_dcl -#endif /***********************************************************************/ { va_list args; @@ -85,11 +79,7 @@ va_dcl strftime(hms, 9, "%H:%M:%S", localtime(&now)); fprintf(dbfp, "At: %8.8ld - %s ", (long) clock(), hms); -#ifdef HAVE_STDARG_H_HAVE_PROTO va_start(args, fmt); -#else - va_start(args); -#endif vfprintf(dbfp, fmt, args); va_end(args); diff --git a/pdcurses/pdcutil.c b/pdcurses/pdcutil.c index 8e4d9a0a..6af7cc4d 100644 --- a/pdcurses/pdcutil.c +++ b/pdcurses/pdcutil.c @@ -32,7 +32,7 @@ #include #ifdef PDCDEBUG -char *rcsid_PDCutil = "$Id: pdcutil.c,v 1.19 2006/01/27 16:18:00 wmcbrine Exp $"; +char *rcsid_PDCutil = "$Id: pdcutil.c,v 1.20 2006/01/28 14:51:16 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -168,19 +168,9 @@ void PDC_beep() } while (0) /***********************************************************************/ -#ifdef HAVE_STDARG_H_HAVE_PROTO int PDC_vsscanf(char *buf, const char *fmt, va_list arg_ptr) -#else -int PDC_vsscanf(buf, fmt, va_alist) -char *buf; -char *fmt; -va_dcl -#endif /***********************************************************************/ { -#if !defined(HAVE_STDARG_H_HAVE_PROTO) - va_list arg_ptr; -#endif int count, chars, c, width, radix, d, i; int *int_ptr; long *long_ptr; @@ -197,10 +187,6 @@ va_dcl PDC_LOG(("PDC_vsscanf() - called\n")); -#if !defined(HAVE_STDARG_H_HAVE_PROTO) - va_start(arg_ptr); -#endif - count = 0; chars = 0; c = 0; diff --git a/pdcurses/printw.c b/pdcurses/printw.c index 8f6a6f05..ad7acffa 100644 --- a/pdcurses/printw.c +++ b/pdcurses/printw.c @@ -39,7 +39,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_printw = "$Id: printw.c,v 1.9 2006/01/27 18:41:37 wmcbrine Exp $"; +char *rcsid_printw = "$Id: printw.c,v 1.10 2006/01/28 14:51:16 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -96,13 +96,7 @@ char *rcsid_printw = "$Id: printw.c,v 1.9 2006/01/27 18:41:37 wmcbrine Exp $"; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_STDARG_H_HAVE_PROTO int PDC_CDECL printw(char *fmt, ...) -#else -int PDC_CDECL printw(fmt, va_alist) -char *fmt; -va_dcl -#endif /***********************************************************************/ { va_list args; @@ -110,11 +104,7 @@ va_dcl PDC_LOG(("printw() - called\n")); -#ifdef HAVE_STDARG_H_HAVE_PROTO va_start(args, fmt); -#else - va_start(args); -#endif retval = vwprintw(stdscr, fmt, args); va_end(args); @@ -122,14 +112,7 @@ va_dcl } /***********************************************************************/ -#ifdef HAVE_STDARG_H_HAVE_PROTO int PDC_CDECL wprintw(WINDOW *win, char *fmt, ...) -#else -int PDC_CDECL wprintw(win, fmt, va_alist) -WINDOW *win; -char *fmt; -va_dcl -#endif /***********************************************************************/ { va_list args; @@ -137,11 +120,7 @@ va_dcl PDC_LOG(("wprintw() - called\n")); -#ifdef HAVE_STDARG_H_HAVE_PROTO va_start(args, fmt); -#else - va_start(args); -#endif retval = vwprintw(win, fmt, args); va_end(args); @@ -149,14 +128,7 @@ va_dcl } /***********************************************************************/ -#ifdef HAVE_STDARG_H_HAVE_PROTO int PDC_CDECL mvprintw(int y, int x, char *fmt, ...) -#else -int PDC_CDECL mvprintw(y, x, fmt, va_alist) -int y, x; -char *fmt; -va_dcl -#endif /***********************************************************************/ { va_list args; @@ -167,11 +139,7 @@ va_dcl if (move(y, x) == ERR) return ERR; -#ifdef HAVE_STDARG_H_HAVE_PROTO va_start(args, fmt); -#else - va_start(args); -#endif retval = vwprintw(stdscr, fmt, args); va_end(args); @@ -179,15 +147,7 @@ va_dcl } /***********************************************************************/ -#ifdef HAVE_STDARG_H_HAVE_PROTO int PDC_CDECL mvwprintw(WINDOW *win, int y, int x, char *fmt, ...) -#else -int PDC_CDECL mvwprintw(win, y, x, fmt, va_alist) -WINDOW *win; -int y, x; -char *fmt; -va_dcl -#endif /***********************************************************************/ { va_list args; @@ -198,11 +158,7 @@ va_dcl if (wmove(win, y, x) == ERR) return ERR; -#ifdef HAVE_STDARG_H_HAVE_PROTO va_start(args, fmt); -#else - va_start(args); -#endif retval = vwprintw(win, fmt, args); va_end(args); @@ -210,50 +166,24 @@ va_dcl } /***********************************************************************/ -#ifdef HAVE_STDARG_H_HAVE_PROTO int PDC_CDECL vwprintw(WINDOW *win, char *fmt, va_list varglist) -#else -int PDC_CDECL vwprintw(win, fmt, va_alist) -WINDOW *win; -char *fmt; -va_dcl -#endif /***********************************************************************/ { -#if !defined(HAVE_STDARG_H_HAVE_PROTO) - va_list varglist; -#endif char printbuf[513]; int len; PDC_LOG(("vwprintw() - called\n")); -#if !defined(HAVE_STDARG_H_HAVE_PROTO) - va_start(varglist); -#endif len = vsprintf(printbuf, fmt, varglist); return (waddstr(win, printbuf) == ERR) ? ERR : len; } /***********************************************************************/ -#ifdef HAVE_STDARG_H_HAVE_PROTO int PDC_CDECL vw_printw(WINDOW *win, char *fmt, va_list varglist) -#else -int PDC_CDECL vw_printw(win, fmt, va_alist) -WINDOW *win; -char *fmt; -va_dcl -#endif /***********************************************************************/ { -#if !defined(HAVE_STDARG_H_HAVE_PROTO) - va_list varglist; -#endif PDC_LOG(("vw_printw() - called\n")); -#if !defined(HAVE_STDARG_H_HAVE_PROTO) - va_start(varglist); -#endif return vwprintw(win, fmt, varglist); } diff --git a/pdcurses/scanw.c b/pdcurses/scanw.c index 62d7b2f5..ff717674 100644 --- a/pdcurses/scanw.c +++ b/pdcurses/scanw.c @@ -44,7 +44,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_scanw = "$Id: scanw.c,v 1.10 2006/01/27 18:41:37 wmcbrine Exp $"; +char *rcsid_scanw = "$Id: scanw.c,v 1.11 2006/01/28 14:51:16 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -93,13 +93,7 @@ char *rcsid_scanw = "$Id: scanw.c,v 1.10 2006/01/27 18:41:37 wmcbrine Exp $"; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_STDARG_H_HAVE_PROTO int PDC_CDECL scanw(char *fmt, ...) -#else -int PDC_CDECL scanw(fmt, va_alist) -char *fmt; -va_dcl -#endif /***********************************************************************/ { va_list args; @@ -107,11 +101,7 @@ va_dcl PDC_LOG(("scanw() - called\n")); -#ifdef HAVE_STDARG_H_HAVE_PROTO va_start(args, fmt); -#else - va_start(args); -#endif retval = vwscanw(stdscr, fmt, args); va_end(args); @@ -119,14 +109,7 @@ va_dcl } /***********************************************************************/ -#ifdef HAVE_STDARG_H_HAVE_PROTO int PDC_CDECL wscanw(WINDOW *win, char *fmt, ...) -#else -int PDC_CDECL wscanw(win, fmt, va_alist) -WINDOW *win; -char *fmt; -va_dcl -# endif /***********************************************************************/ { va_list args; @@ -134,11 +117,7 @@ va_dcl PDC_LOG(("wscanw() - called\n")); -#ifdef HAVE_STDARG_H_HAVE_PROTO va_start(args, fmt); -#else - va_start(args); -#endif retval = vwscanw(win, fmt, args); va_end(args); @@ -146,14 +125,7 @@ va_dcl } /***********************************************************************/ -#ifdef HAVE_STDARG_H_HAVE_PROTO int PDC_CDECL mvscanw(int y, int x, char *fmt, ... ) -#else -int PDC_CDECL mvscanw(y, x, fmt, va_alist) -int y, x; -char *fmt; -va_dcl -#endif /***********************************************************************/ { va_list args; @@ -164,11 +136,7 @@ va_dcl if (move(y, x) == ERR) return ERR; -#ifdef HAVE_STDARG_H_HAVE_PROTO va_start(args, fmt); -#else - va_start(args); -#endif retval = vwscanw(stdscr, fmt, args); va_end(args); @@ -176,15 +144,7 @@ va_dcl } /***********************************************************************/ -#ifdef HAVE_STDARG_H_HAVE_PROTO int PDC_CDECL mvwscanw(WINDOW *win, int y, int x, char *fmt,...) -#else -int PDC_CDECL mvwscanw(win, y, x, fmt, va_alist) -WINDOW *win; -int y, x; -char *fmt; -va_dcl -#endif /***********************************************************************/ { va_list args; @@ -195,11 +155,7 @@ va_dcl if (wmove(win, y, x) == ERR) return ERR; -#ifdef HAVE_STDARG_H_HAVE_PROTO va_start(args, fmt); -#else - va_start(args); -#endif retval = vwscanw(win, fmt, args); va_end(args); @@ -207,19 +163,9 @@ va_dcl } /***********************************************************************/ -#ifdef HAVE_STDARG_H_HAVE_PROTO int PDC_CDECL vwscanw(WINDOW *win, char *fmt, va_list varglist) -#else -int PDC_CDECL vwscanw(win, fmt, va_alist) -WINDOW *win; -char *fmt; -va_dcl -#endif /***********************************************************************/ { -#if !defined(HAVE_STDARG_H_HAVE_PROTO) - va_list varglist; -#endif char scanbuf[513]; PDC_LOG(("vwscanw() - called\n")); @@ -227,30 +173,14 @@ va_dcl if (wgetstr(win, scanbuf) == ERR) return ERR; -#if !defined(HAVE_STDARG_H_HAVE_PROTO) - va_start(varglist); -#endif return vsscanf(scanbuf, fmt, varglist); } /***********************************************************************/ -#ifdef HAVE_STDARG_H_HAVE_PROTO int PDC_CDECL vw_scanw(WINDOW *win, char *fmt, va_list varglist) -#else -int PDC_CDECL vw_scanw(win, fmt, va_alist) -WINDOW *win; -char *fmt; -va_dcl -#endif /***********************************************************************/ { -#if !defined(HAVE_STDARG_H_HAVE_PROTO) - va_list varglist; -#endif PDC_LOG(("vw_scanw() - called\n")); -#if !defined(HAVE_STDARG_H_HAVE_PROTO) - va_start(varglist); -#endif return vwscanw(win, fmt, varglist); }