s/%ll/%" G_GINT64_MODIFIER "/g

svn path=/trunk/; revision=24181

6 files changed, 19 insertions, 19 deletions

diff --git a/epan/dissectors/packet-ansi_801.c b/epan/dissectors/packet-ansi_801.c
index dac6e2a760..0e26d06e3a 100644
--- a/epan/dissectors/packet-ansi_801.c
+++ b/epan/dissectors/packet-ansi_801.c
@@ -1103,7 +1103,7 @@ pr_loc_response(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset)
 	temp_int |= ((value & bit_mask) >> (16 - (18 - bit_offset)));
 
 	proto_tree_add_text(tree, tvb, offset-1, 1,
-	    "%s :  CLOCK_DRIFT: (MSB) (%llu)",
+	    "%s :  CLOCK_DRIFT: (MSB) (%" G_GINT64_MODIFIER "u)",
 	    bigbuf,
 	    temp_int);
 
diff --git a/epan/dissectors/packet-dcp.c b/epan/dissectors/packet-dcp.c
index df2e63f694..89e671b68b 100644
--- a/epan/dissectors/packet-dcp.c
+++ b/epan/dissectors/packet-dcp.c
@@ -298,18 +298,18 @@ static guint64 tvb_get_ntoh_var(tvbuff_t *tvb, gint offset, guint nbytes)
         return value;
 }
 
