diff options
| author | Kinsey Moore <kmoore@digium.com> | 2014-05-09 22:49:26 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2014-05-09 22:49:26 +0000 |
| commit | abd3e4040bd76058d0148884879858894258fb9f (patch) | |
| tree | c5695a0880c4928731b1aa864f862c6cffa57428 /cel | |
| parent | f3b55da1b855b12a59f84fd9bf6768eb101cd910 (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')
| -rw-r--r-- | cel/cel_odbc.c | 8 | ||||
| -rw-r--r-- | cel/cel_pgsql.c | 4 |
2 files changed, 6 insertions, 6 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; diff --git a/cel/cel_pgsql.c b/cel/cel_pgsql.c index ceaa34e79..7b1bd09ed 100644 --- a/cel/cel_pgsql.c +++ b/cel/cel_pgsql.c @@ -204,11 +204,11 @@ static void pgsql_log(struct ast_event *event) if (strncmp(cur->type, "int", 3) == 0) { /* Integer, no need to escape anything */ LENGTHEN_BUF2(13); - ast_str_append(&sql2, 0, "%s%d", SEP, record.amaflag); + ast_str_append(&sql2, 0, "%s%u", SEP, record.amaflag); } else { /* Although this is a char field, there are no special characters in the values for these fields */ LENGTHEN_BUF2(31); - ast_str_append(&sql2, 0, "%s'%d'", SEP, record.amaflag); + ast_str_append(&sql2, 0, "%s'%u'", SEP, record.amaflag); } } else { /* Arbitrary field, could be anything */ |