kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 12:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a few compile warnings (turned errors) and disable -Werror on the

Browse Source 
normal build.  If people want this they can turn it on, and don't anyone 
turn it on by default until you fix building on GCC 4.x


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@10842 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2006-02-23 04:38:38 +00:00
parent 850397b334
commit c3447c7cce
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -233,7 +233,7 @@ endif
INCLUDE+=-Iinclude -I../include INCLUDE+=-Iinclude -I../include
ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
ASTCFLAGS+=$(OPTIMIZE) ASTCFLAGS+=$(OPTIMIZE)
ASTCFLAGS+= -Werror -Wunused ASTCFLAGS+=# -Werror -Wunused
ifeq ($(shell gcc -v 2>&1 | grep 'gcc version' | cut -f3 -d' ' | cut -f1 -d.),4) ifeq ($(shell gcc -v 2>&1 | grep 'gcc version' | cut -f3 -d' ' | cut -f1 -d.),4)
ASTCFLAGS+= -Wno-pointer-sign ASTCFLAGS+= -Wno-pointer-sign
endif endif

8
pbx/pbx_dundi.c
View File

@@ -1132,10 +1132,12 @@ static int cache_lookup_internal(time_t now, struct dundi_request *req, char *ke
int expiration; int expiration;
char fs[256]; char fs[256];
time_t timeout; time_t timeout;
unsigned int x;
/* Build request string */ /* Build request string */
if (!ast_db_get("dundi/cache", key, data, sizeof(data))) { if (!ast_db_get("dundi/cache", key, data, sizeof(data))) {
ptr = data; ptr = data;
if (sscanf(ptr, "%d|%n", (int *)&timeout, &length) == 1) { if (sscanf(ptr, "%d|%n", (int *)&x, &length) == 1) {
timeout = x;
expiration = timeout - now; expiration = timeout - now;
if (expiration > 0) { if (expiration > 0) {
ast_log(LOG_DEBUG, "Found cache expiring in %d seconds!\n", (int)(timeout - now)); ast_log(LOG_DEBUG, "Found cache expiring in %d seconds!\n", (int)(timeout - now));
@@ -2028,9 +2030,11 @@ static void load_password(void)
char *last=NULL; char *last=NULL;
char tmp[256]; char tmp[256];
time_t expired; time_t expired;
unsigned int x;
ast_db_get(secretpath, "secretexpiry", tmp, sizeof(tmp)); ast_db_get(secretpath, "secretexpiry", tmp, sizeof(tmp));
if (sscanf(tmp, "%d", (int *)&expired) == 1) { if (sscanf(tmp, "%d", (int *)&x) == 1) {
expired = x;
ast_db_get(secretpath, "secret", tmp, sizeof(tmp)); ast_db_get(secretpath, "secret", tmp, sizeof(tmp));
current = strchr(tmp, ';'); current = strchr(tmp, ';');
if (!current) if (!current)