-static void dissect_feature_options(proto_tree *dcp_options_tree, tvbuff_t *tvb, int offset, guint8 option_len, 
+static void dissect_feature_options(proto_tree *dcp_options_tree, tvbuff_t *tvb, int offset, guint8 option_len,
 				    guint8 option_type)
 {
 	guint8 feature_number = tvb_get_guint8(tvb, offset + 2);
 	proto_item *dcp_item;
 	int i;
-	
+
 	proto_tree_add_uint_hidden(dcp_options_tree, hf_dcp_feature_number, tvb, offset + 2, 1, feature_number);
 
 	dcp_item = proto_tree_add_text(dcp_options_tree, tvb, offset, option_len, "%s(",
 				       val_to_str(option_type, dcp_feature_options_vals, "Unknown Type"));
-		
+
 	/* decode the feature according to whether it is server-priority (list) or NN (single number) */
 	switch (feature_number) {
 	/*		Server Priority features (RFC 4340, 6.3.1)		*/
@@ -321,21 +321,21 @@ static void dissect_feature_options(proto_tree *dcp_options_tree, tvbuff_t *tvb,
 	case 8:			/* Minimum Checksum Coverage; fall through	*/
 	case 9:			/* Check Data Checksum; fall through		*/
 	case 192:		/* Send Loss Event Rate, RFC 4342, section 8.4	*/
-		proto_item_append_text(dcp_item, "%s", 
+		proto_item_append_text(dcp_item, "%s",
 				       val_to_str(feature_number, dcp_feature_numbers_vals, "Unknown Type"));
-		for (i = 0; i < option_len - 3; i++) 
+		for (i = 0; i < option_len - 3; i++)
 			proto_item_append_text(dcp_item, "%s %d", i? "," : "", tvb_get_guint8(tvb, offset + 3 + i));
 		break;
 	/*	 Non-negotiable features (RFC 4340, 6.3.2)	 */
 	case 3:			/* Sequence Window; fall through */
 	case 5: 		/* Ack Ratio			 */
-		proto_item_append_text(dcp_item, "%s", 
+		proto_item_append_text(dcp_item, "%s",
 				       val_to_str(feature_number, dcp_feature_numbers_vals, "Unknown Type"));
 
 		if (option_len > 3)	/* could be empty Confirm */
 			proto_item_append_text(dcp_item, " %" G_GINT64_MODIFIER "u", tvb_get_ntoh_var(tvb, offset + 3, option_len - 3));
 		break;
-	/* Reserved, specific, or unknown features */		
+	/* Reserved, specific, or unknown features */
 	default:
 		if (feature_number == 0 ||
 		    (feature_number >= 10 && feature_number <= 127))
@@ -440,7 +440,7 @@ static void dissect_options(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *d
 
 		case 38:
 			dcp_item = proto_tree_add_text(dcp_options_tree, tvb, offset, option_len, "Ack Vector [Nonce 0]:");
-			for (i = 0; i < option_len - 2; i++) 
+			for (i = 0; i < option_len - 2; i++)
 				proto_item_append_text(dcp_item, " %02x", tvb_get_guint8(tvb, offset + 2 + i));
 			break;
 
@@ -453,7 +453,7 @@ static void dissect_options(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *d
 
 		case 40:
 			dcp_item = proto_tree_add_text(dcp_options_tree, tvb, offset, option_len, "Data Dropped:");
-			for (i = 0; i < option_len - 2; i++) 
+			for (i = 0; i < option_len - 2; i++)
 				proto_item_append_text(dcp_item, " %02x", tvb_get_guint8(tvb, offset + 2 + i));
 			break;
 
@@ -636,12 +636,12 @@ static void dissect_dcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		dcph->seq=tvb_get_ntohs(tvb, offset+10);
 		dcph->seq<<=32;
 		dcph->seq+=tvb_get_ntohl(tvb, offset+12);
-		/* DBG("dcph->seq[48bits]: %llu\n", dcph->seq); */
+		/* DBG("dcph->seq[48bits]: %" G_GINT64_MODIFIER "u\n", dcph->seq); */
 	} else {
 		dcph->seq=tvb_get_guint8(tvb, offset+9);
 		dcph->seq<<=16;
 		dcph->seq+=tvb_get_ntohs(tvb, offset+10);
-		/* DBG("dcph->seq[24bits]: %llu\n", dcph->seq); */
+		/* DBG("dcph->seq[24bits]: %" G_GINT64_MODIFIER "u\n", dcph->seq); */
 	}
 
 	if (check_col(pinfo->cinfo, COL_INFO))
diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c
index d6bbc930ad..1ce8b4ec34 100644
--- a/epan/dissectors/packet-mysql.c
+++ b/epan/dissectors/packet-mysql.c
@@ -1034,7 +1034,7 @@ static void dissect_mysql_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
 	generation= conn_data->generation;
 	if (tree) {
 		proto_tree_add_text(mysql_tree, tvb, offset, 0, "conversation: %p", conversation);
-		proto_tree_add_text(mysql_tree, tvb, offset, 0, "generation: %lld", generation);
+		proto_tree_add_text(mysql_tree, tvb, offset, 0, "generation: %" G_GINT64_MODIFIER "d", generation);
 		proto_tree_add_text(mysql_tree, tvb, offset, 0, "proto state: %s (%u)",
 				    val_to_str(state_in, state_vals, "Unknown (%u)"),
 				    state_in);
diff --git a/gtk/main.c b/gtk/main.c
index bbf3b971f4..ab9fb78133 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1767,7 +1767,7 @@ main_cf_cb_live_capture_update_continue(capture_file *cf)
 #if 0
     /* XXX - don't show the highest expert level unless the TCP checksum offloading is "solved" */
     if (cf->f_datalen/1024/1024 > 10) {
-        capture_msg = g_strdup_printf(" %s: <live capture in progress> File: %s %lld MB [Expert: %s]",
+        capture_msg = g_strdup_printf(" %s: <live capture in progress> File: %s %" G_GINT64_MODIFIER "d MB [Expert: %s]",
 				      get_iface_description(capture_opts),
 				      capture_opts->save_file,
 				      cf->f_datalen/1024/1024,
@@ -1775,7 +1775,7 @@ main_cf_cb_live_capture_update_continue(capture_file *cf)
 						 expert_severity_vals,
 						 "Unknown (%u)"));
     } else if (cf->f_datalen/1024 > 10) {
-        capture_msg = g_strdup_printf(" %s: <live capture in progress> File: %s %lld KB [Expert: %s]",
+        capture_msg = g_strdup_printf(" %s: <live capture in progress> File: %s %" G_GINT64_MODIFIER "d KB [Expert: %s]",
 				      get_iface_description(capture_opts),
 				      capture_opts->save_file,
 				      cf->f_datalen/1024,
@@ -1783,7 +1783,7 @@ main_cf_cb_live_capture_update_continue(capture_file *cf)
 						 expert_severity_vals,
 						 "Unknown (%u)"));
     } else {
-        capture_msg = g_strdup_printf(" %s: <live capture in progress> File: %s %lld Bytes [Expert: %s]",
+        capture_msg = g_strdup_printf(" %s: <live capture in progress> File: %s %" G_GINT64_MODIFIER "d Bytes [Expert: %s]",
 				      get_iface_description(capture_opts),
 				      capture_opts->save_file,
 				      cf->f_datalen,
diff --git a/wiretap/file_wrappers.c b/wiretap/file_wrappers.c
index d7b5e4dd38..99bcc57d62 100644
--- a/wiretap/file_wrappers.c
+++ b/wiretap/file_wrappers.c
@@ -268,7 +268,7 @@ file_seek(void *stream, gint64 offset, int whence, int *err)
 	if (ret == -1)
 		*err = file_error(stream);
 #endif
-        /*g_warning("Seek %lld whence %u ret %lld size %u", offset, whence, ret, sizeof(fpos_t));*/
+        /*g_warning("Seek %" G_GINT64_MODIFIER "d whence %u ret %" G_GINT64_MODIFIER "d size %u", offset, whence, ret, sizeof(fpos_t));*/
 	return ret;
 }
 
diff --git a/wiretap/k12.c b/wiretap/k12.c
index 649c251603..5eb21d5721 100644
--- a/wiretap/k12.c
+++ b/wiretap/k12.c
@@ -219,7 +219,7 @@ static gint get_record(guint8** bufferp, FILE* fh, gint64 file_offset) {
 	/* where the next unknown 0x10 bytes are stuffed to the file */
 	guint junky_offset = 0x2000 - (gint) ( (file_offset - 0x200) % 0x2000 );
 
-	K12_DBG(6,("get_record: ENTER: junky_offset=%lld, file_offset=%lld",junky_offset,file_offset));
+	K12_DBG(6,("get_record: ENTER: junky_offset=%" G_GINT64_MODIFIER "d, file_offset=%" G_GINT64_MODIFIER "d",junky_offset,file_offset));
 
 	/* no buffer is given, lets create it */
 	if (buffer == NULL) {
@@ -268,7 +268,7 @@ static gint get_record(guint8** bufferp, FILE* fh, gint64 file_offset) {
 	left -= 4;
 
 	do {
-		K12_DBG(6,("get_record: looping left=%d junky_offset=%lld",left,junky_offset));
+		K12_DBG(6,("get_record: looping left=%d junky_offset=%" G_GINT64_MODIFIER "d",left,junky_offset));
 
 		if (junky_offset > left) {
 			read += last_read = file_read(writep,1, left, fh);