osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix warnings: format '%blah' expects argument of type 'foo', but argument 'i' has type 'bar' [-Wformat]. 

svn path=/trunk/; revision=50639
This commit is contained in:
Chris Maynard 2013-07-15 21:22:34 +00:00
parent f5f20fa8e3
commit 1c19a0d61e
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-etch.c
View File

@ -200,7 +200,7 @@ gbl_symbols_free(void)
}
static void
gbl_symbols_array_append(int hash, gchar *symbol)
gbl_symbols_array_append(guint32 hash, gchar *symbol)
{
value_string vs = {hash, symbol};
DISSECTOR_ASSERT(gbl_symbols_array != NULL);
@ -292,7 +292,7 @@ add_symbols_of_file(const char *filename)
if (pFile != NULL) {
char line[256];
while (fgets(line, sizeof line, pFile) != NULL) {
int hash;
unsigned int hash;
size_t length, pos;
length = strlen(line);

4
epan/emem.c
View File

@ -843,7 +843,7 @@ static void *
emem_alloc(size_t size, emem_pool_t *mem)
{
void *buf;
#if 0
/* For testing wmem, effectively redirects most emem memory to wmem.
* You will also have to comment out several assertions in wmem_core.c,
@ -2088,7 +2088,7 @@ emem_print_subtree(emem_tree_t* emem_tree, guint32 level)
printf(" ");
}
printf("EMEM tree:%p type:%s name:%s root:%p\n",emem_tree,(emem_tree->type==1)?"RedBlack":"unknown",emem_tree->name,(void *)(emem_tree->tree));
printf("EMEM tree:%p type:%s name:%s root:%p\n",(void *)emem_tree,(emem_tree->type==1)?"RedBlack":"unknown",emem_tree->name,(void *)(emem_tree->tree));
if(emem_tree->tree)
emem_tree_print_nodes("Root-", emem_tree->tree, level);
}

8
epan/wmem/wmem_tree.c
View File

@ -678,8 +678,10 @@ wmem_tree_print_nodes(const char *prefix, wmem_tree_node_t *node, guint32 level)
printf(" ");
}
printf("%sNODE:%p parent:%p left:%p right:%p colour:%s key:%u %s:%p\n", prefix,
node, node->parent, node->left, node->right,
printf("%sNODE:%p parent:%p left:%p right:%p colour:%s key:%u %s:%p\n",
prefix,
(void *)node, (void *)node->parent,
(void *)node->left, (void *)node->right,
node->color?"Black":"Red", node->key32,
node->is_subtree?"tree":"data", node->data);
if (node->left)
@ -703,7 +705,7 @@ wmem_print_subtree(wmem_tree_t *tree, guint32 level)
printf(" ");
}
printf("WMEM tree:%p root:%p\n", tree, tree->root);
printf("WMEM tree:%p root:%p\n", (void *)tree, (void *)tree->root);
if (tree->root) {
wmem_tree_print_nodes("Root-", tree->root, level);
}

10
ui/gtk/voip_calls.c
View File

@ -74,8 +74,8 @@
#endif /* HAVE_LIBPORTAUDIO */
#define DUMP_PTR1(p) printf("#=> %p\n",p)
#define DUMP_PTR2(p) printf("==> %p\n",p)
#define DUMP_PTR1(p) printf("#=> %p\n",(void *)p)
#define DUMP_PTR2(p) printf("==> %p\n",(void *)p)
const char *voip_call_state_name[8]={
"",
@ -1530,7 +1530,7 @@ q931_calls_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, co
g_free(tmp_listinfo->from_identity);
g_free(tmp_listinfo->to_identity);
DUMP_PTR2(tmp2_h323info->guid);
g_free(tmp2_h323info->guid);
g_free(tmp2_h323info->guid);
list2 = g_list_first(tmp2_h323info->h245_list);
while (list2)
@ -1749,7 +1749,7 @@ static void add_h245_Address(h323_calls_info_t *h323info, h245_address_t *h245_
static void free_h225_info(gpointer p) {
h323_calls_info_t *tmp_h323info = (h323_calls_info_t *)p;
DUMP_PTR2(tmp_h323info->guid);
DUMP_PTR2(tmp_h323info->guid);
g_free(tmp_h323info->guid);
if (tmp_h323info->h245_list) {
@ -1848,7 +1848,7 @@ H225calls_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, con
tmp_h323info = (h323_calls_info_t *)callsinfo->prot_info;
g_assert(tmp_h323info != NULL);
tmp_h323info->guid = (e_guid_t *)g_memdup(&pi->guid, sizeof pi->guid);
DUMP_PTR1(tmp_h323info->guid);
DUMP_PTR1(tmp_h323info->guid);
tmp_h323info->h225SetupAddr.type = AT_NONE;
tmp_h323info->h225SetupAddr.len = 0;