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 /main/data.c | |
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 'main/data.c')
-rw-r--r-- | main/data.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/main/data.c b/main/data.c index af4abd902..092d7aad5 100644 --- a/main/data.c +++ b/main/data.c @@ -2115,17 +2115,17 @@ static void data_get_xml_add_child(struct ast_data *parent_data, ast_xml_set_text(child_xml, node->payload.str); break; case AST_DATA_TIMESTAMP: - snprintf(node_content, sizeof(node_content), "%d", + snprintf(node_content, sizeof(node_content), "%u", node->payload.uint); ast_xml_set_text(child_xml, node_content); break; case AST_DATA_SECONDS: - snprintf(node_content, sizeof(node_content), "%d", + snprintf(node_content, sizeof(node_content), "%u", node->payload.uint); ast_xml_set_text(child_xml, node_content); break; case AST_DATA_MILLISECONDS: - snprintf(node_content, sizeof(node_content), "%d", + snprintf(node_content, sizeof(node_content), "%u", node->payload.uint); ast_xml_set_text(child_xml, node_content); break; @@ -2754,17 +2754,17 @@ static void data_result_print_cli_node(int fd, const struct ast_data *node, uint node->name); break; case AST_DATA_TIMESTAMP: - ast_str_append(&output, 0, "%s%s: %d\n", ast_str_buffer(tabs), + ast_str_append(&output, 0, "%s%s: %u\n", ast_str_buffer(tabs), node->name, node->payload.uint); break; case AST_DATA_SECONDS: - ast_str_append(&output, 0, "%s%s: %d\n", ast_str_buffer(tabs), + ast_str_append(&output, 0, "%s%s: %u\n", ast_str_buffer(tabs), node->name, node->payload.uint); break; case AST_DATA_MILLISECONDS: - ast_str_append(&output, 0, "%s%s: %d\n", ast_str_buffer(tabs), + ast_str_append(&output, 0, "%s%s: %u\n", ast_str_buffer(tabs), node->name, node->payload.uint); break; @@ -2815,6 +2815,7 @@ static void data_result_print_cli_node(int fd, const struct ast_data *node, uint * \param[in] root The root node of the tree. * \param[in] depth Actual depth. */ + static void __data_result_print_cli(int fd, const struct ast_data *root, uint32_t depth) { struct ao2_iterator iter; |