--- orig/ast_expr.y 2003-02-12 08:59:13.000000000 -0500 +++ ast_expr.y 2003-08-04 10:28:56.000000000 -0400 @@ -79,18 +79,21 @@ static quad_t to_integer __P((struct val *)); static void to_string __P((struct val *)); static int ast_yyerror __P((const char *)); -static int ast_yylex __P(()); %} %pure-parser /* %name-prefix="ast_yy" */ - %union { struct val *val; } +%{ +static int ast_yylex __P((YYSTYPE *, struct parser_control *)); +%} + + %left '|' %left '&' %left '=' '>' '<' GE LE NE --- orig/astman/astman.c 2003-03-16 01:00:10.000000000 -0500 +++ astman/astman.c 2003-08-04 12:25:36.000000000 -0400 @@ -427,7 +427,7 @@ newtComponent ok; newtComponent cancel; newtComponent inpfield; - char *input; + const char *input; int res = -1; struct newtExitStruct es; @@ -550,8 +550,8 @@ newtComponent label; newtComponent ulabel; newtComponent plabel; - char *user; - char *pass; + const char *user; + const char *pass; struct message *m; struct newtExitStruct es; char tmp[55]; --- orig/codecs/gsm/Makefile 2003-04-27 14:13:11.000000000 -0400 +++ codecs/gsm/Makefile 2003-08-04 15:15:01.000000000 -0400 @@ -54,7 +54,7 @@ # CC = /usr/lang/acc # CCFLAGS = -c -O -CC = gcc -ansi -pedantic $(OPTIMIZE) -march=$(PROC) -fschedule-insns2 -fomit-frame-pointer +CC = gcc -pipe -Wall $(OPTIMIZE) -march=$(PROC) -fschedule-insns2 -fomit-frame-pointer CCFLAGS += -c -DNeedFunctionPrototypes=1 -finline-functions -funroll-loops -fPIC LD = $(CC) --- orig/codecs/ilbc/iCBSearch.c 2003-04-15 00:36:52.000000000 -0400 +++ codecs/ilbc/iCBSearch.c 2003-08-04 12:37:49.000000000 -0400 @@ -116,7 +116,9 @@ *ppe=0.0; pp=buf+LPC_FILTERORDER+lMem-lTarget; for (j=0; j0.0) { @@ -294,7 +296,9 @@ pp=cbvectors+lMem-lTarget; for (j=0; j= corth[ixcor + (i__ + 2 << 2) - 5] && (i__2 = drc[i__ * + >= corth[ixcor + ((i__ + 2) << 2) - 5] && (i__2 = drc[i__ * 3 - 2] - drc[i__ * 3 - 1], (real) abs(i__2)) >= corth[ - ixcor + (i__ + 2 << 2) - 5]) { + ixcor + ((i__ + 2) << 2) - 5]) { irc[i__] = median_(&drc[i__ * 3 - 1], &drc[i__ * 3 - 2], &drc[ i__ * 3 - 3]); } --- orig/codecs/lpc10/ivfilt.c 2003-02-12 08:59:15.000000000 -0500 +++ codecs/lpc10/ivfilt.c 2003-08-04 12:03:30.000000000 -0400 @@ -91,7 +91,7 @@ /* Function Body */ for (i__ = 1; i__ <= 3; ++i__) { r__[i__ - 1] = 0.f; - k = i__ - 1 << 2; + k = (i__ - 1) << 2; i__1 = *len; for (j = (i__ << 2) + *len - *nsamp; j <= i__1; j += 2) { r__[i__ - 1] += lpbuf[j] * lpbuf[j - k]; --- orig/codecs/lpc10/placea.c 2003-02-12 08:59:15.000000000 -0500 +++ codecs/lpc10/placea.c 2003-08-04 12:05:23.000000000 -0400 @@ -152,7 +152,7 @@ allv = allv && voibuf[(*af << 1) + 1] == 1; allv = allv && voibuf[(*af << 1) + 2] == 1; winv = voibuf[(*af << 1) + 1] == 1 || voibuf[(*af << 1) + 2] == 1; - if (allv || winv && *obound == 0) { + if (allv || (winv && *obound == 0)) { /* APHASE: Phase synchronous window placement. */ /* Get minimum lower index of the window. */ i__ = (lrange + *ipitch - 1 - awin[((*af - 1) << 1) + 1]) / *ipitch; --- orig/codecs/mp3/include/mhead.h 2003-02-12 08:59:14.000000000 -0500 +++ codecs/mp3/include/mhead.h 2003-08-04 14:55:31.000000000 -0400 @@ -210,9 +210,8 @@ #include "itype.h" typedef void (*SBT_FUNCTION) (SAMPLEINT * sample, short *pcm, int n); -typedef void (*UNPACK_FUNCTION) (); -typedef struct +typedef struct MPEGI { struct { DEC_INFO decinfo; @@ -241,7 +240,7 @@ signed short group9_table[1024][3]; int nsbt; SBT_FUNCTION sbt; - UNPACK_FUNCTION unpack_routine; + void (*unpack_routine) (struct MPEGI *); unsigned char *bs_ptr; UINT32 bitbuf; int bits; --- orig/codecs/mp3/src/cupini.c 2003-02-12 08:59:14.000000000 -0500 +++ codecs/mp3/src/cupini.c 2003-08-04 14:25:16.000000000 -0400 @@ -189,7 +189,7 @@ int audio_decode_initL1(MPEG_HEAD * h, int framebytes_arg, int reduction_code, int transform_code, int convert_code, int freq_limit); -void sbt_init(); +void sbt_init(MPEG *m); IN_OUT L1audio_decode(void *mv, unsigned char *bs, signed short *pcm); @@ -404,7 +404,7 @@ /* init sub-band transform */ - sbt_init(); + sbt_init(m); return 1; } --- orig/codecs/mp3/src/cupL1.c 2003-02-12 08:59:14.000000000 -0500 +++ codecs/mp3/src/cupL1.c 2003-08-04 14:32:08.000000000 -0400 @@ -312,7 +312,7 @@ /* init sub-band transform */ - sbt_init(); + sbt_init(m); return 1; } --- orig/codecs/mp3/src/iupini.c 2003-02-12 08:59:14.000000000 -0500 +++ codecs/mp3/src/iupini.c 2003-08-04 14:02:01.000000000 -0400 @@ -268,7 +268,7 @@ int i_audio_decode_initL1(MPEGI *m, MPEG_HEAD * h, int framebytes_arg, int reduction_code, int transform_code, int convert_code, int freq_limit); -void i_sbt_init(); +void i_sbt_init(void); /*---------------------------------------------------------*/ /* mpeg_head defined in mhead.h frame bytes is without pad */ --- orig/codecs/mp3/src/cupl3.c 2003-02-12 08:59:14.000000000 -0500 +++ codecs/mp3/src/cupl3.c 2003-08-04 13:42:26.000000000 -0400 @@ -104,7 +104,7 @@ bitdat.bs_ptr_end = buf_end; } /*------------- get n bits from bitstream -------------*/ -int bitget_bits_used() +int bitget_bits_used(void) { int n; /* compute bits used from last init call */ @@ -142,7 +142,7 @@ return x; } /*------------- get 1 bit from bitstream -------------*/ -unsigned int bitget_1bit() +unsigned int bitget_1bit(void) { unsigned int x; @@ -994,8 +994,6 @@ #if 0 typedef int iARRAY22[22]; #endif -iARRAY22 *quant_init_band_addr(); -iARRAY22 *msis_init_band_addr(); /*---------------------------------------------------------*/ /* mpeg_head defined in mhead.h frame bytes is without pad */ --- orig/codecs/mp3/src/icdct.c 2003-02-12 08:59:14.000000000 -0500 +++ codecs/mp3/src/icdct.c 2003-08-04 14:03:30.000000000 -0400 @@ -49,7 +49,7 @@ #define forward_bf idx_forward_bf /*--- #define forward_bf ptr_forward_bf ---*/ /*------------------------------------------------------------*/ -DCTCOEF *i_dct_coef_addr() +DCTCOEF *i_dct_coef_addr(void) { return coef32; } --- orig/codecs/mp3/src/isbt.c 2003-02-12 08:59:14.000000000 -0500 +++ codecs/mp3/src/isbt.c 2003-08-04 13:58:08.000000000 -0400 @@ -100,10 +100,10 @@ extern WININT vbuf[512]; extern WININT vbuf2[512]; -DCTCOEF *i_dct_coef_addr(); +DCTCOEF *i_dct_coef_addr(void); /*======================================================================*/ -static void gencoef() /* gen coef for N=32 */ +static void gencoef(void) /* gen coef for N=32 */ { int p, n, i, k; double t, pi; @@ -125,8 +125,8 @@ } } /*------------------------------------------------------------*/ -WINCOEF *i_wincoef_addr(); -static void genwincoef_q() /* gen int window coefs from floating table */ +WINCOEF *i_wincoef_addr(void); +static void genwincoef_q(void) /* gen int window coefs from floating table */ { int i, j, k, m; float x; @@ -166,12 +166,11 @@ } } /*------------------------------------------------------------*/ -static void genwincoef() /* gen int window coefs from floating table */ +static void genwincoef(void) /* gen int window coefs from floating table */ { int i; float x; WINCOEF *iwincoef; - WINCOEF *i_wincoef_addr(); iwincoef = i_wincoef_addr(); @@ -186,7 +185,7 @@ } } /*------------------------------------------------------------*/ -void i_sbt_init() +void i_sbt_init(void) { int i; static int first_pass = 1; --- orig/codecs/mp3/src/iup.c 2003-02-12 08:59:14.000000000 -0500 +++ codecs/mp3/src/iup.c 2003-08-04 14:57:19.000000000 -0400 @@ -138,7 +138,7 @@ void i_sbt_mono(SAMPLEINT * sample, short *pcm, int n); void i_sbt_dual(SAMPLEINT * sample, short *pcm, int n); -static void unpack(); +static void unpack(MPEGI *m); /*------------- initialize bit getter -------------*/ static void load_init(MPEGI *m, unsigned char *buf) @@ -514,7 +514,7 @@ if (sync != 0xFFF) return in_out; /* sync fail */ /*-----------*/ - m->iup.unpack_routine(); + m->iup.unpack_routine(m); m->iup.sbt(m->iup.sample, pcm, m->iup.nsbt); --- orig/codecs/mp3/src/l3init.c 2003-02-12 08:59:14.000000000 -0500 +++ codecs/mp3/src/l3init.c 2003-08-04 13:50:19.000000000 -0400 @@ -140,7 +140,7 @@ } /*====================================================================*/ typedef float ARRAY36[36]; -ARRAY36 *hwin_init_addr(); +ARRAY36 *hwin_init_addr(MPEG *m); /*--------------------------------------------------------------------*/ void hwin_init(MPEG *m) @@ -200,8 +200,8 @@ } /*=============================================================*/ typedef float ARRAY4[4]; -IMDCT_INIT_BLOCK *imdct_init_addr_18(); -IMDCT_INIT_BLOCK *imdct_init_addr_6(); +IMDCT_INIT_BLOCK *imdct_init_addr_18(void); +IMDCT_INIT_BLOCK *imdct_init_addr_6(void); /*-------------------------------------------------------------*/ void imdct_init(MPEG *m) --- orig/codecs/mp3/src/iwinm.c 2003-02-12 08:59:14.000000000 -0500 +++ codecs/mp3/src/iwinm.c 2003-08-04 13:59:03.000000000 -0400 @@ -49,7 +49,7 @@ static WINCOEF iwincoef[264]; /*==================================================================*/ -WINCOEF *i_wincoef_addr() +WINCOEF *i_wincoef_addr(void) { return iwincoef; } --- orig/codecs/mp3/src/mdct.c 2003-02-12 08:59:14.000000000 -0500 +++ codecs/mp3/src/mdct.c 2003-08-04 13:51:58.000000000 -0400 @@ -71,11 +71,11 @@ {mdct6_3v, mdct6_3v2, &coef87}; /*====================================================================*/ -IMDCT_INIT_BLOCK *imdct_init_addr_18() +IMDCT_INIT_BLOCK *imdct_init_addr_18(void) { return &imdct_info_18; } -IMDCT_INIT_BLOCK *imdct_init_addr_6() +IMDCT_INIT_BLOCK *imdct_init_addr_6(void) { return &imdct_info_6; } --- orig/db1-ast/hash/hash_func.c 2003-02-12 08:59:15.000000000 -0500 +++ db1-ast/hash/hash_func.c 2003-08-04 16:02:17.000000000 -0400 @@ -45,13 +45,16 @@ #include "page.h" #include "extern.h" -static u_int32_t hash1 __P((const void *, size_t)); -static u_int32_t hash2 __P((const void *, size_t)); -static u_int32_t hash3 __P((const void *, size_t)); -static u_int32_t hash4 __P((const void *, size_t)); +/* only one of these can be defined */ +//#define HASH1_EJB 1 +//#define HASH2_PHONG 1 +//#define HASH3_SDBM 1 +#define HASH4_TOREK 1 + +static u_int32_t hashfunc __P((const void *, size_t)); /* Global default hash function */ -u_int32_t (*__default_hash) __P((const void *, size_t)) = hash4; +u_int32_t (*__default_hash) __P((const void *, size_t)) = hashfunc; /* * HASH FUNCTIONS @@ -62,11 +65,13 @@ * This came from ejb's hsearch. */ +#ifdef HASH1_EJB + #define PRIME1 37 #define PRIME2 1048583 static u_int32_t -hash1(keyarg, len) +hashfunc(keyarg, len) const void *keyarg; register size_t len; { @@ -80,13 +85,16 @@ return (h); } +#endif + +#ifdef HASH2_PHONG /* * Phong's linear congruential hash */ #define dcharhash(h, c) ((h) = 0x63c63cd9*(h) + 0x9c39c33d + (c)) static u_int32_t -hash2(keyarg, len) +hashfunc(keyarg, len) const void *keyarg; size_t len; { @@ -104,7 +112,9 @@ } return (h); } +#endif +#ifdef HASH3_SDBM /* * This is INCREDIBLY ugly, but fast. We break the string up into 8 byte * units. On the first time through the loop we get the "leftover bytes" @@ -115,7 +125,7 @@ * OZ's original sdbm hash */ static u_int32_t -hash3(keyarg, len) +hashfunc(keyarg, len) const void *keyarg; register size_t len; { @@ -160,10 +170,12 @@ } return (h); } +#endif +#ifdef HASH4_TOREK /* Hash function from Chris Torek. */ static u_int32_t -hash4(keyarg, len) +hashfunc(keyarg, len) const void *keyarg; register size_t len; { @@ -210,3 +222,4 @@ } return (h); } +#endif --- orig/editline/histedit.h 2003-02-12 08:59:15.000000000 -0500 +++ editline/histedit.h 2003-08-04 10:18:45.000000000 -0400 @@ -59,9 +59,9 @@ * For user-defined function interface */ typedef struct lineinfo { - const char *buffer; - const char *cursor; - const char *lastchar; + char *buffer; + char *cursor; + char *lastchar; } LineInfo;