mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
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 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@413588 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
13
main/data.c
13
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;
|
||||
|
Reference in New Issue
Block a user