summaryrefslogtreecommitdiff
path: root/cel/cel_odbc.c
diff options
context:
space:
mode:
authorKinsey Moore <kmoore@digium.com>2014-05-09 22:49:26 +0000
committerKinsey Moore <kmoore@digium.com>2014-05-09 22:49:26 +0000
commitabd3e4040bd76058d0148884879858894258fb9f (patch)
treec5695a0880c4928731b1aa864f862c6cffa57428 /cel/cel_odbc.c
parentf3b55da1b855b12a59f84fd9bf6768eb101cd910 (diff)
Allow Asterisk to compile under GCC 4.10
This resolves a large number of compiler warnings from GCC 4.10 which cause the build to fail under dev mode. The vast majority are signed/unsigned mismatches in printf-style format strings. ........ Merged revisions 413586 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 413587 from http://svn.asterisk.org/svn/asterisk/branches/11 ........ Merged revisions 413588 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@413589 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'cel/cel_odbc.c')
-rw-r--r--cel/cel_odbc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/cel/cel_odbc.c b/cel/cel_odbc.c
index 69066c162..87036bbf6 100644
--- a/cel/cel_odbc.c
+++ b/cel/cel_odbc.c
@@ -474,11 +474,11 @@ static void odbc_log(struct ast_event *event)
} else if (strcmp(entry->celname, "peer") == 0) {
ast_copy_string(colbuf, record.peer, sizeof(colbuf));
} else if (strcmp(entry->celname, "amaflags") == 0) {
- snprintf(colbuf, sizeof(colbuf), "%d", record.amaflag);
+ snprintf(colbuf, sizeof(colbuf), "%u", record.amaflag);
} else if (strcmp(entry->celname, "extra") == 0) {
ast_copy_string(colbuf, record.extra, sizeof(colbuf));
} else if (strcmp(entry->celname, "eventtype") == 0) {
- snprintf(colbuf, sizeof(colbuf), "%d", record.event_type);
+ snprintf(colbuf, sizeof(colbuf), "%u", record.event_type);
} else {
colbuf[0] = 0;
unknown = 1;
@@ -692,7 +692,7 @@ static void odbc_log(struct ast_event *event)
break;
case SQL_TINYINT:
{
- char integer = 0;
+ signed char integer = 0;
if (sscanf(colptr, "%30hhd", &integer) != 1) {
ast_log(LOG_WARNING, "CEL variable %s is not an integer.\n", entry->name);
continue;
@@ -705,7 +705,7 @@ static void odbc_log(struct ast_event *event)
break;
case SQL_BIT:
{
- char integer = 0;
+ signed char integer = 0;
if (sscanf(colptr, "%30hhd", &integer) != 1) {
ast_log(LOG_WARNING, "CEL variable %s is not an integer.\n", entry->name);
continue;