aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2003-11-23 22:14:32 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2003-11-23 22:14:32 +0000
commit54b6732e7a947ca6ea41a4ac2b6c6f8b9844af7b (patch)
tree3abbcfbfaf4182b264577213a5ce992548a32b40
parentc5141472b8fb52723d319e61f197f83928b140eb (diff)
Various warning cleanups
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1782 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-xapps/app_record.c2
-rwxr-xr-xastman/astman.c8
-rwxr-xr-xcodecs/lpc10/pitsyn.c19
-rwxr-xr-xcodecs/lpc10/voicin.c19
-rwxr-xr-xdb1-ast/btree/bt_delete.c2
-rwxr-xr-xdb1-ast/btree/bt_put.c2
-rwxr-xr-xdb1-ast/btree/bt_seq.c2
-rwxr-xr-xdb1-ast/btree/bt_split.c8
-rwxr-xr-xdb1-ast/hash/hash_buf.c4
-rwxr-xr-xdb1-ast/hash/hash_page.c2
-rwxr-xr-xdb1-ast/recno/rec_open.c2
-rwxr-xr-xeditline/term.c4
-rwxr-xr-xutils/astman.c8
13 files changed, 50 insertions, 32 deletions
diff --git a/apps/app_record.c b/apps/app_record.c
index 9e72be79d..8547de36b 100755
--- a/apps/app_record.c
+++ b/apps/app_record.c
@@ -63,7 +63,7 @@ static int record_exec(struct ast_channel *chan, void *data)
int gotsilence = 0; /* did we timeout for silence? */
char silencestr[5];
int k = 0;
- int rfmt;
+ int rfmt = 0;
vdata = data; /* explained above */
diff --git a/astman/astman.c b/astman/astman.c
index a9dba8d61..f7ce241ac 100755
--- a/astman/astman.c
+++ b/astman/astman.c
@@ -427,7 +427,7 @@ static int get_user_input(char *msg, char *buf, int buflen)
newtComponent ok;
newtComponent cancel;
newtComponent inpfield;
- const char *input;
+ char *input;
int res = -1;
struct newtExitStruct es;
@@ -550,8 +550,8 @@ static int login(char *hostname)
newtComponent label;
newtComponent ulabel;
newtComponent plabel;
- const char *user;
- const char *pass;
+ char *user;
+ char *pass;
struct message *m;
struct newtExitStruct es;
char tmp[55];
@@ -583,7 +583,7 @@ static int login(char *hostname)
session.sin.sin_port = htons(DEFAULT_MANAGER_PORT);
memcpy(&session.sin.sin_addr, hp->h_addr, sizeof(session.sin.sin_addr));
- if (connect(session.fd, &session.sin, sizeof(session.sin))) {
+ if (connect(session.fd,(struct sockaddr*)&session.sin, sizeof(session.sin))) {
snprintf(tmp, sizeof(tmp), "%s failed: %s\n", hostname, strerror(errno));
show_message("Connect Failed", tmp);
return -1;
diff --git a/codecs/lpc10/pitsyn.c b/codecs/lpc10/pitsyn.c
index b5bffde5c..c027901f6 100755
--- a/codecs/lpc10/pitsyn.c
+++ b/codecs/lpc10/pitsyn.c
@@ -1,6 +1,9 @@
/*
$Log$
+Revision 1.15 2003/11/23 22:14:32 markster
+Various warning cleanups
+
Revision 1.14 2003/02/12 13:59:15 matteo
mer feb 12 14:56:57 CET 2003
@@ -40,9 +43,12 @@ extern int pitsyn_(integer *order, integer *voice, integer *pitch, real *rms, re
/* PITSYN Version 53 */
/* $Log$
- * Revision 1.14 2003/02/12 13:59:15 matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15 2003/11/23 22:14:32 markster
+ * Various warning cleanups
*
+/* Revision 1.14 2003/02/12 13:59:15 matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
/* Revision 1.1.1.1 2003/02/12 13:59:15 matteo
/* mer feb 12 14:56:57 CET 2003
/*
@@ -128,7 +134,7 @@ extern int pitsyn_(integer *order, integer *voice, integer *pitch, real *rms, re
logical *first;
/* System generated locals */
- integer rci_dim1, rci_offset, i__1, i__2;
+ integer rci_dim1 = 0, rci_offset, i__1, i__2;
real r__1;
/* Builtin functions */
@@ -149,9 +155,12 @@ extern int pitsyn_(integer *order, integer *voice, integer *pitch, real *rms, re
/* Arguments */
/* $Log$
- * Revision 1.14 2003/02/12 13:59:15 matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15 2003/11/23 22:14:32 markster
+ * Various warning cleanups
*
+/* Revision 1.14 2003/02/12 13:59:15 matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
/* Revision 1.1.1.1 2003/02/12 13:59:15 matteo
/* mer feb 12 14:56:57 CET 2003
/*
diff --git a/codecs/lpc10/voicin.c b/codecs/lpc10/voicin.c
index ae7eb1507..0b87d18c1 100755
--- a/codecs/lpc10/voicin.c
+++ b/codecs/lpc10/voicin.c
@@ -1,6 +1,9 @@
/*
$Log$
+Revision 1.15 2003/11/23 22:14:32 markster
+Various warning cleanups
+
Revision 1.14 2003/02/12 13:59:15 matteo
mer feb 12 14:56:57 CET 2003
@@ -51,9 +54,12 @@ extern struct {
/* VOICIN Version 52 */
/* $Log$
- * Revision 1.14 2003/02/12 13:59:15 matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15 2003/11/23 22:14:32 markster
+ * Various warning cleanups
*
+/* Revision 1.14 2003/02/12 13:59:15 matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
/* Revision 1.1.1.1 2003/02/12 13:59:15 matteo
/* mer feb 12 14:56:57 CET 2003
/*
@@ -265,7 +271,7 @@ s*/
;
/* System generated locals */
- integer inbuf_offset, lpbuf_offset, i__1, i__2;
+ integer inbuf_offset = 0, lpbuf_offset = 0, i__1, i__2;
real r__1, r__2;
/* Builtin functions */
@@ -296,9 +302,12 @@ s*/
/* Global Variables: */
/* Arguments */
/* $Log$
- * Revision 1.14 2003/02/12 13:59:15 matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15 2003/11/23 22:14:32 markster
+ * Various warning cleanups
*
+/* Revision 1.14 2003/02/12 13:59:15 matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
/* Revision 1.1.1.1 2003/02/12 13:59:15 matteo
/* mer feb 12 14:56:57 CET 2003
/*
diff --git a/db1-ast/btree/bt_delete.c b/db1-ast/btree/bt_delete.c
index b654c9f1f..9908a7c3e 100755
--- a/db1-ast/btree/bt_delete.c
+++ b/db1-ast/btree/bt_delete.c
@@ -150,7 +150,7 @@ __bt_stkacq(t, hp, c)
EPG *e;
EPGNO *parent;
PAGE *h;
- indx_t index;
+ indx_t index = 0;
pgno_t pgno;
recno_t nextpg, prevpg;
int exact, level;
diff --git a/db1-ast/btree/bt_put.c b/db1-ast/btree/bt_put.c
index 15309c66e..3f3807531 100755
--- a/db1-ast/btree/bt_put.c
+++ b/db1-ast/btree/bt_put.c
@@ -72,7 +72,7 @@ __bt_put(dbp, key, data, flags)
{
BTREE *t;
DBT tkey, tdata;
- EPG *e;
+ EPG *e = 0;
PAGE *h;
indx_t index, nxtindex;
pgno_t pg;
diff --git a/db1-ast/btree/bt_seq.c b/db1-ast/btree/bt_seq.c
index 90f896036..5ba7b0301 100755
--- a/db1-ast/btree/bt_seq.c
+++ b/db1-ast/btree/bt_seq.c
@@ -244,7 +244,7 @@ __bt_seqadv(t, ep, flags)
{
CURSOR *c;
PAGE *h;
- indx_t index;
+ indx_t index = 0;
pgno_t pg;
int exact;
diff --git a/db1-ast/btree/bt_split.c b/db1-ast/btree/bt_split.c
index 4119ccbf7..e6bd540b4 100755
--- a/db1-ast/btree/bt_split.c
+++ b/db1-ast/btree/bt_split.c
@@ -87,14 +87,14 @@ __bt_split(t, sp, key, data, flags, ilen, argskip)
size_t ilen;
u_int32_t argskip;
{
- BINTERNAL *bi;
- BLEAF *bl, *tbl;
+ BINTERNAL *bi = 0;
+ BLEAF *bl = 0, *tbl;
DBT a, b;
EPGNO *parent;
PAGE *h, *l, *r, *lchild, *rchild;
indx_t nxtindex;
u_int16_t skip;
- u_int32_t n, nbytes, nksize;
+ u_int32_t n, nbytes, nksize = 0;
int parentsplit;
char *dest;
@@ -622,7 +622,7 @@ bt_psplit(t, h, l, r, pskip, ilen)
CURSOR *c;
RLEAF *rl;
PAGE *rval;
- void *src;
+ void *src = 0;
indx_t full, half, nxt, off, skip, top, used;
u_int32_t nbytes;
int bigkeycnt, isbigkey;
diff --git a/db1-ast/hash/hash_buf.c b/db1-ast/hash/hash_buf.c
index 92e1f933a..f47a7b08e 100755
--- a/db1-ast/hash/hash_buf.c
+++ b/db1-ast/hash/hash_buf.c
@@ -110,8 +110,8 @@ __get_buf(hashp, addr, prev_bp, newpage)
{
register BUFHEAD *bp;
register u_int32_t is_disk_mask;
- register int is_disk, segment_ndx;
- SEGMENT segp;
+ register int is_disk, segment_ndx = 0;
+ SEGMENT segp = 0;
is_disk = 0;
is_disk_mask = 0;
diff --git a/db1-ast/hash/hash_page.c b/db1-ast/hash/hash_page.c
index e1dfe6b8d..1429dd6c3 100755
--- a/db1-ast/hash/hash_page.c
+++ b/db1-ast/hash/hash_page.c
@@ -665,7 +665,7 @@ static u_int16_t
overflow_page(hashp)
HTAB *hashp;
{
- register u_int32_t *freep;
+ register u_int32_t *freep = 0;
register int max_free, offset, splitnum;
u_int16_t addr;
int bit, first_page, free_bit, free_page, i, in_use_bits, j;
diff --git a/db1-ast/recno/rec_open.c b/db1-ast/recno/rec_open.c
index 51d8a3c26..cf9511e87 100755
--- a/db1-ast/recno/rec_open.c
+++ b/db1-ast/recno/rec_open.c
@@ -63,7 +63,7 @@ __rec_open(fname, flags, mode, openinfo, dflags)
DB *dbp;
PAGE *h;
struct stat sb;
- int rfd, sverrno;
+ int rfd = 0, sverrno;
/* Open the user's file -- if this fails, we're done. */
if (fname != NULL && (rfd = open(fname, flags, mode)) < 0)
diff --git a/editline/term.c b/editline/term.c
index d360abeee..738f63fbd 100755
--- a/editline/term.c
+++ b/editline/term.c
@@ -938,7 +938,7 @@ term_set(EditLine *el, const char *term)
Val(T_co) = tgetnum("co");
Val(T_li) = tgetnum("li");
for (t = tstr; t->name != NULL; t++)
- term_alloc(el, t, tgetstr(t->name, &area));
+ term_alloc(el, t, tgetstr((char *)t->name, &area));
}
if (Val(T_co) < 2)
@@ -1436,7 +1436,7 @@ term_echotc(EditLine *el, int argc, const char **argv)
break;
}
if (t->name == NULL)
- scap = tgetstr(*argv, &area);
+ scap = tgetstr((char *)argv, &area);
if (!scap || scap[0] == '\0') {
if (!silent)
(void) fprintf(el->el_errfile,
diff --git a/utils/astman.c b/utils/astman.c
index a9dba8d61..f7ce241ac 100755
--- a/utils/astman.c
+++ b/utils/astman.c
@@ -427,7 +427,7 @@ static int get_user_input(char *msg, char *buf, int buflen)
newtComponent ok;
newtComponent cancel;
newtComponent inpfield;
- const char *input;
+ char *input;
int res = -1;
struct newtExitStruct es;
@@ -550,8 +550,8 @@ static int login(char *hostname)
newtComponent label;
newtComponent ulabel;
newtComponent plabel;
- const char *user;
- const char *pass;
+ char *user;
+ char *pass;
struct message *m;
struct newtExitStruct es;
char tmp[55];
@@ -583,7 +583,7 @@ static int login(char *hostname)
session.sin.sin_port = htons(DEFAULT_MANAGER_PORT);
memcpy(&session.sin.sin_addr, hp->h_addr, sizeof(session.sin.sin_addr));
- if (connect(session.fd, &session.sin, sizeof(session.sin))) {
+ if (connect(session.fd,(struct sockaddr*)&session.sin, sizeof(session.sin))) {
snprintf(tmp, sizeof(tmp), "%s failed: %s\n", hostname, strerror(errno));
show_message("Connect Failed", tmp);
return -1;