diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-02-14 05:09:56 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-02-14 23:47:43 +0000 |
| commit | 5066cf86901f8849deb1a79dbe14fec675bb99da (patch) | |
| tree | 56b46e899946f213b9c8a1fecb2da342f2503bc6 | |
| parent | b846e487ff9d5913a433430383f0c317f0354026 (diff) | |
| download | wireshark-5066cf86901f8849deb1a79dbe14fec675bb99da.tar.gz | |
Fix format string warnings [-Wformat=]
Change-Id: I266c7d422f6ade965b42a4e2e8dc01966f8eb5f8
Reviewed-on: https://code.wireshark.org/review/13932
Reviewed-by: João Valverde <j@v6e.pt>
| -rw-r--r-- | epan/diam_dict.l | 6 | ||||
| -rw-r--r-- | epan/dissectors/packet-dcerpc.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-rpc.c | 2 | ||||
| -rw-r--r-- | plugins/mate/mate_runtime.c | 2 | ||||
| -rw-r--r-- | plugins/wimaxasncp/wimaxasncp_dict.l | 6 |
5 files changed, 9 insertions, 9 deletions
diff --git a/epan/diam_dict.l b/epan/diam_dict.l index 9dccba9b97..e97ca8d821 100644 --- a/epan/diam_dict.l +++ b/epan/diam_dict.l @@ -286,7 +286,7 @@ description_attr description=\042 for (e = ents.next; e; e = e->next) { if (strcmp(e->name,yytext) == 0) { yyin = ddict_open(sys_dir,e->file); - D(("entity: %s filename: %s yyin: %p\n",e->name,e->file,yyin)); + D(("entity: %s filename: %s yyin: %p\n",e->name,e->file,(void*)yyin)); if (!yyin) { if (errno) fprintf(stderr, "Could not open file: '%s', error: %s\n", e->file, g_strerror(errno) ); @@ -313,7 +313,7 @@ description_attr description=\042 if (!yyin) yyterminate(); fclose(yyin); - D(("closing: %p %i\n",yyin,include_stack_ptr)); + D(("closing: %p %i\n",(void*)yyin,include_stack_ptr)); if ( --include_stack_ptr < 0 ) { D(("DONE READING\n")); @@ -640,7 +640,7 @@ ddict_open(const char* system_directory, const char* filename) fh = ws_fopen(fname,"r"); - D(("fname: %s fh: %p\n",fname,fh)); + D(("fname: %s fh: %p\n",fname,(void*)fh)); g_free(fname); diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index 253f695856..d251507412 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -1978,7 +1978,7 @@ dcerpcstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const static guint dcerpcstat_param(register_srt_t* srt, const char* opt_arg, char** err) { - guint pos = 0; + int pos = 0; guint32 i, max_procs; dcerpcstat_tap_data_t* tap_data; guint d1,d2,d3,d40,d41,d42,d43,d44,d45,d46,d47; diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index 046430f512..d2f587c519 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -406,7 +406,7 @@ rpcstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const voi static guint rpcstat_param(register_srt_t* srt, const char* opt_arg, char** err) { - guint pos = 0; + int pos = 0; int program, version; rpcstat_tap_data_t* tap_data; diff --git a/plugins/mate/mate_runtime.c b/plugins/mate/mate_runtime.c index 1c7f651cbc..d9455c99d1 100644 --- a/plugins/mate/mate_runtime.c +++ b/plugins/mate/mate_runtime.c @@ -210,7 +210,7 @@ static mate_gop* new_gop(mate_cfg_gop* cfg, mate_pdu* pdu, gchar* key) { } static void adopt_gop(mate_gog* gog, mate_gop* gop) { - dbg_print (dbg_gog,5,dbg_facility,"adopt_gop: gog=%p gop=%p",gog,gop); + dbg_print (dbg_gog,5,dbg_facility,"adopt_gop: gog=%p gop=%p",(void*)gog,(void*)gop); gop->gog = gog; gop->next = NULL; diff --git a/plugins/wimaxasncp/wimaxasncp_dict.l b/plugins/wimaxasncp/wimaxasncp_dict.l index 3953f1fe96..cec21a0eed 100644 --- a/plugins/wimaxasncp/wimaxasncp_dict.l +++ b/plugins/wimaxasncp/wimaxasncp_dict.l @@ -274,7 +274,7 @@ since_attr since=\042 for (e = ents.next; e; e = e->next) { if (strcmp(e->name,yytext) == 0) { yyin = wimaxasncp_dict_open(sys_dir,e->file); - D(("entity: %s filename: %s yyin: %p\n",e->name,e->file,yyin)); + D(("entity: %s filename: %s yyin: %p\n",e->name,e->file,(void*)yyin)); if (!yyin) { yyterminate(); } else { @@ -298,7 +298,7 @@ since_attr since=\042 if (!yyin) yyterminate(); fclose(yyin); - D(("closing: %p %i\n",yyin,include_stack_ptr)); + D(("closing: %p %i\n",(void*)yyin,include_stack_ptr)); if ( --include_stack_ptr < 0 ) { D(("DONE READING\n")); @@ -600,7 +600,7 @@ static FILE *wimaxasncp_dict_open( fh = ws_fopen(fname,"r"); - D(("fname: %s fh: %p\n",fname,fh)); + D(("fname: %s fh: %p\n",fname,(void*)fh)); g_free(fname); |