File wireshark-1.0.4-home-variable.patch of Package wireshark

Overview Repositories Revisions Requests Users Attributes Meta

File wireshark-1.0.4-home-variable.patch of Package wireshark (Revision 2aa8ad607486ae79853c1e4b3a5767ed)

Currently displaying revision 2aa8ad607486ae79853c1e4b3a5767ed , Show latest

--- epan/dissectors/packet-dcerpc-nt.c
+++ epan/dissectors/packet-dcerpc-nt.c
@@ -118,7 +118,7 @@
 	if (add_subtree) {
 
 		item = proto_tree_add_text(
-			tree, tvb, offset, 0,
+			tree, tvb, offset, 0, "%s",
 			proto_registrar_get_name(hf_index));
 
 		subtree = proto_item_add_subtree(item, ett_nt_counted_string);
@@ -185,7 +185,7 @@
 	if (di->conformant_run)
 		return offset;
 
-	item = proto_tree_add_text(tree, tvb, offset, 0,
+	item = proto_tree_add_text(tree, tvb, offset, 0, "%s",
 		proto_registrar_get_name(hf_index));
 
 	subtree = proto_item_add_subtree(item, ett_nt_counted_byte_array);
@@ -291,7 +291,7 @@
 	if (di->conformant_run)
 		return offset;
 
-	item = proto_tree_add_text(tree, tvb, offset, 0,
+	item = proto_tree_add_text(tree, tvb, offset, 0, "%s",
 		proto_registrar_get_name(hf_index));
 
 	subtree = proto_item_add_subtree(item, ett_nt_counted_ascii_string);
--- epan/dissectors/packet-mq.c
+++ epan/dissectors/packet-mq.c
@@ -2278,7 +2278,7 @@
 						structId = tvb_get_ntohl(tvb, offset);
 						if (tree)
 						{
-							proto_tree_add_text(mqroot_tree, tvb, offset, -1, val_to_str(structId, mq_structid_vals, "Unknown (0x%08x)"));
+							proto_tree_add_text(mqroot_tree, tvb, offset, -1, "%s", val_to_str(structId, mq_structid_vals, "Unknown (0x%08x)"));
 						}
 					}
 				}
--- epan/dissectors/packet-q2931.c
+++ epan/dissectors/packet-q2931.c
@@ -1990,17 +1990,17 @@
 	    "Information element extension: 0x%02x",
 	    info_element_ext);
 	ie_ext_tree = proto_item_add_subtree(ti, ett_q2931_ie_ext);
-	proto_tree_add_text(ie_ext_tree, tvb, offset + 1, 1,
+	proto_tree_add_text(ie_ext_tree, tvb, offset + 1, 1, "%s",
 	    decode_enumerated_bitfield(info_element_ext,
 	        Q2931_IE_COMPAT_CODING_STD, 8,
 		coding_std_vals, "Coding standard: %s"));
-	proto_tree_add_text(ie_ext_tree, tvb, offset + 1, 1,
+	proto_tree_add_text(ie_ext_tree, tvb, offset + 1, 1, "%s",
 	    decode_boolean_bitfield(info_element_ext,
 	    Q2931_IE_COMPAT_FOLLOW_INST, 8,
 	    "Follow explicit error handling instructions",
   	    "Regular error handling procedures apply"));
 	if (info_element_ext & Q2931_IE_COMPAT_FOLLOW_INST) {
-		proto_tree_add_text(ie_ext_tree, tvb, offset + 1, 1,
+		proto_tree_add_text(ie_ext_tree, tvb, offset + 1, 1, "%s",
 		    decode_enumerated_bitfield(info_element_ext,
 		        Q2931_IE_COMPAT_ACTION_IND, 8,
 			ie_action_ind_vals,
--- epan/dissectors/packet-wccp.c
+++ epan/dissectors/packet-wccp.c
@@ -471,7 +471,7 @@
 			break;
 		}
 
-		ti = proto_tree_add_text(wccp_tree, tvb, offset, item_length + 4,
+		ti = proto_tree_add_text(wccp_tree, tvb, offset, item_length + 4, "%s",
 		    val_to_str(type, info_type_vals, "Unknown info type (%u)"));
 		info_tree = proto_item_add_subtree(ti, ett);
 		proto_tree_add_text(info_tree, tvb, offset, 2,
--- epan/dissectors/packet-xml.c
+++ epan/dissectors/packet-xml.c
@@ -304,7 +304,7 @@
 	xml_frame_t* current_frame = g_ptr_array_index(stack,stack->len - 1);
 
 	proto_tree_add_text(current_frame->tree,
-						   tok->tvb, tok->offset, tok->len,
+						   tok->tvb, tok->offset, tok->len, "%s",
 						   tvb_format_text(tok->tvb,tok->offset,tok->len));
 
 	if (stack->len > 1) {
--- epan/filesystem.c
+++ epan/filesystem.c
@@ -951,7 +951,7 @@
 	  persconffile_profile_dir = g_strdup_printf ("%s%s%s", get_profiles_dir (),
 						      G_DIR_SEPARATOR_S, profilename);
 	} else {
-	  persconffile_profile_dir = g_strdup_printf (get_persconffile_dir_no_profile ());
+	  persconffile_profile_dir = g_strdup (get_persconffile_dir_no_profile ());
 	}
 
 	return persconffile_profile_dir;
--- file.c
+++ file.c
@@ -1131,7 +1131,6 @@
   int               err_fileno;
   int               i;
   char              errmsg_errno[1024+1];
-  gchar             err_str[2048+1];
   const char       *errmsg;
   gboolean          got_read_error = FALSE, got_write_error = FALSE;
   gint64            data_offset;
@@ -1323,8 +1322,7 @@
 	  errmsg = errmsg_errno;
 	  break;
 	}
-	g_snprintf(err_str, sizeof err_str, errmsg, in_files[i].filename);
-        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, err_str);
+        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, errmsg, in_files[i].filename);
       }
     }
   }

Places

File wireshark-1.0.4-home-variable.patch of Package wireshark (Revision 2aa8ad607486ae79853c1e4b3a5767ed)

Places