kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 03:50:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanups (bug #66)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1531 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2003-09-19 01:20:23 +00:00
parent 320a52e5f5
commit b0500e1945
22 changed files with 139 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ast_expr.y
View File

@@ -79,18 +79,21 @@ static struct val *op_times __P((struct val *, struct val *));
static quad_t to_integer __P((struct val *)); static quad_t to_integer __P((struct val *));
static void to_string __P((struct val *)); static void to_string __P((struct val *));
static int ast_yyerror __P((const char *)); static int ast_yyerror __P((const char *));
static int ast_yylex __P(());
%} %}
%pure-parser %pure-parser
/* %name-prefix="ast_yy" */ /* %name-prefix="ast_yy" */
%union %union
{ {
struct val *val; struct val *val;
} }
%{
static int ast_yylex __P((YYSTYPE *, struct parser_control *));
%}
%left <val> '|' %left <val> '|'
%left <val> '&' %left <val> '&'
%left <val> '=' '>' '<' GE LE NE %left <val> '=' '>' '<' GE LE NE

6
astman/astman.c
View File

@@ -427,7 +427,7 @@ static int get_user_input(char *msg, char *buf, int buflen)
newtComponent ok; newtComponent ok;
newtComponent cancel; newtComponent cancel;
newtComponent inpfield; newtComponent inpfield;
char *input; const char *input;
int res = -1; int res = -1;
struct newtExitStruct es; struct newtExitStruct es;
@@ -550,8 +550,8 @@ static int login(char *hostname)
newtComponent label; newtComponent label;
newtComponent ulabel; newtComponent ulabel;
newtComponent plabel; newtComponent plabel;
char *user; const char *user;
char *pass; const char *pass;
struct message *m; struct message *m;
struct newtExitStruct es; struct newtExitStruct es;
char tmp[55]; char tmp[55];

2
codecs/gsm/Makefile
View File

@@ -54,7 +54,7 @@ PG =
# CC = /usr/lang/acc # CC = /usr/lang/acc
# CCFLAGS = -c -O # 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 CCFLAGS += -c -DNeedFunctionPrototypes=1 -finline-functions -funroll-loops -fPIC
LD = $(CC) LD = $(CC)

8
codecs/ilbc/iCBSearch.c
View File

