X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Ftparam.c;h=eb7fcf25849ce2aed24a05f9fee6a3fe74f7647b;hb=8b6b965da075da197b3d654db3405aa6846bd3d8;hp=c432ed4984356b766ff9487c13d3dbd0e1b170c8;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910;p=chise%2Fxemacs-chise.git.1 diff --git a/src/tparam.c b/src/tparam.c index c432ed4..eb7fcf2 100644 --- a/src/tparam.c +++ b/src/tparam.c @@ -30,8 +30,8 @@ Boston, MA 02111-1307, USA. */ #define realloc xrealloc #define malloc xmalloc #define free xfree -extern void *xmalloc (int size); -extern void *xrealloc (void *, int size); +extern void *xmalloc (size_t size); +extern void *xrealloc (void *, size_t size); #else /* emacs */ @@ -57,16 +57,16 @@ extern char *realloc (); The fourth and following args to tparam serve as the parameter values. */ -static char *tparam1 (CONST char *string, char *outstring, int len, - CONST char *up, CONST char *left, +static char *tparam1 (const char *string, char *outstring, int len, + const char *up, const char *left, int *argp); /* XEmacs: renamed this function because just tparam() conflicts with ncurses */ -char *emacs_tparam (CONST char *string, char *outstring, int len, int arg0, +char *emacs_tparam (const char *string, char *outstring, int len, int arg0, int arg1, int arg2, int arg3); char * -emacs_tparam (CONST char *string, char *outstring, int len, int arg0, +emacs_tparam (const char *string, char *outstring, int len, int arg0, int arg1, int arg2, int arg3) { int arg[4]; @@ -77,14 +77,14 @@ emacs_tparam (CONST char *string, char *outstring, int len, int arg0, return tparam1 (string, outstring, len, 0, 0, arg); } -CONST char *BC; -CONST char *UP; +const char *BC; +const char *UP; static char tgoto_buf[50]; -char *tgoto (CONST char *cm, int hpos, int vpos); +char *tgoto (const char *cm, int hpos, int vpos); char * -tgoto (CONST char *cm, int hpos, int vpos) +tgoto (const char *cm, int hpos, int vpos) { int args[2]; if (!cm) @@ -95,11 +95,11 @@ tgoto (CONST char *cm, int hpos, int vpos) } static char * -tparam1 (CONST char *string, char *outstring, int len, CONST char *up, - CONST char *left, int *argp) +tparam1 (const char *string, char *outstring, int len, const char *up, + const char *left, int *argp) { int c; - CONST char *p = string; + const char *p = string; char *op = outstring; char *outend; int outlen = 0;