aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2008-03-11 11:04:29 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2008-03-11 11:04:29 +0000
commit72a92f768bcc5ba2a5ca7e9ccff5f0d27b83c77f (patch)
tree7d19bd7ec12fcf67edadaa51483cde9ed7079e1b /main
parent5b0128ccb35ea27a4422c0ada5f88d84a9ce54e5 (diff)
fix up various compiler warnings found with gcc-4.3:
- the output of flex includes a static function called 'input' that is not used, so for the moment we'll stop having the compiler tell us about unused variables in the flex source files (a better fix would be to improve our flex post-processing to remove the unused function) - main/stdtime/localtime.c makes assumptions about signed integer overflow, and gcc-4.3's improved optimizer tries to take advantage of handling potential overflow conditions at compile time; for now, suppress these optimizations until we can fiure out if the code needs improvement - main/udptl.c has some references to uninitialized variables; in one case there was no bug, but in the other it was certainly possibly for unexpected behavior to occur - main/editline/readline.c had an unused variable git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@107352 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r--main/Makefile4
-rw-r--r--main/editline/readline.c1
-rw-r--r--main/udptl.c7
3 files changed, 9 insertions, 3 deletions
diff --git a/main/Makefile b/main/Makefile
index c9de88273..9a70e1f4f 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -113,6 +113,8 @@ ast_expr2f.c:
sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' ast_expr2f.c > zz
mv zz ast_expr2f.c
+ast_expr2f.o: ASTCFLAGS+=-Wno-unused
+
testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h
$(CC) -g -c -Iinclude -DSTANDALONE ast_expr2f.c
$(CC) -g -c -Iinclude -DSTANDALONE ast_expr2.c
@@ -121,6 +123,8 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h
channel.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE)
+stdtime/localtime.o: ASTCFLAGS+=-fno-strict-overflow
+
AST_EMBED_LDSCRIPTS:=$(sort $(EMBED_LDSCRIPTS))
AST_EMBED_LDFLAGS:=$(foreach dep,$(EMBED_LDFLAGS),$(value $(dep)))
AST_EMBED_LIBS:=$(foreach dep,$(EMBED_LIBS),$(value $(dep)))
diff --git a/main/editline/readline.c b/main/editline/readline.c
index 3fbbb79a5..3a62df628 100644
--- a/main/editline/readline.c
+++ b/main/editline/readline.c
@@ -1203,7 +1203,6 @@ filename_completion_function(const char *text, int state)
struct dirent *entry;
char *temp;
size_t len;
- int count = 0;
temp = strrchr(text, '/');
if (temp) {
diff --git a/main/udptl.c b/main/udptl.c
index 06c5e3e74..718b46fb8 100644
--- a/main/udptl.c
+++ b/main/udptl.c
@@ -844,6 +844,7 @@ void ast_udptl_set_peer(struct ast_udptl *udptl, struct sockaddr_in *them)
void ast_udptl_get_peer(struct ast_udptl *udptl, struct sockaddr_in *them)
{
+ memset(them, 0, sizeof(*them));
them->sin_family = AF_INET;
them->sin_port = udptl->them.sin_port;
them->sin_addr = udptl->them.sin_addr;
@@ -1009,13 +1010,15 @@ int ast_udptl_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags,
}
if (pr0->set_udptl_peer(c0, p1)) {
ast_log(LOG_WARNING, "Channel '%s' failed to talk to '%s'\n", c0->name, c1->name);
+ memset(&ac1, 0, sizeof(ac1));
} else {
/* Store UDPTL peer */
ast_udptl_get_peer(p1, &ac1);
}
- if (pr1->set_udptl_peer(c1, p0))
+ if (pr1->set_udptl_peer(c1, p0)) {
ast_log(LOG_WARNING, "Channel '%s' failed to talk back to '%s'\n", c1->name, c0->name);
- else {
+ memset(&ac0, 0, sizeof(ac0));
+ } else {
/* Store UDPTL peer */
ast_udptl_get_peer(p0, &ac0);
}