@@ -117,7 +117,9 @@ void iCBSearch(
*ppe=0.0; *ppe=0.0;
pp=buf+LPC_FILTERORDER+lMem-lTarget; pp=buf+LPC_FILTERORDER+lMem-lTarget;
for (j=0; j<lTarget; j++) { for (j=0; j<lTarget; j++) {
*ppe+=(*pp)*(*pp++); // XXXXXX is this the coder's intent?
//*ppe+=(*pp)*(*pp++);
*ppe+=(pp[0])*(pp[1]);
} }
if(*ppe>0.0) { if(*ppe>0.0) {
@@ -295,7 +297,9 @@ void iCBSearch(
pp=cbvectors+lMem-lTarget; pp=cbvectors+lMem-lTarget;
for (j=0; j<lTarget; j++) { for (j=0; j<lTarget; j++) {
*ppe+=(*pp)*(*pp++); // XXXXXX is this the coder's intent?
//*ppe+=(*pp)*(*pp++);
*ppe+=(pp[0])*(pp[1]);
} }
ppi = cbvectors + lMem - 1 - lTarget; ppi = cbvectors + lMem - 1 - lTarget;

44
codecs/lpc10/analys.c
View File

@@ -1,8 +1,11 @@
/* /*
$Log$ $Log$
Revision 1.14 2003/02/12 13:59:14 matteo Revision 1.15 2003/09/19 01:20:22 markster
mer feb 12 14:56:57 CET 2003 Code cleanups (bug #66)
Revision 1.2 2003/09/19 01:20:22 markster
Code cleanups (bug #66)
Revision 1.1.1.1 2003/02/12 13:59:14 matteo Revision 1.1.1.1 2003/02/12 13:59:14 matteo
mer feb 12 14:56:57 CET 2003 mer feb 12 14:56:57 CET 2003
@@ -82,9 +85,12 @@ static integer c__1 = 1;
/* ANALYS Version 55 */ /* ANALYS Version 55 */
/* $Log$ /* $Log$
* Revision 1.14 2003/02/12 13:59:14 matteo * Revision 1.15 2003/09/19 01:20:22 markster
* mer feb 12 14:56:57 CET 2003 * Code cleanups (bug #66)
* *
/* Revision 1.2 2003/09/19 01:20:22 markster
/* Code cleanups (bug #66)
/*
/* Revision 1.1.1.1 2003/02/12 13:59:14 matteo /* Revision 1.1.1.1 2003/02/12 13:59:14 matteo
/* mer feb 12 14:56:57 CET 2003 /* mer feb 12 14:56:57 CET 2003
/* /*
@@ -228,9 +234,11 @@ static integer c__1 = 1;
extern /* Subroutine */ int onset_(real *, integer *, integer *, integer * extern /* Subroutine */ int onset_(real *, integer *, integer *, integer *
, integer *, integer *, integer *, struct lpc10_encoder_state *); , integer *, integer *, integer *, struct lpc10_encoder_state *);
integer *osptr; integer *osptr;
extern /* Subroutine */ placea_(integer *, integer * extern /* Subroutine */ void placea_(integer *, integer *
, integer *, integer *, integer *, integer *, integer *, integer * , integer *, integer *, integer *, integer *, integer *, integer *
, integer *), dcbias_(integer *, real *, real *), placev_(integer , integer *);
extern void dcbias_(integer *, real *, real *);
extern void placev_(integer
*, integer *, integer *, integer *, integer *, integer *, integer *, integer *, integer *, integer *, integer *, integer *, integer
*, integer *, integer *, integer *, integer *); *, integer *, integer *, integer *, integer *);
integer ipitch; integer ipitch;
@@ -252,9 +260,12 @@ static integer c__1 = 1;
real phi[100] /* was [10][10] */, psi[10]; real phi[100] /* was [10][10] */, psi[10];
/* $Log$ /* $Log$
* Revision 1.14 2003/02/12 13:59:14 matteo * Revision 1.15 2003/09/19 01:20:22 markster
* mer feb 12 14:56:57 CET 2003 * Code cleanups (bug #66)
* *
/* Revision 1.2 2003/09/19 01:20:22 markster
/* Code cleanups (bug #66)
/*
/* Revision 1.1.1.1 2003/02/12 13:59:14 matteo /* Revision 1.1.1.1 2003/02/12 13:59:14 matteo
/* mer feb 12 14:56:57 CET 2003 /* mer feb 12 14:56:57 CET 2003
/* /*
@@ -286,9 +297,12 @@ static integer c__1 = 1;
/* Frame size, Prediction order, Pitch period */ /* Frame size, Prediction order, Pitch period */
/* Arguments to ANALYS */ /* Arguments to ANALYS */
/* $Log$ /* $Log$
* Revision 1.14 2003/02/12 13:59:14 matteo * Revision 1.15 2003/09/19 01:20:22 markster
* mer feb 12 14:56:57 CET 2003 * Code cleanups (bug #66)
* *
/* Revision 1.2 2003/09/19 01:20:22 markster
/* Code cleanups (bug #66)
/*
/* Revision 1.1.1.1 2003/02/12 13:59:14 matteo /* Revision 1.1.1.1 2003/02/12 13:59:14 matteo
/* mer feb 12 14:56:57 CET 2003 /* mer feb 12 14:56:57 CET 2003
/* /*
@@ -488,10 +502,10 @@ static integer c__1 = 1;
voibuf[0] = voibuf[2]; voibuf[0] = voibuf[2];
voibuf[1] = voibuf[3]; voibuf[1] = voibuf[3];
for (i__ = 1; i__ <= 2; ++i__) { for (i__ = 1; i__ <= 2; ++i__) {
vwin[(i__ << 1) - 2] = vwin[(i__ + 1 << 1) - 2] - contrl_1.lframe; vwin[(i__ << 1) - 2] = vwin[((i__ + 1) << 1) - 2] - contrl_1.lframe;
vwin[(i__ << 1) - 1] = vwin[(i__ + 1 << 1) - 1] - contrl_1.lframe; vwin[(i__ << 1) - 1] = vwin[((i__ + 1) << 1) - 1] - contrl_1.lframe;
awin[(i__ << 1) - 2] = awin[(i__ + 1 << 1) - 2] - contrl_1.lframe; awin[(i__ << 1) - 2] = awin[((i__ + 1) << 1) - 2] - contrl_1.lframe;
awin[(i__ << 1) - 1] = awin[(i__ + 1 << 1) - 1] - contrl_1.lframe; awin[(i__ << 1) - 1] = awin[((i__ + 1) << 1) - 1] - contrl_1.lframe;
/* EWIN(*,J) is unused for J .NE. AF, so the following shift is /* EWIN(*,J) is unused for J .NE. AF, so the following shift is
*/ */
/* unnecessary. It also causes error messages when the C versio /* unnecessary. It also causes error messages when the C versio
@@ -504,7 +518,7 @@ n */
/* EWIN(2,I) = EWIN(2,I+1) - LFRAME */ /* EWIN(2,I) = EWIN(2,I+1) - LFRAME */
obound[i__ - 1] = obound[i__]; obound[i__ - 1] = obound[i__];
voibuf[i__ * 2] = voibuf[(i__ + 1) * 2]; voibuf[i__ * 2] = voibuf[(i__ + 1) * 2];
voibuf[(i__ << 1) + 1] = voibuf[(i__ + 1 << 1) + 1]; voibuf[(i__ << 1) + 1] = voibuf[((i__ + 1) << 1) + 1];
rmsbuf[i__ - 1] = rmsbuf[i__]; rmsbuf[i__ - 1] = rmsbuf[i__];
i__1 = contrl_1.order; i__1 = contrl_1.order;
for (j = 1; j <= i__1; ++j) { for (j = 1; j <= i__1; ++j) {

32
codecs/lpc10/decode.c
View File

@@ -1,8 +1,11 @@
/* /*
$Log$ $Log$
Revision 1.14 2003/02/12 13:59:14 matteo Revision 1.15 2003/09/19 01:20:22 markster
mer feb 12 14:56:57 CET 2003 Code cleanups (bug #66)
Revision 1.2 2003/09/19 01:20:22 markster
Code cleanups (bug #66)
Revision 1.1.1.1 2003/02/12 13:59:14 matteo Revision 1.1.1.1 2003/02/12 13:59:14 matteo
mer feb 12 14:56:57 CET 2003 mer feb 12 14:56:57 CET 2003
@@ -56,9 +59,12 @@ static integer c__2 = 2;
/* DECODE Version 54 */ /* DECODE Version 54 */
/* $Log$ /* $Log$
* Revision 1.14 2003/02/12 13:59:14 matteo * Revision 1.15 2003/09/19 01:20:22 markster
* mer feb 12 14:56:57 CET 2003 * Code cleanups (bug #66)
* *
/* Revision 1.2 2003/09/19 01:20:22 markster
/* Code cleanups (bug #66)
/*
/* Revision 1.1.1.1 2003/02/12 13:59:14 matteo /* Revision 1.1.1.1 2003/02/12 13:59:14 matteo
/* mer feb 12 14:56:57 CET 2003 /* mer feb 12 14:56:57 CET 2003
/* /*
@@ -194,9 +200,12 @@ static integer c__2 = 2;
integer ishift, errcnt, lsb; integer ishift, errcnt, lsb;
/* $Log$ /* $Log$
* Revision 1.14 2003/02/12 13:59:14 matteo * Revision 1.15 2003/09/19 01:20:22 markster
* mer feb 12 14:56:57 CET 2003 * Code cleanups (bug #66)
* *
/* Revision 1.2 2003/09/19 01:20:22 markster
/* Code cleanups (bug #66)
/*
/* Revision 1.1.1.1 2003/02/12 13:59:14 matteo /* Revision 1.1.1.1 2003/02/12 13:59:14 matteo
/* mer feb 12 14:56:57 CET 2003 /* mer feb 12 14:56:57 CET 2003
/* /*
@@ -228,9 +237,12 @@ static integer c__2 = 2;
/* Frame size, Prediction order, Pitch period */ /* Frame size, Prediction order, Pitch period */
/* Arguments */ /* Arguments */
/* $Log$ /* $Log$
* Revision 1.14 2003/02/12 13:59:14 matteo * Revision 1.15 2003/09/19 01:20:22 markster
* mer feb 12 14:56:57 CET 2003 * Code cleanups (bug #66)
* *
/* Revision 1.2 2003/09/19 01:20:22 markster
/* Code cleanups (bug #66)
/*
/* Revision 1.1.1.1 2003/02/12 13:59:14 matteo /* Revision 1.1.1.1 2003/02/12 13:59:14 matteo
/* mer feb 12 14:56:57 CET 2003 /* mer feb 12 14:56:57 CET 2003
/* /*
@@ -518,9 +530,9 @@ static integer c__2 = 2;
} }
for (i__ = 1; i__ <= 6; ++i__) { for (i__ = 1; i__ <= 6; ++i__) {
if ((i__1 = drc[i__ * 3 - 2] - drc[i__ * 3 - 3], (real) abs(i__1)) if ((i__1 = drc[i__ * 3 - 2] - drc[i__ * 3 - 3], (real) abs(i__1))
>= 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[ 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[ irc[i__] = median_(&drc[i__ * 3 - 1], &drc[i__ * 3 - 2], &drc[
i__ * 3 - 3]); i__ * 3 - 3]);
} }

16
codecs/lpc10/ivfilt.c
View File

@@ -1,8 +1,11 @@
/* /*
$Log$ $Log$
Revision 1.14 2003/02/12 13:59:15 matteo Revision 1.15 2003/09/19 01:20:22 markster
mer feb 12 14:56:57 CET 2003 Code cleanups (bug #66)
Revision 1.2 2003/09/19 01:20:22 markster
Code cleanups (bug #66)
Revision 1.1.1.1 2003/02/12 13:59:15 matteo Revision 1.1.1.1 2003/02/12 13:59:15 matteo
mer feb 12 14:56:57 CET 2003 mer feb 12 14:56:57 CET 2003
@@ -32,9 +35,12 @@ extern int ivfilt_(real *lpbuf, real *ivbuf, integer *len, integer *nsamp, real
/* IVFILT Version 48 */ /* IVFILT Version 48 */
/* $Log$ /* $Log$
* Revision 1.14 2003/02/12 13:59:15 matteo * Revision 1.15 2003/09/19 01:20:22 markster
* mer feb 12 14:56:57 CET 2003 * Code cleanups (bug #66)
* *
/* Revision 1.2 2003/09/19 01:20:22 markster
/* Code cleanups (bug #66)
/*
/* Revision 1.1.1.1 2003/02/12 13:59:15 matteo /* Revision 1.1.1.1 2003/02/12 13:59:15 matteo
/* mer feb 12 14:56:57 CET 2003 /* mer feb 12 14:56:57 CET 2003
/* /*
@@ -97,7 +103,7 @@ extern int ivfilt_(real *lpbuf, real *ivbuf, integer *len, integer *nsamp, real
/* Function Body */ /* Function Body */
for (i__ = 1; i__ <= 3; ++i__) { for (i__ = 1; i__ <= 3; ++i__) {
r__[i__ - 1] = 0.f; r__[i__ - 1] = 0.f;
k = i__ - 1 << 2; k = (i__ - 1) << 2;
i__1 = *len; i__1 = *len;
for (j = (i__ << 2) + *len - *nsamp; j <= i__1; j += 2) { for (j = (i__ << 2) + *len - *nsamp; j <= i__1; j += 2) {
r__[i__ - 1] += lpbuf[j] * lpbuf[j - k]; r__[i__ - 1] += lpbuf[j] * lpbuf[j - k];

16
codecs/lpc10/placea.c
View File

@@ -1,8 +1,11 @@
/* /*
$Log$ $Log$
Revision 1.14 2003/02/12 13:59:15 matteo Revision 1.15 2003/09/19 01:20:22 markster
mer feb 12 14:56:57 CET 2003 Code cleanups (bug #66)
Revision 1.2 2003/09/19 01:20:22 markster
Code cleanups (bug #66)
Revision 1.1.1.1 2003/02/12 13:59:15 matteo Revision 1.1.1.1 2003/02/12 13:59:15 matteo
mer feb 12 14:56:57 CET 2003 mer feb 12 14:56:57 CET 2003
@@ -35,9 +38,12 @@ extern int placea_(integer *ipitch, integer *voibuf, integer *obound, integer *a
/* PLACEA Version 48 */ /* PLACEA Version 48 */
/* $Log$ /* $Log$
* Revision 1.14 2003/02/12 13:59:15 matteo * Revision 1.15 2003/09/19 01:20:22 markster
* mer feb 12 14:56:57 CET 2003 * Code cleanups (bug #66)
* *
/* Revision 1.2 2003/09/19 01:20:22 markster
/* Code cleanups (bug #66)
/*
/* Revision 1.1.1.1 2003/02/12 13:59:15 matteo /* Revision 1.1.1.1 2003/02/12 13:59:15 matteo
/* mer feb 12 14:56:57 CET 2003 /* mer feb 12 14:56:57 CET 2003
/* /*
@@ -158,7 +164,7 @@ extern int placea_(integer *ipitch, integer *voibuf, integer *obound, integer *a
allv = allv && voibuf[(*af << 1) + 1] == 1; allv = allv && voibuf[(*af << 1) + 1] == 1;
allv = allv && voibuf[(*af << 1) + 2] == 1; allv = allv && voibuf[(*af << 1) + 2] == 1;
winv = voibuf[(*af << 1) + 1] == 1 || 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. */ /* APHASE: Phase synchronous window placement. */
/* Get minimum lower index of the window. */ /* Get minimum lower index of the window. */
i__ = (lrange + *ipitch - 1 - awin[((*af - 1) << 1) + 1]) / *ipitch; i__ = (lrange + *ipitch - 1 - awin[((*af - 1) << 1) + 1]) / *ipitch;

5
codecs/mp3/include/mhead.h
View File

@@ -210,9 +210,8 @@ MPEG8;
#include "itype.h" #include "itype.h"
typedef void (*SBT_FUNCTION) (SAMPLEINT * sample, short *pcm, int n); typedef void (*SBT_FUNCTION) (SAMPLEINT * sample, short *pcm, int n);
typedef void (*UNPACK_FUNCTION) ();
typedef struct typedef struct MPEGI
{ {
struct { struct {
DEC_INFO decinfo; DEC_INFO decinfo;
@@ -241,7 +240,7 @@ typedef struct
signed short group9_table[1024][3]; signed short group9_table[1024][3];
int nsbt; int nsbt;
SBT_FUNCTION sbt; SBT_FUNCTION sbt;
UNPACK_FUNCTION unpack_routine; void (*unpack_routine) (struct MPEGI *);
unsigned char *bs_ptr; unsigned char *bs_ptr;
UINT32 bitbuf; UINT32 bitbuf;
int bits; int bits;

2
codecs/mp3/src/cupL1.c
View File

@@ -312,7 +312,7 @@ int L1audio_decode_init(MPEG *m, MPEG_HEAD * h, int framebytes_arg,
/* init sub-band transform */ /* init sub-band transform */
sbt_init(); sbt_init(m);
return 1; return 1;
} }

4
codecs/mp3/src/cupini.c
View File

@@ -189,7 +189,7 @@ static int out_chans[5] =
int audio_decode_initL1(MPEG_HEAD * h, int framebytes_arg, int audio_decode_initL1(MPEG_HEAD * h, int framebytes_arg,
int reduction_code, int transform_code, int convert_code, int reduction_code, int transform_code, int convert_code,
int freq_limit); int freq_limit);
void sbt_init(); void sbt_init(MPEG *m);
IN_OUT L1audio_decode(void *mv, unsigned char *bs, signed short *pcm); IN_OUT L1audio_decode(void *mv, unsigned char *bs, signed short *pcm);
@@ -404,7 +404,7 @@ int audio_decode_init(MPEG *m, MPEG_HEAD * h, int framebytes_arg,
/* init sub-band transform */ /* init sub-band transform */
sbt_init(); sbt_init(m);
return 1; return 1;
} }

6
codecs/mp3/src/cupl3.c
View File

@@ -104,7 +104,7 @@ static void bitget_init_end(unsigned char *buf_end)
bitdat.bs_ptr_end = buf_end; bitdat.bs_ptr_end = buf_end;
} }
/*------------- get n bits from bitstream -------------*/ /*------------- get n bits from bitstream -------------*/
int bitget_bits_used() int bitget_bits_used(void)
{ {
int n; /* compute bits used from last init call */ int n; /* compute bits used from last init call */
@@ -142,7 +142,7 @@ unsigned int bitget(int n)
return x; return x;
} }
/*------------- get 1 bit from bitstream -------------*/ /*------------- get 1 bit from bitstream -------------*/
unsigned int bitget_1bit() unsigned int bitget_1bit(void)
{ {
unsigned int x; unsigned int x;
@@ -994,8 +994,6 @@ void sbt_init(MPEG *m);
#if 0 #if 0
typedef int iARRAY22[22]; typedef int iARRAY22[22];
#endif #endif
iARRAY22 *quant_init_band_addr();
iARRAY22 *msis_init_band_addr();
/*---------------------------------------------------------*/ /*---------------------------------------------------------*/
/* mpeg_head defined in mhead.h frame bytes is without pad */ /* mpeg_head defined in mhead.h frame bytes is without pad */

2
codecs/mp3/src/icdct.c
View File

@@ -49,7 +49,7 @@ static DCTCOEF coef32[32]; /* 32 pt dct coefs */
#define forward_bf idx_forward_bf #define forward_bf idx_forward_bf
/*--- #define forward_bf ptr_forward_bf ---*/ /*--- #define forward_bf ptr_forward_bf ---*/
/*------------------------------------------------------------*/ /*------------------------------------------------------------*/
DCTCOEF *i_dct_coef_addr() DCTCOEF *i_dct_coef_addr(void)
{ {
return coef32; return coef32;
} }

13
codecs/mp3/src/isbt.c
View File

@@ -100,10 +100,10 @@ static signed int vb_ptr;
extern WININT vbuf[512]; extern WININT vbuf[512];
extern WININT vbuf2[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; int p, n, i, k;
double t, pi; double t, pi;
@@ -125,8 +125,8 @@ static void gencoef() /* gen coef for N=32 */
} }
} }
/*------------------------------------------------------------*/ /*------------------------------------------------------------*/
WINCOEF *i_wincoef_addr(); WINCOEF *i_wincoef_addr(void);
static void genwincoef_q() /* gen int window coefs from floating table */ static void genwincoef_q(void) /* gen int window coefs from floating table */
{ {
int i, j, k, m; int i, j, k, m;
float x; float x;
@@ -166,12 +166,11 @@ static void genwincoef_q() /* gen int window coefs from floating table */
} }
} }
/*------------------------------------------------------------*/ /*------------------------------------------------------------*/
static void genwincoef() /* gen int window coefs from floating table */ static void genwincoef(void) /* gen int window coefs from floating table */
{ {
int i; int i;
float x; float x;
WINCOEF *iwincoef; WINCOEF *iwincoef;
WINCOEF *i_wincoef_addr();
iwincoef = i_wincoef_addr(); iwincoef = i_wincoef_addr();
@@ -186,7 +185,7 @@ static void genwincoef() /* gen int window coefs from floating table */
} }
} }
/*------------------------------------------------------------*/ /*------------------------------------------------------------*/
void i_sbt_init() void i_sbt_init(void)
{ {
int i; int i;
static int first_pass = 1; static int first_pass = 1;

4
codecs/mp3/src/iup.c
View File

@@ -138,7 +138,7 @@ static int bat_bit_master[] =
void i_sbt_mono(SAMPLEINT * sample, short *pcm, int n); void i_sbt_mono(SAMPLEINT * sample, short *pcm, int n);
void i_sbt_dual(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 -------------*/ /*------------- initialize bit getter -------------*/
static void load_init(MPEGI *m, unsigned char *buf) static void load_init(MPEGI *m, unsigned char *buf)
@@ -514,7 +514,7 @@ IN_OUT i_audio_decode(MPEGI *m, unsigned char *bs, signed short *pcm)
if (sync != 0xFFF) if (sync != 0xFFF)
return in_out; /* sync fail */ return in_out; /* sync fail */
/*-----------*/ /*-----------*/
m->iup.unpack_routine(); m->iup.unpack_routine(m);
m->iup.sbt(m->iup.sample, pcm, m->iup.nsbt); m->iup.sbt(m->iup.sample, pcm, m->iup.nsbt);

2
codecs/mp3/src/iupini.c
View File

@@ -268,7 +268,7 @@ static void table_init(MPEGI *m)
int i_audio_decode_initL1(MPEGI *m, MPEG_HEAD * h, int framebytes_arg, int i_audio_decode_initL1(MPEGI *m, MPEG_HEAD * h, int framebytes_arg,
int reduction_code, int transform_code, int convert_code, int reduction_code, int transform_code, int convert_code,
int freq_limit); int freq_limit);
void i_sbt_init(); void i_sbt_init(void);
/*---------------------------------------------------------*/ /*---------------------------------------------------------*/
/* mpeg_head defined in mhead.h frame bytes is without pad */ /* mpeg_head defined in mhead.h frame bytes is without pad */

2
codecs/mp3/src/iwinm.c
View File

@@ -49,7 +49,7 @@ WININT vbuf2[512];
static WINCOEF iwincoef[264]; static WINCOEF iwincoef[264];
/*==================================================================*/ /*==================================================================*/
WINCOEF *i_wincoef_addr() WINCOEF *i_wincoef_addr(void)
{ {
return iwincoef; return iwincoef;
} }

6
codecs/mp3/src/l3init.c
View File

@@ -140,7 +140,7 @@ int L3table_init(MPEG *m)
} }
/*====================================================================*/ /*====================================================================*/
typedef float ARRAY36[36]; typedef float ARRAY36[36];
ARRAY36 *hwin_init_addr(); ARRAY36 *hwin_init_addr(MPEG *m);
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------*/
void hwin_init(MPEG *m) void hwin_init(MPEG *m)
@@ -200,8 +200,8 @@ void hwin_init(MPEG *m)
} }
/*=============================================================*/ /*=============================================================*/
typedef float ARRAY4[4]; typedef float ARRAY4[4];
IMDCT_INIT_BLOCK *imdct_init_addr_18(); IMDCT_INIT_BLOCK *imdct_init_addr_18(void);
IMDCT_INIT_BLOCK *imdct_init_addr_6(); IMDCT_INIT_BLOCK *imdct_init_addr_6(void);
/*-------------------------------------------------------------*/ /*-------------------------------------------------------------*/
void imdct_init(MPEG *m) void imdct_init(MPEG *m)

4
codecs/mp3/src/mdct.c
View File

@@ -71,11 +71,11 @@ static IMDCT_INIT_BLOCK imdct_info_6 =
{mdct6_3v, mdct6_3v2, &coef87}; {mdct6_3v, mdct6_3v2, &coef87};
/*====================================================================*/ /*====================================================================*/
IMDCT_INIT_BLOCK *imdct_init_addr_18() IMDCT_INIT_BLOCK *imdct_init_addr_18(void)
{ {
return &imdct_info_18; return &imdct_info_18;
} }
IMDCT_INIT_BLOCK *imdct_init_addr_6() IMDCT_INIT_BLOCK *imdct_init_addr_6(void)
{ {
return &imdct_info_6; return &imdct_info_6;
} }

31
db1-ast/hash/hash_func.c
View File

@@ -45,13 +45,16 @@ static char sccsid[] = "@(#)hash_func.c 8.2 (Berkeley) 2/21/94";
#include "page.h" #include "page.h"
#include "extern.h" #include "extern.h"
static u_int32_t hash1 __P((const void *, size_t)); /* only one of these can be defined */
static u_int32_t hash2 __P((const void *, size_t)); //#define HASH1_EJB 1
static u_int32_t hash3 __P((const void *, size_t)); //#define HASH2_PHONG 1
static u_int32_t hash4 __P((const void *, size_t)); //#define HASH3_SDBM 1
#define HASH4_TOREK 1
static u_int32_t hashfunc __P((const void *, size_t));
/* Global default hash function */ /* 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 * HASH FUNCTIONS
@@ -62,11 +65,13 @@ u_int32_t (*__default_hash) __P((const void *, size_t)) = hash4;
* This came from ejb's hsearch. * This came from ejb's hsearch.
*/ */
#ifdef HASH1_EJB
#define PRIME1 37 #define PRIME1 37
#define PRIME2 1048583 #define PRIME2 1048583
static u_int32_t static u_int32_t
hash1(keyarg, len) hashfunc(keyarg, len)
const void *keyarg; const void *keyarg;
register size_t len; register size_t len;
{ {
@@ -80,13 +85,16 @@ hash1(keyarg, len)
return (h); return (h);
} }
#endif
#ifdef HASH2_PHONG
/* /*
* Phong's linear congruential hash * Phong's linear congruential hash
*/ */
#define dcharhash(h, c) ((h) = 0x63c63cd9*(h) + 0x9c39c33d + (c)) #define dcharhash(h, c) ((h) = 0x63c63cd9*(h) + 0x9c39c33d + (c))
static u_int32_t static u_int32_t
hash2(keyarg, len) hashfunc(keyarg, len)
const void *keyarg; const void *keyarg;
size_t len; size_t len;
{ {
@@ -104,7 +112,9 @@ hash2(keyarg, len)
} }
return (h); return (h);
} }
#endif
#ifdef HASH3_SDBM
/* /*
* This is INCREDIBLY ugly, but fast. We break the string up into 8 byte * 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" * units. On the first time through the loop we get the "leftover bytes"
@@ -115,7 +125,7 @@ hash2(keyarg, len)
* OZ's original sdbm hash * OZ's original sdbm hash
*/ */
static u_int32_t static u_int32_t
hash3(keyarg, len) hashfunc(keyarg, len)
const void *keyarg; const void *keyarg;
register size_t len; register size_t len;
{ {
@@ -160,10 +170,12 @@ hash3(keyarg, len)
} }
return (h); return (h);
} }
#endif
#ifdef HASH4_TOREK
/* Hash function from Chris Torek. */ /* Hash function from Chris Torek. */
static u_int32_t static u_int32_t
hash4(keyarg, len) hashfunc(keyarg, len)
const void *keyarg; const void *keyarg;
register size_t len; register size_t len;
{ {
@@ -210,3 +222,4 @@ hash4(keyarg, len)
} }
return (h); return (h);
} }
#endif

6
editline/histedit.h
View File

@@ -59,9 +59,9 @@ typedef struct editline EditLine;
* For user-defined function interface * For user-defined function interface
*/ */
typedef struct lineinfo { typedef struct lineinfo {
const char *buffer; char *buffer;
const char *cursor; char *cursor;
const char *lastchar; char *lastchar;
} LineInfo; } LineInfo;

6
utils/astman.c
View File

@@ -427,7 +427,7 @@ static int get_user_input(char *msg, char *buf, int buflen)
newtComponent ok; newtComponent ok;
newtComponent cancel; newtComponent cancel;
newtComponent inpfield; newtComponent inpfield;
char *input; const char *input;
int res = -1; int res = -1;
struct newtExitStruct es; struct newtExitStruct es;
@@ -550,8 +550,8 @@ static int login(char *hostname)
newtComponent label; newtComponent label;
newtComponent ulabel; newtComponent ulabel;
newtComponent plabel; newtComponent plabel;
char *user; const char *user;
char *pass; const char *pass;
struct message *m; struct message *m;
struct newtExitStruct es; struct newtExitStruct es;
char tmp[55]; char tmp[55];