From add8dc21fd14d7d2ef96f776f3ff00bc891bc4b0 Mon Sep 17 00:00:00 2001 From: William McBrine Date: Sat, 28 Jan 2006 18:19:51 +0000 Subject: [PATCH] With ANSI as the new base requirement, PDC_memmove() is unneeded (memmove() is ANSI), and memory.h is _probably_ unneeded -- still have to check the 16-bit DOS compilers. --- demos/newdemo.c | 6 +----- doc/intro.man | 1 - os2/pdcdisp.c | 7 +------ pdcurses/delch.c | 19 +++-------------- pdcurses/initscr.c | 6 +----- pdcurses/kernel.c | 7 +------ pdcurses/pad.c | 7 +------ pdcurses/pdcutil.c | 50 +------------------------------------------- pdcurses/pdcwin.c | 27 +----------------------- pdcurses/refresh.c | 6 +----- win32/curses.def | 1 - win32/curses_lcc.def | 1 - win32/pdcdisp.c | 9 +++----- x11/pdcdisp.c | 7 +------ 14 files changed, 15 insertions(+), 139 deletions(-) diff --git a/demos/newdemo.c b/demos/newdemo.c index 8a1c5814..0087932a 100644 --- a/demos/newdemo.c +++ b/demos/newdemo.c @@ -34,12 +34,8 @@ #include #include -#ifdef HAVE_MEMORY_H -# include -#endif - #ifdef PDCDEBUG -char *rcsid_newdemo = "$Id: newdemo.c,v 1.19 2006/01/28 16:53:26 wmcbrine Exp $"; +char *rcsid_newdemo = "$Id: newdemo.c,v 1.20 2006/01/28 18:19:50 wmcbrine Exp $"; #endif int WaitForUser(void); diff --git a/doc/intro.man b/doc/intro.man index 2ddbe691..59909397 100644 --- a/doc/intro.man +++ b/doc/intro.man @@ -509,7 +509,6 @@ FUNCTIONS PDC_getclipboard pdcclip PDC_gotoxy pdcdisp PDC_makenew pdcwin - PDC_memmove pdcutil PDC_newline pdcdisp PDC_print pdcprint PDC_putc pdcdisp diff --git a/os2/pdcdisp.c b/os2/pdcdisp.c index d26253d3..f944e908 100644 --- a/os2/pdcdisp.c +++ b/os2/pdcdisp.c @@ -21,15 +21,10 @@ # include #endif #include - #include -#ifdef HAVE_MEMORY_H -# include -#endif - #ifdef PDCDEBUG -char *rcsid_PDCdisp = "$Id: pdcdisp.c,v 1.11 2006/01/28 17:41:25 wmcbrine Exp $"; +char *rcsid_PDCdisp = "$Id: pdcdisp.c,v 1.12 2006/01/28 18:19:51 wmcbrine Exp $"; #endif extern unsigned char atrtab[MAX_ATRTAB]; diff --git a/pdcurses/delch.c b/pdcurses/delch.c index 9a79c814..f484b3d8 100644 --- a/pdcurses/delch.c +++ b/pdcurses/delch.c @@ -23,10 +23,6 @@ #include #include -#ifdef HAVE_MEMORY_H -# include -#endif - /* undefine any macros for functions defined in this module */ #undef delch #undef wdelch @@ -39,13 +35,8 @@ # undef wmove #endif -#ifndef HAVE_MEMMOVE -# define memmove PDC_memmove -#endif - - #ifdef PDCDEBUG -char *rcsid_delch = "$Id: delch.c,v 1.7 2006/01/28 16:53:26 wmcbrine Exp $"; +char *rcsid_delch = "$Id: delch.c,v 1.8 2006/01/28 18:19:51 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -90,18 +81,14 @@ char *rcsid_delch = "$Id: delch.c,v 1.7 2006/01/28 16:53:26 wmcbrine Exp $"; **man-end**********************************************************************/ -/***********************************************************************/ -int PDC_CDECL delch(void) -/***********************************************************************/ +int PDC_CDECL delch(void) { PDC_LOG(("delch() - called\n")); return wdelch(stdscr); } -/***********************************************************************/ -int PDC_CDECL wdelch(WINDOW *win) -/***********************************************************************/ +int PDC_CDECL wdelch(WINDOW *win) { int y, x, maxx; chtype *temp1; diff --git a/pdcurses/initscr.c b/pdcurses/initscr.c index 7fa5dde8..3dffb729 100644 --- a/pdcurses/initscr.c +++ b/pdcurses/initscr.c @@ -23,10 +23,6 @@ #include #include -#ifdef HAVE_MEMORY_H -#include -#endif - /* undefine any macros for functions defined in this module */ #undef initscr #undef endwin @@ -47,7 +43,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_initscr = "$Id: initscr.c,v 1.25 2006/01/28 16:53:26 wmcbrine Exp $"; +char *rcsid_initscr = "$Id: initscr.c,v 1.26 2006/01/28 18:19:51 wmcbrine Exp $"; #else char *_curses_notice = "PDCurses 2.7b - Public Domain 2006"; #endif diff --git a/pdcurses/kernel.c b/pdcurses/kernel.c index ad02b727..4cdc2750 100644 --- a/pdcurses/kernel.c +++ b/pdcurses/kernel.c @@ -24,13 +24,8 @@ # define INCLUDE_WINDOWS_H #endif #include - #include -#ifdef HAVE_MEMORY_H -# include -#endif - #ifdef HAVE_UNISTD_H # include #endif @@ -77,7 +72,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_kernel = "$Id: kernel.c,v 1.26 2006/01/28 16:53:26 wmcbrine Exp $"; +char *rcsid_kernel = "$Id: kernel.c,v 1.27 2006/01/28 18:19:51 wmcbrine Exp $"; #endif RIPPEDOFFLINE linesripped[5]; diff --git a/pdcurses/pad.c b/pdcurses/pad.c index df91f7dc..4d1f0220 100644 --- a/pdcurses/pad.c +++ b/pdcurses/pad.c @@ -21,13 +21,8 @@ # include #endif #include - #include -#ifdef HAVE_MEMORY_H -# include -#endif - /* undefine any macros for functions defined in this module */ #undef newpad #undef subpad @@ -41,7 +36,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_pad = "$Id: pad.c,v 1.9 2006/01/28 16:53:26 wmcbrine Exp $"; +char *rcsid_pad = "$Id: pad.c,v 1.10 2006/01/28 18:19:51 wmcbrine Exp $"; #endif /* save values for pechochar() */ diff --git a/pdcurses/pdcutil.c b/pdcurses/pdcutil.c index 1ed2e01a..a7d6ff97 100644 --- a/pdcurses/pdcutil.c +++ b/pdcurses/pdcutil.c @@ -24,60 +24,16 @@ # define INCLUDE_WINDOWS_H #endif #include - #include #include #include #include #ifdef PDCDEBUG -char *rcsid_PDCutil = "$Id: pdcutil.c,v 1.22 2006/01/28 16:53:26 wmcbrine Exp $"; +char *rcsid_PDCutil = "$Id: pdcutil.c,v 1.23 2006/01/28 18:19:51 wmcbrine Exp $"; #endif -/*man-start********************************************************************* - - PDC_memmove() - Replacement memmove() for lacking compliers. - - PDCurses Description: - This is a private PDCurses routine. - - Move a portion of memory taking consideration of overlapping memory - areas. - - PDCurses Return Value: - This function returns NULL if no temporary memory could be allocated. - - Portability: - PDCurses int PDC_memmove(void *s1, const void *s2, size_t n); - -**man-end**********************************************************************/ - -/***********************************************************************/ -void *PDC_memmove(void *s1, const void *s2, size_t n) -/***********************************************************************/ -{ - char *dd; - const char *ss; - - dd = (char *) s1; - ss = (const char *) s2; - - if (dd > ss && dd < ss + n) - { - dd += n; - ss += n; - while (n--) - *--dd = *--ss; - } else - while (n--) - *dd++ = *ss++; - - return s1; -} - -/***********************************************************************/ void PDC_beep(void) -/***********************************************************************/ { #if defined(XCURSES) XCursesInstruct(CURSES_BELL); @@ -148,9 +104,7 @@ void PDC_beep(void) --buf; *buf = x; --chars; \ } while (0) -/***********************************************************************/ int PDC_vsscanf(char *buf, const char *fmt, va_list arg_ptr) -/***********************************************************************/ { int count, chars, c, width, radix, d, i; int *int_ptr; @@ -603,9 +557,7 @@ int PDC_vsscanf(char *buf, const char *fmt, va_list arg_ptr) **man-end**********************************************************************/ -/***********************************************************************/ bool PDC_breakout(void) -/***********************************************************************/ { extern int c_pindex; /* putter index */ extern int c_gindex; /* getter index */ diff --git a/pdcurses/pdcwin.c b/pdcurses/pdcwin.c index f337136b..1b13d785 100644 --- a/pdcurses/pdcwin.c +++ b/pdcurses/pdcwin.c @@ -21,19 +21,10 @@ # include #endif #include - -#ifdef HAVE_MEMORY_H -# include -#endif - #include -#ifndef HAVE_MEMMOVE -# define memmove PDC_memmove -#endif - #ifdef PDCDEBUG -char *rcsid_PDCwin = "$Id: pdcwin.c,v 1.17 2006/01/28 16:53:26 wmcbrine Exp $"; +char *rcsid_PDCwin = "$Id: pdcwin.c,v 1.18 2006/01/28 18:19:51 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -60,12 +51,10 @@ char *rcsid_PDCwin = "$Id: pdcwin.c,v 1.17 2006/01/28 16:53:26 wmcbrine Exp $"; **man-end**********************************************************************/ -/***********************************************************************/ int PDC_copy_win(const WINDOW *src_w, WINDOW *dst_w, int src_tr, int src_tc, int src_br, int src_bc, int dst_tr, int dst_tc, int dst_br, int dst_bc, bool overlay) -/***********************************************************************/ { int col, line, y1, fc, *minchng, *maxchng; chtype *w1ptr, *w2ptr; @@ -157,9 +146,7 @@ int PDC_copy_win(const WINDOW *src_w, WINDOW *dst_w, **man-end**********************************************************************/ -/***********************************************************************/ WINDOW *PDC_makenew(int num_lines, int num_columns, int begy, int begx) -/***********************************************************************/ { extern void *(*mallc)(size_t); extern void *(*callc)(size_t, size_t); @@ -272,9 +259,7 @@ WINDOW *PDC_makenew(int num_lines, int num_columns, int begy, int begx) **man-end**********************************************************************/ -/***********************************************************************/ void PDC_sync(WINDOW *win) -/***********************************************************************/ { PDC_LOG(("PDC_sync() - called:\n")); @@ -322,9 +307,7 @@ void PDC_sync(WINDOW *win) **man-end**********************************************************************/ -/***********************************************************************/ int PDC_CDECL PDC_chadd(WINDOW *win, chtype ch, bool xlat, bool advance) -/***********************************************************************/ { int x, y, newx, ts, retval; chtype attr = 0, bktmp; @@ -544,9 +527,7 @@ int PDC_CDECL PDC_chadd(WINDOW *win, chtype ch, bool xlat, bool advance) **man-end**********************************************************************/ -/***********************************************************************/ int PDC_chg_attrs(WINDOW *win, chtype attr, int sy, int sx, int ey, int ex) -/***********************************************************************/ { chtype oldattr = win->_attrs; int c, l; @@ -613,9 +594,7 @@ int PDC_chg_attrs(WINDOW *win, chtype attr, int sy, int sx, int ey, int ex) **man-end**********************************************************************/ -/***********************************************************************/ int PDC_chins(WINDOW *win, chtype c, bool xlat) -/***********************************************************************/ { int x, y, maxx, offset; chtype *temp1; @@ -663,9 +642,7 @@ int PDC_chins(WINDOW *win, chtype c, bool xlat) **man-end**********************************************************************/ -/***********************************************************************/ int PDC_clr_scrn(WINDOW *win) -/***********************************************************************/ { #if !defined(XCURSES) # if defined(UNIX_WCLR) @@ -706,9 +683,7 @@ int PDC_clr_scrn(WINDOW *win) **man-end**********************************************************************/ -/***********************************************************************/ int PDC_newline(WINDOW *win, int lin) -/***********************************************************************/ { PDC_LOG(("PDC_newline() - called: line %d\n", lin)); diff --git a/pdcurses/refresh.c b/pdcurses/refresh.c index 12bef5b6..2f7f3ffb 100644 --- a/pdcurses/refresh.c +++ b/pdcurses/refresh.c @@ -24,10 +24,6 @@ #include #include -#ifdef HAVE_MEMORY_H -# include -#endif - /* undefine any macros for functions defined in this module */ #undef refresh #undef wrefresh @@ -47,7 +43,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_refresh = "$Id: refresh.c,v 1.11 2006/01/28 16:53:26 wmcbrine Exp $"; +char *rcsid_refresh = "$Id: refresh.c,v 1.12 2006/01/28 18:19:51 wmcbrine Exp $"; #endif /*man-start********************************************************************* diff --git a/win32/curses.def b/win32/curses.def index 03c935b7..032fc22e 100644 --- a/win32/curses.def +++ b/win32/curses.def @@ -297,7 +297,6 @@ EXPORTS PDC_get_rows EXPORTS PDC_get_scrn_mode EXPORTS PDC_gotoxy EXPORTS PDC_makenew -EXPORTS PDC_memmove EXPORTS PDC_newline EXPORTS PDC_print EXPORTS PDC_putc diff --git a/win32/curses_lcc.def b/win32/curses_lcc.def index c378b589..ebe09077 100644 --- a/win32/curses_lcc.def +++ b/win32/curses_lcc.def @@ -290,7 +290,6 @@ PDC_get_rows PDC_get_scrn_mode PDC_gotoxy PDC_makenew -PDC_memmove PDC_newline PDC_print PDC_putc diff --git a/win32/pdcdisp.c b/win32/pdcdisp.c index 3ea245a4..d7f9704a 100644 --- a/win32/pdcdisp.c +++ b/win32/pdcdisp.c @@ -16,20 +16,17 @@ * See the file maintain.er for details of the current maintainer. **************************************************************************/ -#include #define CURSES_LIBRARY 1 #define INCLUDE_WINDOWS_H #include - -#ifdef HAVE_MEMORY_H -# include -#endif +#include +#include extern HANDLE hConOut; extern unsigned char atrtab[MAX_ATRTAB]; #ifdef PDCDEBUG -char *rcsid_PDCdisp = "$Id: pdcdisp.c,v 1.10 2006/01/28 17:41:25 wmcbrine Exp $"; +char *rcsid_PDCdisp = "$Id: pdcdisp.c,v 1.11 2006/01/28 18:19:51 wmcbrine Exp $"; #endif static CHAR_INFO ci[512]; diff --git a/x11/pdcdisp.c b/x11/pdcdisp.c index f1376166..cb345d93 100644 --- a/x11/pdcdisp.c +++ b/x11/pdcdisp.c @@ -21,15 +21,10 @@ # include #endif #include - #include -#ifdef HAVE_MEMORY_H -# include -#endif - #ifdef PDCDEBUG -char *rcsid_PDCdisp = "$Id: pdcdisp.c,v 1.10 2006/01/28 17:41:25 wmcbrine Exp $"; +char *rcsid_PDCdisp = "$Id: pdcdisp.c,v 1.11 2006/01/28 18:19:51 wmcbrine Exp $"; #endif /*man-start*********************************************************************