diff options
37 files changed, 129 insertions, 129 deletions
diff --git a/asn1/h248/packet-h248-template.c b/asn1/h248/packet-h248-template.c index eae1e3fcce..4958bd9193 100644 --- a/asn1/h248/packet-h248-template.c +++ b/asn1/h248/packet-h248-template.c @@ -640,7 +640,7 @@ static int dissect_h248_trx_id(gboolean implicit_tag, packet_info *pinfo, proto_ offset++; } if (trx_id > 0xffffffff) { - proto_item* pi = proto_tree_add_text(tree, tvb, offset-len, len,"transactionId %" PRIu64, trx_id); + proto_item* pi = proto_tree_add_text(tree, tvb, offset-len, len,"transactionId %" G_GINT64_MODIFIER "u", trx_id); proto_item_set_expert_flags(pi, PI_MALFORMED, PI_WARN); *trx_id_p = 0; @@ -680,7 +680,7 @@ static int dissect_h248_ctx_id(gboolean implicit_tag, packet_info *pinfo, proto_ if (ctx_id > 0xffffffff) { proto_item* pi = proto_tree_add_text(tree, tvb, offset-len, len, - "contextId: %" PRIu64, ctx_id); + "contextId: %" G_GINT64_MODIFIER "u", ctx_id); proto_item_set_expert_flags(pi, PI_MALFORMED, PI_WARN); *ctx_id_p = 0xfffffffd; diff --git a/epan/dissectors/packet-9p.c b/epan/dissectors/packet-9p.c index 4103467a8c..ebd5b893ac 100644 --- a/epan/dissectors/packet-9p.c +++ b/epan/dissectors/packet-9p.c @@ -605,7 +605,7 @@ static void dissect_9P_qid(tvbuff_t * tvb, proto_tree * tree,int offset) vers = tvb_get_letohs(tvb,offset+1); path = tvb_get_letoh64(tvb,offset+1+4); - qid_item = proto_tree_add_text(tree,tvb,offset,13,"Qid type=0x%02x vers=%d path=%"PRIu64,type,vers,path); + qid_item = proto_tree_add_text(tree,tvb,offset,13,"Qid type=0x%02x vers=%d path=%" G_GINT64_MODIFIER "u",type,vers,path); qid_tree = proto_item_add_subtree(qid_item,ett_9P_qid); qidtype_item = proto_tree_add_item(qid_tree, hf_9P_qidtype, tvb, offset, 1, TRUE); diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c index 28865b1bcc..f84e13caa8 100644 --- a/epan/dissectors/packet-bacapp.c +++ b/epan/dissectors/packet-bacapp.c @@ -1612,7 +1612,7 @@ fUnsignedTag (tvbuff_t *tvb, proto_tree *tree, guint offset, const gchar *label) /* only support up to an 8 byte (64-bit) integer */ if (fUnsigned64 (tvb, offset + tag_len, lvt, &val)) ti = proto_tree_add_text(tree, tvb, offset, lvt+tag_len, - "%s(Unsigned) %" PRIu64, label, val); + "%s(Unsigned) %" G_GINT64_MODIFIER "u", label, val); else ti = proto_tree_add_text(tree, tvb, offset, lvt+tag_len, "%s - %u octets (Unsigned)", label, lvt); @@ -1674,7 +1674,7 @@ fSignedTag (tvbuff_t *tvb, proto_tree *tree, guint offset, const gchar *label) tag_len = fTagHeader (tvb, offset, &tag_no, &tag_info, &lvt); if (fSigned64 (tvb, offset + tag_len, lvt, &val)) ti = proto_tree_add_text(tree, tvb, offset, lvt+tag_len, - "%s(Signed) %" PRId64, label, val); + "%s(Signed) %" G_GINT64_MODIFIER "d", label, val); else ti = proto_tree_add_text(tree, tvb, offset, lvt+tag_len, "%s - %u octets (Signed)", label, lvt); diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c index f106472c32..d47a422a6a 100644 --- a/epan/dissectors/packet-bootp.c +++ b/epan/dissectors/packet-bootp.c @@ -1170,7 +1170,7 @@ bootp_option(tvbuff_t *tvb, proto_tree *bp_tree, int voff, int eoff, case AUTHEN_RDM_MONOTONIC_COUNTER: proto_tree_add_text(v_tree, tvb, optoff, 8, - "RDM Replay Detection Value: %" PRIx64, + "RDM Replay Detection Value: %" G_GINT64_MODIFIER "x", tvb_get_ntoh64(tvb, optoff)); break; diff --git a/epan/dissectors/packet-daap.c b/epan/dissectors/packet-daap.c index ba2c2c88b1..27afb3eff5 100644 --- a/epan/dissectors/packet-daap.c +++ b/epan/dissectors/packet-daap.c @@ -250,7 +250,7 @@ dissect_daap_one_tag(proto_tree *tree, tvbuff_t *tvb, int offset, int length) break; case daap_mper: /* Tags conain uint64 */ - proto_item_append_text(ti, ", Persistent Id: %" PRIu64, + proto_item_append_text(ti, ", Persistent Id: %" G_GINT64_MODIFIER "u", tvb_get_ntoh64(tvb, offset)); break; case daap_mstt: diff --git a/epan/dissectors/packet-dcerpc-ndr.c b/epan/dissectors/packet-dcerpc-ndr.c index 768b7cc40d..16eced4df9 100644 --- a/epan/dissectors/packet-dcerpc-ndr.c +++ b/epan/dissectors/packet-dcerpc-ndr.c @@ -351,16 +351,16 @@ PIDL_dissect_uint64 (tvbuff_t *tvb, gint offset, packet_info *pinfo, switch(hf_info->display){ case BASE_DEC: if(hf_info->strings){ - g_snprintf(valstr, 64, "%s(%" PRIu64 ")",val_to_str( (guint32) val, hf_info->strings, "Unknown:%u"), val); + g_snprintf(valstr, 64, "%s(%" G_GINT64_MODIFIER "u)",val_to_str( (guint32) val, hf_info->strings, "Unknown:%u"), val); } else { - g_snprintf(valstr, 64, "%" PRIu64, val); + g_snprintf(valstr, 64, "%" G_GINT64_MODIFIER "u", val); } break; case BASE_HEX: if(hf_info->strings){ - g_snprintf(valstr, 64, "%s(0x%" PRIx64 ")",val_to_str( (guint32) val, hf_info->strings, "Unknown:%u"), val); + g_snprintf(valstr, 64, "%s(0x%" G_GINT64_MODIFIER "x)",val_to_str( (guint32) val, hf_info->strings, "Unknown:%u"), val); } else { - g_snprintf(valstr, 64, "0x%" PRIx64, val); + g_snprintf(valstr, 64, "0x%" G_GINT64_MODIFIER "x", val); } break; default: diff --git a/epan/dissectors/packet-dcom.c b/epan/dissectors/packet-dcom.c index c258231800..31aeaae64f 100644 --- a/epan/dissectors/packet-dcom.c +++ b/epan/dissectors/packet-dcom.c @@ -252,7 +252,7 @@ void dcom_interface_dump(void) { for(objects = machine->objects; objects != NULL; objects = g_list_next(objects)) { object = objects->data; - g_warning(" Object(#%4u): OID:0x%" PRIx64 " private:%p", object->first_packet, object->oid, object->private_data); + g_warning(" Object(#%4u): OID:0x%" G_GINT64_MODIFIER "x private:%p", object->first_packet, object->oid, object->private_data); for(interfaces = object->interfaces; interfaces != NULL; interfaces = g_list_next(interfaces)) { interf = interfaces->data; diff --git a/epan/dissectors/packet-dcp.c b/epan/dissectors/packet-dcp.c index fa21a3861e..06bd771c5f 100644 --- a/epan/dissectors/packet-dcp.c +++ b/epan/dissectors/packet-dcp.c @@ -653,7 +653,7 @@ static void dissect_dcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (check_col(pinfo->cinfo, COL_INFO)) - col_add_fstr(pinfo->cinfo, COL_INFO, "%s > %s [%s] Seq=%" PRIu64, + col_add_fstr(pinfo->cinfo, COL_INFO, "%s > %s [%s] Seq=%" G_GINT64_MODIFIER "u", get_dccp_port(dcph->sport), get_dccp_port(dcph->dport), val_to_str(dcph->type, dcp_packet_type_vals, "Unknown Type"), @@ -665,7 +665,7 @@ static void dissect_dcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dcp_item = proto_tree_add_protocol_format(tree, proto_dcp, tvb, offset, dcph->data_offset*4, "Datagram Congestion Control Protocol, Src Port: %s (%u), Dst Port: %s (%u)" - " [%s] Seq=%" PRIu64, + " [%s] Seq=%" G_GINT64_MODIFIER "u", get_dccp_port(dcph->sport), dcph->sport, get_dccp_port(dcph->dport), dcph->dport, val_to_str(dcph->type, dcp_packet_type_vals, "Unknown Type"), @@ -797,7 +797,7 @@ static void dissect_dcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(tree) proto_tree_add_uint64(dcp_tree, hf_dcp_ack, tvb, offset + 2, 6, dcph->ack); if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, " (Ack=%" PRIu64 ")", dcph->ack); + col_append_fstr(pinfo->cinfo, COL_INFO, " (Ack=%" G_GINT64_MODIFIER "u)", dcph->ack); offset+=8; /* Skip over Acknowledgement Number Subheader */ @@ -836,7 +836,7 @@ static void dissect_dcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(tree) proto_tree_add_uint64(dcp_tree, hf_dcp_ack, tvb, offset + 2, 6, dcph->ack); if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, " (Ack=%" PRIu64 ")", dcph->ack); + col_append_fstr(pinfo->cinfo, COL_INFO, " (Ack=%" G_GINT64_MODIFIER "u)", dcph->ack); offset+=8; /* Skip over Acknowledgement Number Subheader */ } else { @@ -854,7 +854,7 @@ static void dissect_dcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(tree) proto_tree_add_uint64(dcp_tree, hf_dcp_ack, tvb, offset + 1, 3, dcph->ack); if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, " (Ack=%" PRIu64 ")", dcph->ack); + col_append_fstr(pinfo->cinfo, COL_INFO, " (Ack=%" G_GINT64_MODIFIER "u)", dcph->ack); offset+=4; /* Skip over Acknowledgement Number Subheader */ } @@ -875,7 +875,7 @@ static void dissect_dcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(tree) proto_tree_add_uint64(dcp_tree, hf_dcp_ack, tvb, offset + 2, 6, dcph->ack); if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, " (Ack=%" PRIu64 ")", dcph->ack); + col_append_fstr(pinfo->cinfo, COL_INFO, " (Ack=%" G_GINT64_MODIFIER "u)", dcph->ack); offset+=8; /* Skip over Acknowledgement Number Subheader */ @@ -913,7 +913,7 @@ static void dissect_dcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(tree) proto_tree_add_uint64(dcp_tree, hf_dcp_ack, tvb, offset + 2, 6, dcph->ack); if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, " (Ack=%" PRIu64 ")", dcph->ack); + col_append_fstr(pinfo->cinfo, COL_INFO, " (Ack=%" G_GINT64_MODIFIER "u)", dcph->ack); offset+=8; /* Skip over Acknowledgement Number Subheader */ break; diff --git a/epan/dissectors/packet-dis-fields.c b/epan/dissectors/packet-dis-fields.c index c62f789be4..53991ed41a 100644 --- a/epan/dissectors/packet-dis-fields.c +++ b/epan/dissectors/packet-dis-fields.c @@ -276,7 +276,7 @@ gint parseField_Bitmask(tvbuff_t *tvb, proto_tree *tree, gint offset, DIS_Parser else { proto_tree_add_text(tree, tvb, offset, numBytes, - "Unknown Appearance Type (%" PRIu64 ")", uintVal); + "Unknown Appearance Type (%" G_GINT64_MODIFIER "u)", uintVal); } offset += numBytes; @@ -311,7 +311,7 @@ gint parseField_UInt(tvbuff_t *tvb, proto_tree *tree, gint offset, DIS_ParserNod break; } - proto_tree_add_text(tree, tvb, offset, numBytes, "%s = %" PRIu64, + proto_tree_add_text(tree, tvb, offset, numBytes, "%s = %" G_GINT64_MODIFIER "u", parserNode.fieldLabel, uintVal); if (parserNode.outputVar != 0) @@ -351,7 +351,7 @@ gint parseField_Int(tvbuff_t *tvb, proto_tree *tree, gint offset, DIS_ParserNode break; } - proto_tree_add_text(tree, tvb, offset, numBytes, "%s = %" PRId64, + proto_tree_add_text(tree, tvb, offset, numBytes, "%s = %" G_GINT64_MODIFIER "d", parserNode.fieldLabel, uintVal); offset += numBytes; diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c index e83bafa0df..69405361ac 100644 --- a/epan/dissectors/packet-dmp.c +++ b/epan/dissectors/packet-dmp.c @@ -1208,7 +1208,7 @@ static gint dissect_dmp_sic (tvbuff_t *tvb, packet_info *pinfo, failure = dmp_dec_xbyte_sic (value, sic, length, any); bf = proto_tree_add_string_format (sic_tree, hf_message_sic, tvb, offset, bytes, sic, - "SIC %d: %s (%d bytes: %" PRIx64 ")%s", + "SIC %d: %s (%d bytes: %" G_GINT64_MODIFIER "x)%s", i + 1, sic, bytes, value, failure ? " (invalid)": ""); if (bitmap & (1 << (7 - i))) { @@ -2115,7 +2115,7 @@ static void dissect_dmp_structured_id (tvbuff_t *tvb, proto_tree *body_tree, case STRUCT_ID_UINT64: id_guint64 = tvb_get_ntoh64 (tvb, offset); - g_snprintf (dmp.struct_id, MAX_STRUCT_ID_LEN, "%" PRIu64, id_guint64); + g_snprintf (dmp.struct_id, MAX_STRUCT_ID_LEN, "%" G_GINT64_MODIFIER "u", id_guint64); tf = proto_tree_add_item (body_tree, hf_message_bodyid_uint64, tvb, offset, 8, FALSE); break; diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c index 0d06538a17..81136af991 100644 --- a/epan/dissectors/packet-edonkey.c +++ b/epan/dissectors/packet-edonkey.c @@ -730,7 +730,7 @@ static int dissect_edonkey_start_offset_64(tvbuff_t *tvb, packet_info *pinfo _U_ { /* <Start Offset> ::= guint64 */ guint64 start = tvb_get_letoh64(tvb, offset); - proto_tree_add_text(tree, tvb, offset, 8, "Start Offset: %" PRIu64, start); + proto_tree_add_text(tree, tvb, offset, 8, "Start Offset: %" G_GINT64_MODIFIER "u", start); return offset+8; } @@ -749,7 +749,7 @@ static int dissect_edonkey_end_offset_64(tvbuff_t *tvb, packet_info *pinfo _U_, { /* <End Offset> ::= guint64 */ guint64 end = tvb_get_letoh64(tvb, offset); - proto_tree_add_text(tree, tvb, offset, 8, "End Offset: %" PRIu64, end); + proto_tree_add_text(tree, tvb, offset, 8, "End Offset: %" G_GINT64_MODIFIER "u", end); return offset+8; } @@ -876,7 +876,7 @@ static int dissect_emule_multipacket(tvbuff_t *tvb, packet_info *pinfo _U_, if (isext) { guint64 filelen = tvb_get_letoh64(tvb, offset); - proto_tree_add_text(tree, tvb, offset, 8, "File Length: %" PRIu64, filelen); + proto_tree_add_text(tree, tvb, offset, 8, "File Length: %" G_GINT64_MODIFIER "u", filelen); offset += 8; } diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c index 8e5859a095..a5154dee1b 100644 --- a/epan/dissectors/packet-frame.c +++ b/epan/dissectors/packet-frame.c @@ -268,7 +268,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) if (show_file_off) { proto_tree_add_int64_format(fh_tree, hf_frame_file_off, tvb, 0, 0, pinfo->fd->file_off, - "File Offset: %" PRId64 " (0x%" PRIx64 ")", + "File Offset: %" G_GINT64_MODIFIER "d (0x%" G_GINT64_MODIFIER "x)", pinfo->fd->file_off, pinfo->fd->file_off); } diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c index 1c0b4e23ec..1856018bb7 100644 --- a/epan/dissectors/packet-h248.c +++ b/epan/dissectors/packet-h248.c @@ -1100,7 +1100,7 @@ static int dissect_h248_trx_id(gboolean implicit_tag, packet_info *pinfo, proto_ offset++; } if (trx_id > 0xffffffff) { - proto_item* pi = proto_tree_add_text(tree, tvb, offset-len, len,"transactionId %" PRIu64, trx_id); + proto_item* pi = proto_tree_add_text(tree, tvb, offset-len, len,"transactionId %" G_GINT64_MODIFIER "u", trx_id); proto_item_set_expert_flags(pi, PI_MALFORMED, PI_WARN); *trx_id_p = 0; @@ -1140,7 +1140,7 @@ static int dissect_h248_ctx_id(gboolean implicit_tag, packet_info *pinfo, proto_ if (ctx_id > 0xffffffff) { proto_item* pi = proto_tree_add_text(tree, tvb, offset-len, len, - "contextId: %" PRIu64, ctx_id); + "contextId: %" G_GINT64_MODIFIER "u", ctx_id); proto_item_set_expert_flags(pi, PI_MALFORMED, PI_WARN); *ctx_id_p = 0xfffffffd; diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 6f405191b9..8d5279b95b 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -4712,7 +4712,7 @@ add_tagged_field (packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int of offset++; start_time = tvb_get_letoh64 (tvb, offset); - proto_tree_add_uint64_format(sub_tree, hf_tag_measure_report_start_time, tvb, offset, 8, start_time, "Measurement Start Time: 0x%016" PRIx64, start_time); + proto_tree_add_uint64_format(sub_tree, hf_tag_measure_report_start_time, tvb, offset, 8, start_time, "Measurement Start Time: 0x%016" G_GINT64_MODIFIER "x", start_time); offset += 8; duration = tvb_get_letohs (tvb, offset); diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c index 5760650e5a..a84a92d768 100644 --- a/epan/dissectors/packet-lldp.c +++ b/epan/dissectors/packet-lldp.c @@ -507,7 +507,7 @@ get_latitude_or_longitude(int option, guint64 value) direction = "East"; } - return ep_strdup_printf("%u.%04" PRIu64 " degrees %s", + return ep_strdup_printf("%u.%04" G_GINT64_MODIFIER "u degrees %s", integerPortion, tempValue, direction); } @@ -1731,7 +1731,7 @@ dissect_media_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint temp64bit = tvb_get_ntoh64(tvb, tempOffset); temp64bit = (temp64bit & G_GINT64_CONSTANT(0x03FFFFFFFF000000)) >> 24; if (tree) - proto_tree_add_text(tree, tvb, tempOffset, 5, "Latitude: %s (0x%16" PRIX64 ")", + proto_tree_add_text(tree, tvb, tempOffset, 5, "Latitude: %s (0x%16" G_GINT64_MODIFIER "X)", get_latitude_or_longitude(0, temp64bit), temp64bit); @@ -1749,7 +1749,7 @@ dissect_media_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint temp64bit = (temp64bit & G_GINT64_CONSTANT(0x03FFFFFFFF000000)) >> 24; ; if (tree) - proto_tree_add_text(tree, tvb, tempOffset, 5, "Longitude: %s (0x%16" PRIX64 ")", + proto_tree_add_text(tree, tvb, tempOffset, 5, "Longitude: %s (0x%16" G_GINT64_MODIFIER "X)", get_latitude_or_longitude(1,temp64bit), temp64bit); diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c index c8dd476c5a..967e991ed6 100644 --- a/epan/dissectors/packet-mp2t.c +++ b/epan/dissectors/packet-mp2t.c @@ -279,7 +279,7 @@ dissect_tsp( tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, proto_tree *tre offset += 1; proto_tree_add_none_format(mp2t_af_tree, hf_mp2t_af_pcr, tvb, offset - 6, 6, - "Program Clock Reference: base(%" PRIu64 ") * 300 + ext(%u) = %" PRIu64, + "Program Clock Reference: base(%" G_GINT64_MODIFIER "u) * 300 + ext(%u) = %" G_GINT64_MODIFIER "u", pcr_base, pcr_ext, pcr_base * 300 + pcr_ext); } @@ -314,7 +314,7 @@ dissect_tsp( tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, proto_tree *tre offset += 1; proto_tree_add_none_format(mp2t_af_tree, hf_mp2t_af_opcr, tvb, offset - 6, 6, - "Original Program Clock Reference: base(%" PRIu64 ") * 300 + ext(%u) = %" PRIu64, + "Original Program Clock Reference: base(%" G_GINT64_MODIFIER "u) * 300 + ext(%u) = %" G_GINT64_MODIFIER "u", opcr_base, opcr_ext, opcr_base * 300 + opcr_ext); offset += 6; diff --git a/epan/dissectors/packet-nbd.c b/epan/dissectors/packet-nbd.c index 609beec438..abfa103560 100644 --- a/epan/dissectors/packet-nbd.c +++ b/epan/dissectors/packet-nbd.c @@ -358,10 +358,10 @@ dissect_nbd_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) if(check_col(pinfo->cinfo, COL_INFO)){ switch(nbd_trans->type){ case NBD_CMD_WRITE: - col_add_fstr(pinfo->cinfo, COL_INFO, "Write Request Offset:0x%"PRIx64" Length:%d", from, nbd_trans->datalen); + col_add_fstr(pinfo->cinfo, COL_INFO, "Write Request Offset:0x%" G_GINT64_MODIFIER "x Length:%d", from, nbd_trans->datalen); break; case NBD_CMD_READ: - col_add_fstr(pinfo->cinfo, COL_INFO, "Read Request Offset:0x%"PRIx64" Length:%d", from, nbd_trans->datalen); + col_add_fstr(pinfo->cinfo, COL_INFO, "Read Request Offset:0x%" G_GINT64_MODIFIER "x Length:%d", from, nbd_trans->datalen); break; case NBD_CMD_DISC: col_add_str(pinfo->cinfo, COL_INFO, "Disconnect Request"); diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index 1adfe13a76..09c4a03fae 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.c @@ -4498,9 +4498,9 @@ dissect_nfs3_read_call(tvbuff_t *tvb, int offset, packet_info *pinfo, if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO,", FH:0x%08x Offset:%" PRIu64 " Len:%u", hash, off, len); + col_append_fstr(pinfo->cinfo, COL_INFO,", FH:0x%08x Offset:%" G_GINT64_MODIFIER "u Len:%u", hash, off, len); } - proto_item_append_text(tree, ", READ Call FH:0x%08x Offset:%" PRIu64 " Len:%u", hash, off, len); + proto_item_append_text(tree, ", READ Call FH:0x%08x Offset:%" G_GINT64_MODIFIER "u Len:%u", hash, off, len); return offset; } @@ -4595,9 +4595,9 @@ dissect_nfs3_write_call(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = dissect_stable_how(tvb, offset, tree, hf_nfs_write_stable); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO,", FH:0x%08x Offset:%" PRIu64 " Len:%u %s", hash, off, len, val_to_str(stable, names_stable_how, "Stable:%u")); + col_append_fstr(pinfo->cinfo, COL_INFO,", FH:0x%08x Offset:%" G_GINT64_MODIFIER "u Len:%u %s", hash, off, len, val_to_str(stable, names_stable_how, "Stable:%u")); } - proto_item_append_text(tree, ", WRITE Call FH:0x%08x Offset:%" PRIu64 " Len:%u %s", hash, off, len, val_to_str(stable, names_stable_how, "Stable:%u")); + proto_item_append_text(tree, ", WRITE Call FH:0x%08x Offset:%" G_GINT64_MODIFIER "u Len:%u %s", hash, off, len, val_to_str(stable, names_stable_how, "Stable:%u")); offset = dissect_nfsdata (tvb, offset, tree, hf_nfs_data); diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c index 0474818204..b525f5db91 100644 --- a/epan/dissectors/packet-radius.c +++ b/epan/dissectors/packet-radius.c @@ -398,7 +398,7 @@ void radius_integer(radius_attr_info_t* a, proto_tree* tree, packet_info *pinfo case 8: { guint64 uint64 = tvb_get_ntoh64(tvb,offset); proto_tree_add_uint64(tree,a->hf64,tvb,offset,len,uint64); - proto_item_append_text(avp_item, "%" PRIu64, uint64); + proto_item_append_text(avp_item, "%" G_GINT64_MODIFIER "u", uint64); return; } default: diff --git a/epan/dissectors/packet-redback.c b/epan/dissectors/packet-redback.c index d2ffee6747..9fae96d1fd 100644 --- a/epan/dissectors/packet-redback.c +++ b/epan/dissectors/packet-redback.c @@ -72,7 +72,7 @@ dissect_redback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tisub = proto_tree_add_text (subtree, tvb, 4, 4, "Flags: 0x%08x", flags); tisub = proto_tree_add_text (subtree, tvb, 8, 8, - "Circuit: 0x%" PRIx64, circuit); + "Circuit: 0x%" G_GINT64_MODIFIER "x", circuit); tisub = proto_tree_add_text (subtree, tvb, 16, 2, "Length: %u", length); tisub = proto_tree_add_text (subtree, tvb, 18, 2, diff --git a/epan/dissectors/packet-rmt-lct.c b/epan/dissectors/packet-rmt-lct.c index aa9361f7b2..3482e0d940 100644 --- a/epan/dissectors/packet-rmt-lct.c +++ b/epan/dissectors/packet-rmt-lct.c @@ -224,12 +224,12 @@ void lct_ext_decode(struct _ext *e, struct _lct_prefs *prefs, tvbuff_t *tvb, pro void lct_info_column(struct _lct *lct, packet_info *pinfo) { if (lct->tsi_present) - col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "TSI: %" PRIu64, lct->tsi); + col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "TSI: %" G_GINT64_MODIFIER "u", lct->tsi); if (lct->toi_present) { if (lct->toi_size <= 8) - col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "TOI: %" PRIu64, lct->toi); + col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "TOI: %" G_GINT64_MODIFIER "u", lct->toi); else col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "TOI: 0x%s", bytes_to_str(lct->toi_extended, lct->toi_size)); } diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c index 12dc734628..eedd364a93 100644 --- a/epan/dissectors/packet-rsvp.c +++ b/epan/dissectors/packet-rsvp.c @@ -3146,7 +3146,7 @@ dissect_rsvp_integrity (proto_item *ti _U_, proto_tree *rsvp_object_tree, proto_tree_add_text(rsvp_object_tree, tvb, offset2+2, 6, "Key Identifier: %s", tvb_bytes_to_str(tvb, offset2+2, 6)); proto_tree_add_text(rsvp_object_tree, tvb, offset2+8, 8, - "Sequence Number: %" PRIu64, tvb_get_ntoh64(tvb, offset2+8)); + "Sequence Number: %" G_GINT64_MODIFIER "u", tvb_get_ntoh64(tvb, offset2+8)); proto_tree_add_text(rsvp_object_tree, tvb, offset2+16, obj_length - 20, "Hash: %s", tvb_bytes_to_str(tvb, offset2+16, obj_length - 20)); } diff --git a/epan/dissectors/packet-scsi-sbc.c b/epan/dissectors/packet-scsi-sbc.c index 6660f69331..27cfad4796 100644 --- a/epan/dissectors/packet-scsi-sbc.c +++ b/epan/dissectors/packet-scsi-sbc.c @@ -335,7 +335,7 @@ dissect_sbc_synchronizecache16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre if (isreq && iscdb) { if (check_col (pinfo->cinfo, COL_INFO)) - col_append_fstr (pinfo->cinfo, COL_INFO, "(LBA: %" PRIu64 ", Len: %u)", + col_append_fstr (pinfo->cinfo, COL_INFO, "(LBA: %" G_GINT64_MODIFIER "u, Len: %u)", tvb_get_ntoh64 (tvb, offset+1), tvb_get_ntohl (tvb, offset+9)); } @@ -369,7 +369,7 @@ dissect_sbc_prefetch16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (isreq && iscdb) { if (check_col (pinfo->cinfo, COL_INFO)) - col_append_fstr (pinfo->cinfo, COL_INFO, "(LBA: %" PRIu64 ", Len: %u)", + col_append_fstr (pinfo->cinfo, COL_INFO, "(LBA: %" G_GINT64_MODIFIER "u, Len: %u)", tvb_get_ntoh64 (tvb, offset+1), tvb_get_ntohl (tvb, offset+9)); } @@ -698,7 +698,7 @@ dissect_sbc_read16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (isreq && iscdb) { if (check_col (pinfo->cinfo, COL_INFO)) - col_append_fstr (pinfo->cinfo, COL_INFO, "(LBA: %" PRIu64 ", Len: %u)", + col_append_fstr (pinfo->cinfo, COL_INFO, "(LBA: %" G_GINT64_MODIFIER "u, Len: %u)", tvb_get_ntoh64 (tvb, offset+1), tvb_get_ntohl (tvb, offset+9)); } @@ -733,7 +733,7 @@ dissect_sbc_write16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (isreq && iscdb) { if (check_col (pinfo->cinfo, COL_INFO)) - col_append_fstr (pinfo->cinfo, COL_INFO, "(LBA: %" PRIu64 ", Len: %u)", + col_append_fstr (pinfo->cinfo, COL_INFO, "(LBA: %" G_GINT64_MODIFIER "u, Len: %u)", tvb_get_ntoh64 (tvb, offset+1), tvb_get_ntohl (tvb, offset+9)); } @@ -894,7 +894,7 @@ dissect_sbc_verify16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (isreq && iscdb) { if (check_col (pinfo->cinfo, COL_INFO)) - col_append_fstr (pinfo->cinfo, COL_INFO, "(LBA: %" PRIu64 ", Len: %u)", + col_append_fstr (pinfo->cinfo, COL_INFO, "(LBA: %" G_GINT64_MODIFIER "u, Len: %u)", tvb_get_ntoh64 (tvb, offset+1), tvb_get_ntohl (tvb, offset+9)); } @@ -1006,7 +1006,7 @@ dissect_sbc_wrverify16 (tvbuff_t *tvb, packet_info *pinfo _U_, if (isreq && iscdb) { if (check_col (pinfo->cinfo, COL_INFO)) - col_append_fstr (pinfo->cinfo, COL_INFO, "(LBA: %" PRIu64 ", Len: %u)", + col_append_fstr (pinfo->cinfo, COL_INFO, "(LBA: %" G_GINT64_MODIFIER "u, Len: %u)", tvb_get_ntoh64 (tvb, offset+1), tvb_get_ntohl (tvb, offset+9)); } @@ -1326,7 +1326,7 @@ dissect_sbc_serviceactionin16 (tvbuff_t *tvb, packet_info *pinfo _U_, offset++; proto_tree_add_text (tree, tvb, offset, 8, - "Logical Block Address: %" PRIu64, + "Logical Block Address: %" G_GINT64_MODIFIER "u", tvb_get_ntoh64 (tvb, offset)); offset += 8; @@ -1353,7 +1353,7 @@ dissect_sbc_serviceactionin16 (tvbuff_t *tvb, packet_info *pinfo _U_, offset++; proto_tree_add_text (tree, tvb, offset, 8, - "Logical Block Address: %" PRIu64, + "Logical Block Address: %" G_GINT64_MODIFIER "u", tvb_get_ntoh64 (tvb, offset)); offset+=8; @@ -1387,7 +1387,7 @@ dissect_sbc_serviceactionin16 (tvbuff_t *tvb, packet_info *pinfo _U_, tot_len/=1024; un="GB"; } - proto_tree_add_text (tree, tvb, offset, 8, "LBA: %" PRIu64 " (%" PRIu64 " %s)", + proto_tree_add_text (tree, tvb, offset, 8, "LBA: %" G_GINT64_MODIFIER "u (%" G_GINT64_MODIFIER "u %s)", len, tot_len, un); proto_tree_add_item (tree, hf_scsi_sbc_blocksize, tvb, offset+8, 4, 0); break; diff --git a/epan/dissectors/packet-scsi-ssc.c b/epan/dissectors/packet-scsi-ssc.c index 2b650e3b85..a4508570e1 100644 --- a/epan/dissectors/packet-scsi-ssc.c +++ b/epan/dissectors/packet-scsi-ssc.c @@ -963,7 +963,7 @@ dissect_ssc_readposition (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre offset += 4; proto_tree_add_text (tree, tvb, offset, 8, - "Block Number: %" PRIu64, + "Block Number: %" G_GINT64_MODIFIER "u", tvb_get_ntoh64 (tvb, offset)); offset += 8; } else @@ -971,12 +971,12 @@ dissect_ssc_readposition (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre if (!(flags & MPU)) { proto_tree_add_text (tree, tvb, offset, 8, - "File Number: %" PRIu64, + "File Number: %" G_GINT64_MODIFIER "u", tvb_get_ntoh64 (tvb, offset)); offset += 8; proto_tree_add_text (tree, tvb, offset, 8, - "Set Number: %" PRIu64, + "Set Number: %" G_GINT64_MODIFIER "u", tvb_get_ntoh64 (tvb, offset)); offset += 8; } else @@ -1012,12 +1012,12 @@ dissect_ssc_readposition (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre if (!(flags & BPU)) { proto_tree_add_text (tree, tvb, offset, 8, - "First Block Location: %" PRIu64, + "First Block Location: %" G_GINT64_MODIFIER "u", tvb_get_ntoh64 (tvb, offset)); offset += 8; proto_tree_add_text (tree, tvb, offset, 8, - "Last Block Location: %" PRIu64, + "Last Block Location: %" G_GINT64_MODIFIER "u", tvb_get_ntoh64 (tvb, offset)); offset += 8; } else @@ -1027,7 +1027,7 @@ dissect_ssc_readposition (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre if (!(flags & BYCU)) { proto_tree_add_text (tree, tvb, offset, 8, - "Number of Bytes in Buffer: %" PRIu64, + "Number of Bytes in Buffer: %" G_GINT64_MODIFIER "u", tvb_get_ntoh64 (tvb, offset)); } offset += 8; diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c index 4e1e9c04f1..77313f0a53 100644 --- a/epan/dissectors/packet-scsi.c +++ b/epan/dissectors/packet-scsi.c @@ -2407,7 +2407,7 @@ dissect_scsi_blockdescs (tvbuff_t *tvb, packet_info *pinfo _U_, if (longlba) { if(tvb_length_remaining(tvb, offset)<8) return; - proto_tree_add_text (scsi_tree, tvb, offset, 8, "No. of Blocks: %" PRIu64, + proto_tree_add_text (scsi_tree, tvb, offset, 8, "No. of Blocks: %" G_GINT64_MODIFIER "u", tvb_get_ntoh64 (tvb, offset)); offset += 8; diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index 6ad623bd11..5009f0237d 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -2778,7 +2778,7 @@ dissect_smb2_write_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += 8; if (check_col(pinfo->cinfo, COL_INFO)){ - col_append_fstr(pinfo->cinfo, COL_INFO, " Len:%d Off:%" PRIu64, length, off); + col_append_fstr(pinfo->cinfo, COL_INFO, " Len:%d Off:%" G_GINT64_MODIFIER "u", length, off); } /* fid */ @@ -3183,7 +3183,7 @@ dissect_smb2_read_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, i offset += 8; if (check_col(pinfo->cinfo, COL_INFO)){ - col_append_fstr(pinfo->cinfo, COL_INFO, " Len:%d Off:%" PRIu64, len, off); + col_append_fstr(pinfo->cinfo, COL_INFO, " Len:%d Off:%" G_GINT64_MODIFIER "u", len, off); } /* fid */ diff --git a/epan/proto.c b/epan/proto.c index ab5ce4952d..9727210cf0 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -4550,19 +4550,19 @@ hfinfo_uint64_format(header_field_info *hfinfo) /* Pick the proper format string */ switch(hfinfo->display) { case BASE_DEC: - format = "%s: %" PRIu64; + format = "%s: %" G_GINT64_MODIFIER "u"; break; case BASE_DEC_HEX: - format = "%s: %" PRIu64 " (%" PRIx64 ")"; + format = "%s: %" G_GINT64_MODIFIER "u (%" G_GINT64_MODIFIER "x)"; break; case BASE_OCT: /* I'm lazy */ - format = "%s: %" PRIo64; + format = "%s: %" G_GINT64_MODIFIER "o"; break; case BASE_HEX: - format = "%s: 0x%016" PRIx64; + format = "%s: 0x%016" G_GINT64_MODIFIER "x"; break; case BASE_HEX_DEC: - format = "%s: 0x%016" PRIx64 " (%" PRIu64 ")"; + format = "%s: 0x%016" G_GINT64_MODIFIER "x (%" G_GINT64_MODIFIER "u)"; break; default: DISSECTOR_ASSERT_NOT_REACHED(); @@ -4655,19 +4655,19 @@ hfinfo_int64_format(header_field_info *hfinfo) /* Pick the proper format string */ switch(hfinfo->display) { case BASE_DEC: - format = "%s: %" PRId64; + format = "%s: %" G_GINT64_MODIFIER "d"; break; case BASE_DEC_HEX: - format = "%s: %" PRId64 " (%" PRIx64 ")"; + format = "%s: %" G_GINT64_MODIFIER "d (%" G_GINT64_MODIFIER "x)"; break; case BASE_OCT: /* I'm lazy */ - format = "%s: %" PRIo64; + format = "%s: %" G_GINT64_MODIFIER "o"; break; case BASE_HEX: - format = "%s: 0x%016" PRIx64; + format = "%s: 0x%016" G_GINT64_MODIFIER "x"; break; case BASE_HEX_DEC: - format = "%s: 0x%016" PRIx64 " (%" PRId64 ")"; + format = "%s: 0x%016" G_GINT64_MODIFIER "x (%" G_GINT64_MODIFIER "d)"; break; default: DISSECTOR_ASSERT_NOT_REACHED(); @@ -5200,7 +5200,7 @@ hfinfo_numeric_format(header_field_info *hfinfo) format = "%s == %u"; break; case FT_UINT64: - format = "%s == %" PRIu64; + format = "%s == %" G_GINT64_MODIFIER "u"; break; case FT_INT8: case FT_INT16: @@ -5209,7 +5209,7 @@ hfinfo_numeric_format(header_field_info *hfinfo) format = "%s == %d"; break; case FT_INT64: - format = "%s == %" PRId64; + format = "%s == %" G_GINT64_MODIFIER "d"; break; default: DISSECTOR_ASSERT_NOT_REACHED(); @@ -5232,7 +5232,7 @@ hfinfo_numeric_format(header_field_info *hfinfo) format = "%s == 0x%08x"; break; case FT_UINT64: - format = "%s == 0x%016" PRIx64; + format = "%s == 0x%016" G_GINT64_MODIFIER "x"; break; default: DISSECTOR_ASSERT_NOT_REACHED(); @@ -473,7 +473,7 @@ cf_read(capture_file *cf) #endif g_snprintf(status_str, sizeof(status_str), - "%" PRId64 "KB of %" PRId64 "KB", + "%" G_GINT64_MODIFIER "dKB of %" G_GINT64_MODIFIER "dKB", file_pos / 1024, size / 1024); update_progress_dlg(progbar, progbar_val, status_str); } @@ -1236,7 +1236,7 @@ cf_merge_files(char **out_filenamep, int in_file_count, } if (progbar != NULL) { g_snprintf(status_str, sizeof(status_str), - "%" PRId64 "KB of %" PRId64 "KB", + "%" G_GINT64_MODIFIER "dKB of %" G_GINT64_MODIFIER "dKB", file_pos / 1024, f_len / 1024); update_progress_dlg(progbar, progbar_val, status_str); } diff --git a/gtk/capture_file_dlg.c b/gtk/capture_file_dlg.c index d972e103f0..4742ecca15 100644 --- a/gtk/capture_file_dlg.c +++ b/gtk/capture_file_dlg.c @@ -177,7 +177,7 @@ preview_set_filename(GtkWidget *prev, const gchar *cf_name) wtap_close(wth); return NULL; } - g_snprintf(string_buff, PREVIEW_STR_MAX, "%" PRId64 " bytes", filesize); + g_snprintf(string_buff, PREVIEW_STR_MAX, "%" G_GINT64_MODIFIER "d bytes", filesize); label = OBJECT_GET_DATA(prev, PREVIEW_SIZE_KEY); gtk_label_set_text(GTK_LABEL(label), string_buff); diff --git a/gtk/conversations_table.c b/gtk/conversations_table.c index 06d6ddba22..b0a9d5a92b 100644 --- a/gtk/conversations_table.c +++ b/gtk/conversations_table.c @@ -1117,21 +1117,21 @@ draw_ct_table_data(conversations_table *ct) j=gtk_clist_find_row_from_data(ct->table, (gpointer)(unsigned long)i); - g_snprintf(str, 16, "%" PRIu64, ct->conversations[i].tx_frames+ct->conversations[i].rx_frames); + g_snprintf(str, 16, "%" G_GINT64_MODIFIER "u", ct->conversations[i].tx_frames+ct->conversations[i].rx_frames); gtk_clist_set_text(ct->table, j, 4, str); - g_snprintf(str, 16, "%" PRIu64, ct->conversations[i].tx_bytes+ct->conversations[i].rx_bytes); + g_snprintf(str, 16, "%" G_GINT64_MODIFIER "u", ct->conversations[i].tx_bytes+ct->conversations[i].rx_bytes); gtk_clist_set_text(ct->table, j, 5, str); - g_snprintf(str, 16, "%" PRIu64, ct->conversations[i].tx_frames); + g_snprintf(str, 16, "%" G_GINT64_MODIFIER "u", ct->conversations[i].tx_frames); gtk_clist_set_text(ct->table, j, 6, str); - g_snprintf(str, 16, "%" PRIu64, ct->conversations[i].tx_bytes); + g_snprintf(str, 16, "%" G_GINT64_MODIFIER "u", ct->conversations[i].tx_bytes); gtk_clist_set_text(ct->table, j, 7, str); - g_snprintf(str, 16, "%" PRIu64, ct->conversations[i].rx_frames); + g_snprintf(str, 16, "%" G_GINT64_MODIFIER "u", ct->conversations[i].rx_frames); gtk_clist_set_text(ct->table, j, 8, str); - g_snprintf(str, 16, "%" PRIu64, ct->conversations[i].rx_bytes); + g_snprintf(str, 16, "%" G_GINT64_MODIFIER "u", ct->conversations[i].rx_bytes); gtk_clist_set_text(ct->table, j, 9, str); } @@ -1668,19 +1668,19 @@ add_conversation_table_data(conversations_table *ct, const address *src, const a entries[2] = ""; entries[3] = ""; - g_snprintf(frames, 16, "%" PRIu64, conversation->tx_frames+conversation->rx_frames); + g_snprintf(frames, 16, "%" G_GINT64_MODIFIER "u", conversation->tx_frames+conversation->rx_frames); entries[4]=frames; - g_snprintf(bytes, 16, "%" PRIu64, conversation->tx_bytes+conversation->rx_bytes); + g_snprintf(bytes, 16, "%" G_GINT64_MODIFIER "u", conversation->tx_bytes+conversation->rx_bytes); entries[5]=bytes; - g_snprintf(txframes, 16, "%" PRIu64, conversation->tx_frames); + g_snprintf(txframes, 16, "%" G_GINT64_MODIFIER "u", conversation->tx_frames); entries[6]=txframes; - g_snprintf(txbytes, 16, "%" PRIu64, conversation->tx_bytes); + g_snprintf(txbytes, 16, "%" G_GINT64_MODIFIER "u", conversation->tx_bytes); entries[7]=txbytes; - g_snprintf(rxframes, 16, "%" PRIu64, conversation->rx_frames); + g_snprintf(rxframes, 16, "%" G_GINT64_MODIFIER "u", conversation->rx_frames); entries[8]=rxframes; - g_snprintf(rxbytes, 16, "%" PRIu64, conversation->rx_bytes); + g_snprintf(rxbytes, 16, "%" G_GINT64_MODIFIER "u", conversation->rx_bytes); entries[9]=rxbytes; gtk_clist_insert(ct->table, conversation_idx, entries); diff --git a/gtk/hostlist_table.c b/gtk/hostlist_table.c index 0911d5e152..c04cf487ff 100644 --- a/gtk/hostlist_table.c +++ b/gtk/hostlist_table.c @@ -546,21 +546,21 @@ draw_hostlist_table_data(hostlist_table *hl) j=gtk_clist_find_row_from_data(hl->table, (gpointer)(unsigned long)i); - g_snprintf(str, 16, "%" PRIu64, hl->hosts[i].tx_frames+hl->hosts[i].rx_frames); + g_snprintf(str, 16, "%" G_GINT64_MODIFIER "u", hl->hosts[i].tx_frames+hl->hosts[i].rx_frames); gtk_clist_set_text(hl->table, j, 2, str); - g_snprintf(str, 16, "%" PRIu64, hl->hosts[i].tx_bytes+hl->hosts[i].rx_bytes); + g_snprintf(str, 16, "%" G_GINT64_MODIFIER "u", hl->hosts[i].tx_bytes+hl->hosts[i].rx_bytes); gtk_clist_set_text(hl->table, j, 3, str); - g_snprintf(str, 16, "%" PRIu64, hl->hosts[i].tx_frames); + g_snprintf(str, 16, "%" G_GINT64_MODIFIER "u", hl->hosts[i].tx_frames); gtk_clist_set_text(hl->table, j, 4, str); - g_snprintf(str, 16, "%" PRIu64, hl->hosts[i].tx_bytes); + g_snprintf(str, 16, "%" G_GINT64_MODIFIER "u", hl->hosts[i].tx_bytes); gtk_clist_set_text(hl->table, j, 5, str); - g_snprintf(str, 16, "%" PRIu64, hl->hosts[i].rx_frames); + g_snprintf(str, 16, "%" G_GINT64_MODIFIER "u", hl->hosts[i].rx_frames); gtk_clist_set_text(hl->table, j, 6, str); - g_snprintf(str, 16, "%" PRIu64, hl->hosts[i].rx_bytes); + g_snprintf(str, 16, "%" G_GINT64_MODIFIER "u", hl->hosts[i].rx_bytes); gtk_clist_set_text(hl->table, j, 7, str); } @@ -1052,24 +1052,24 @@ add_hostlist_table_data(hostlist_table *hl, const address *addr, guint32 port, g entries[0]=""; entries[1]=""; - g_snprintf(frames, 16, "%" PRIu64, talker->tx_frames+talker->rx_frames); + g_snprintf(frames, 16, "%" G_GINT64_MODIFIER "u", talker->tx_frames+talker->rx_frames); entries[2]=frames; - g_snprintf(bytes, 16, "%" PRIu64, talker->tx_bytes+talker->rx_bytes); + g_snprintf(bytes, 16, "%" G_GINT64_MODIFIER "u", talker->tx_bytes+talker->rx_bytes); entries[3]=bytes; - g_snprintf(txframes, 16, "%" PRIu64, talker->tx_frames); + g_snprintf(txframes, 16, "%" G_GINT64_MODIFIER "u", talker->tx_frames); entries[4]=txframes; - g_snprintf(txbytes, 16, "%" PRIu64, talker->tx_bytes); + g_snprintf(txbytes, 16, "%" G_GINT64_MODIFIER "u", talker->tx_bytes); entries[5]=txbytes; - g_snprintf(rxframes, 16, "%" PRIu64, talker->rx_frames); + g_snprintf(rxframes, 16, "%" G_GINT64_MODIFIER "u", talker->rx_frames); entries[6]=rxframes; - g_snprintf(rxbytes, 16, "%" PRIu64, talker->rx_bytes); + g_snprintf(rxbytes, 16, "%" G_GINT64_MODIFIER "u", talker->rx_bytes); entries[7]=rxbytes; gtk_clist_insert(hl->table, talker_idx, entries); gtk_clist_set_row_data(hl->table, talker_idx, (gpointer)(long) talker_idx); - draw_hostlist_table_address(hl, talker_idx); + draw_hostlist_table_address(hl, talker_idx); } } diff --git a/gtk/service_response_time_table.c b/gtk/service_response_time_table.c index 46146a9ae9..a7c3838ad8 100644 --- a/gtk/service_response_time_table.c +++ b/gtk/service_response_time_table.c @@ -530,7 +530,7 @@ draw_srt_table_data(srt_stat_table *rst) g_free(rst->procedures[i].entries[4]); rst->procedures[i].entries[4]=strp; - strp=g_strdup_printf("%3" PRId64 ".%05" PRId64, + strp=g_strdup_printf("%3" G_GINT64_MODIFIER "d.%05" G_GINT64_MODIFIER "d", td/100000, td%100000); gtk_clist_set_text(rst->table, j, 5, strp); g_free(rst->procedures[i].entries[5]); diff --git a/gtk/summary_dlg.c b/gtk/summary_dlg.c index a466254e7c..d749048989 100644 --- a/gtk/summary_dlg.c +++ b/gtk/summary_dlg.c @@ -214,7 +214,7 @@ summary_open_cb(GtkWidget *w _U_, gpointer d _U_) /* Dropped count */ if (summary.drops_known) { - g_snprintf(string_buff, SUM_STR_MAX, "%" PRIu64, summary.drops); + g_snprintf(string_buff, SUM_STR_MAX, "%" G_GINT64_MODIFIER "u", summary.drops); } else { g_snprintf(string_buff, SUM_STR_MAX, "unknown"); } @@ -320,9 +320,9 @@ summary_open_cb(GtkWidget *w _U_, gpointer d _U_) add_string_to_list(list, "Avg. packet size", string_buff, string_buff2); /* Byte count */ - g_snprintf(string_buff, SUM_STR_MAX, "%" PRIu64, summary.bytes); + g_snprintf(string_buff, SUM_STR_MAX, "%" G_GINT64_MODIFIER "u", summary.bytes); if (summary.dfilter && summary.filtered_count > 0){ - g_snprintf(string_buff2, SUM_STR_MAX, "%" PRIu64, summary.filtered_bytes); + g_snprintf(string_buff2, SUM_STR_MAX, "%" G_GINT64_MODIFIER "u", summary.filtered_bytes); } else { strcpy(string_buff2, ""); } diff --git a/plugins/giop/packet-parlay.c b/plugins/giop/packet-parlay.c index a77111faba..7937003062 100644 --- a/plugins/giop/packet-parlay.c +++ b/plugins/giop/packet-parlay.c @@ -74632,7 +74632,7 @@ static void decode_org_csapi_pam_access_IpPAMIdentityPresence_setIdentityPresenc s_octet8 = get_CDR_long_long(tvb,offset,stream_is_big_endian, boundary); if (tree) { - proto_tree_add_text(tree,tvb,*offset-8,8,"expiresIn = %" PRId64,s_octet8); + proto_tree_add_text(tree,tvb,*offset-8,8,"expiresIn = %" G_GINT64_MODIFIER "d",s_octet8); } u_octet4_loop_authToken = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary); @@ -75125,7 +75125,7 @@ static void decode_org_csapi_pam_access_IpPAMAgentPresence_setAgentPresenceExpir s_octet8 = get_CDR_long_long(tvb,offset,stream_is_big_endian, boundary); if (tree) { - proto_tree_add_text(tree,tvb,*offset-8,8,"expiresIn = %" PRId64,s_octet8); + proto_tree_add_text(tree,tvb,*offset-8,8,"expiresIn = %" G_GINT64_MODIFIER "d",s_octet8); } u_octet4_loop_authToken = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary); @@ -75249,7 +75249,7 @@ static void decode_org_csapi_pam_access_IpPAMAgentPresence_setCapabilityPresence s_octet8 = get_CDR_long_long(tvb,offset,stream_is_big_endian, boundary); if (tree) { - proto_tree_add_text(tree,tvb,*offset-8,8,"expiresIn = %" PRId64,s_octet8); + proto_tree_add_text(tree,tvb,*offset-8,8,"expiresIn = %" G_GINT64_MODIFIER "d",s_octet8); } u_octet4_loop_authToken = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary); @@ -93288,7 +93288,7 @@ static void decode_org_csapi_pam_TpPAMAttribute_st(tvbuff_t *tvb _U_, packet_inf s_octet8 = get_CDR_long_long(tvb,offset,stream_is_big_endian, boundary); if (tree) { - proto_tree_add_text(tree,tvb,*offset-8,8,"TpPAMAttribute_ExpiresIn = %" PRId64,s_octet8); + proto_tree_add_text(tree,tvb,*offset-8,8,"TpPAMAttribute_ExpiresIn = %" G_GINT64_MODIFIER "d",s_octet8); } } @@ -94488,7 +94488,7 @@ static void decode_org_csapi_pam_TpPAMACPSEventData_st(tvbuff_t *tvb _U_, packet s_octet8 = get_CDR_long_long(tvb,offset,stream_is_big_endian, boundary); if (tree) { - proto_tree_add_text(tree,tvb,*offset-8,8,"TpPAMACPSEventData_ReportingPeriod = %" PRId64,s_octet8); + proto_tree_add_text(tree,tvb,*offset-8,8,"TpPAMACPSEventData_ReportingPeriod = %" G_GINT64_MODIFIER "d",s_octet8); } } @@ -94628,7 +94628,7 @@ static void decode_org_csapi_pam_TpPAMAPSEventData_st(tvbuff_t *tvb _U_, packet_ s_octet8 = get_CDR_long_long(tvb,offset,stream_is_big_endian, boundary); if (tree) { - proto_tree_add_text(tree,tvb,*offset-8,8,"TpPAMAPSEventData_ReportingPeriod = %" PRId64,s_octet8); + proto_tree_add_text(tree,tvb,*offset-8,8,"TpPAMAPSEventData_ReportingPeriod = %" G_GINT64_MODIFIER "d",s_octet8); } } @@ -94759,7 +94759,7 @@ static void decode_org_csapi_pam_TpPAMIPSEventData_st(tvbuff_t *tvb _U_, packet_ s_octet8 = get_CDR_long_long(tvb,offset,stream_is_big_endian, boundary); if (tree) { - proto_tree_add_text(tree,tvb,*offset-8,8,"TpPAMIPSEventData_ReportingPeriod = %" PRId64,s_octet8); + proto_tree_add_text(tree,tvb,*offset-8,8,"TpPAMIPSEventData_ReportingPeriod = %" G_GINT64_MODIFIER "d",s_octet8); } } @@ -94908,7 +94908,7 @@ static void decode_org_csapi_pam_TpPAMAVCEventData_st(tvbuff_t *tvb _U_, packet_ s_octet8 = get_CDR_long_long(tvb,offset,stream_is_big_endian, boundary); if (tree) { - proto_tree_add_text(tree,tvb,*offset-8,8,"TpPAMAVCEventData_ReportingPeriod = %" PRId64,s_octet8); + proto_tree_add_text(tree,tvb,*offset-8,8,"TpPAMAVCEventData_ReportingPeriod = %" G_GINT64_MODIFIER "d",s_octet8); } } @@ -95035,7 +95035,7 @@ static void decode_org_csapi_pam_TpPAMWCEventData_st(tvbuff_t *tvb _U_, packet_i s_octet8 = get_CDR_long_long(tvb,offset,stream_is_big_endian, boundary); if (tree) { - proto_tree_add_text(tree,tvb,*offset-8,8,"TpPAMWCEventData_ReportingPeriod = %" PRId64,s_octet8); + proto_tree_add_text(tree,tvb,*offset-8,8,"TpPAMWCEventData_ReportingPeriod = %" G_GINT64_MODIFIER "d",s_octet8); } } @@ -96147,7 +96147,7 @@ static void decode_org_csapi_TpSimpleAttributeValue_un(tvbuff_t *tvb _U_, packet s_octet8 = get_CDR_long_long(tvb,offset,stream_is_big_endian, boundary); if (tree) { - proto_tree_add_text(tree,tvb,*offset-8,8,"Int64Value = %" PRId64,s_octet8); + proto_tree_add_text(tree,tvb,*offset-8,8,"Int64Value = %" G_GINT64_MODIFIER "d",s_octet8); } return; /* End Compare for this discriminant type */ @@ -96157,7 +96157,7 @@ static void decode_org_csapi_TpSimpleAttributeValue_un(tvbuff_t *tvb _U_, packet u_octet8 = get_CDR_ulong_long(tvb,offset,stream_is_big_endian, boundary); if (tree) { - proto_tree_add_text(tree,tvb,*offset-8,8,"UnsignedInt64Value = %" PRIu64,u_octet8); + proto_tree_add_text(tree,tvb,*offset-8,8,"UnsignedInt64Value = %" G_GINT64_MODIFIER "u",u_octet8); } return; /* End Compare for this discriminant type */ diff --git a/plugins/profinet/packet-pn-ptcp.c b/plugins/profinet/packet-pn-ptcp.c index 4b5b4f92f8..a1a597da67 100644 --- a/plugins/profinet/packet-pn-ptcp.c +++ b/plugins/profinet/packet-pn-ptcp.c @@ -586,19 +586,19 @@ dissect_PNPTCP_Header(tvbuff_t *tvb, int offset, delayms = (guint32) (delayns / (1000 * 1000)); if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, ", Delay=%11" PRIu64 "ns", + col_append_fstr(pinfo->cinfo, COL_INFO, ", Delay=%11" G_GINT64_MODIFIER "uns", delayns); - proto_item_append_text(item, ", Delay=%" PRIu64 "ns", delayns); + proto_item_append_text(item, ", Delay=%" G_GINT64_MODIFIER "uns", delayns); if(delayns != 0) { - proto_item_append_text(header_item, ", Delay=%" PRIu64 "ns (%u.%03u,%03u,%03u sec)", + proto_item_append_text(header_item, ", Delay=%" G_GINT64_MODIFIER "uns (%u.%03u,%03u,%03u sec)", delayns, delayms / 1000, delayms % 1000, (delay10ns % (1000*100)) / 100, delay10ns % 100 * 10 + delay1ns); } else { - proto_item_append_text(header_item, ", Delay=%" PRIu64 "ns", + proto_item_append_text(header_item, ", Delay=%" G_GINT64_MODIFIER "uns", delayns); } } diff --git a/plugins/rtnet/packet-rtnet.c b/plugins/rtnet/packet-rtnet.c index 5801752e95..b5b457672b 100644 --- a/plugins/rtnet/packet-rtnet.c +++ b/plugins/rtnet/packet-rtnet.c @@ -479,7 +479,7 @@ dissect_tdma_sync(tvbuff_t *tvb, guint offset, proto_tree *tree) { ti = proto_tree_add_item(tree, hf_tdma_sync_xmit_stamp, tvb, offset, 8, FALSE); time = tvb_get_ntoh64(tvb, offset) - tvb_get_ntoh64(tvb, offset+8); - proto_item_append_text(ti, " (%s%" PRId64 ")", (time > 0) ? "+" : "", time); + proto_item_append_text(ti, " (%s%" G_GINT64_MODIFIER "d)", (time > 0) ? "+" : "", time); offset += 8; proto_tree_add_item(tree, hf_tdma_sync_sched_xmit, tvb, offset, 8, FALSE); @@ -511,7 +511,7 @@ dissect_tdma_reply_cal(tvbuff_t *tvb, guint offset, proto_tree *tree) { offset += 8; ti = proto_tree_add_item(tree, hf_tdma_rpl_cal_xmit_stamp, tvb, offset, 8, FALSE); - proto_item_append_text(ti, " (%s%" PRId64 ")", (time > 0) ? "+" : "", time); + proto_item_append_text(ti, " (%s%" G_GINT64_MODIFIER "d)", (time > 0) ? "+" : "", time); } static void diff --git a/tools/wireshark_gen.py b/tools/wireshark_gen.py index e405390da9..a6db73f122 100644 --- a/tools/wireshark_gen.py +++ b/tools/wireshark_gen.py @@ -1901,13 +1901,13 @@ if (tree) { template_get_CDR_longlong = """\ s_octet8 = get_CDR_long_long(tvb,offset,stream_is_big_endian, boundary); if (tree) { - proto_tree_add_text(tree,tvb,*offset-8,8,"@varname@ = %" PRId64,s_octet8); + proto_tree_add_text(tree,tvb,*offset-8,8,"@varname@ = %" G_GINT64_MODIFIER "d",s_octet8); } """ template_get_CDR_ulonglong = """\ u_octet8 = get_CDR_ulong_long(tvb,offset,stream_is_big_endian, boundary); if (tree) { - proto_tree_add_text(tree,tvb,*offset-8,8,"@varname@ = %" PRIu64,u_octet8); + proto_tree_add_text(tree,tvb,*offset-8,8,"@varname@ = %" G_GINT64_MODIFIER "u",u_octet8); } """ template_get_CDR_boolean = """\ |