osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fix some "format not a string literal and no format arguments" warnings. 

svn path=/trunk/; revision=26649
This commit is contained in:
Stig Bjørlykke 2008-10-31 15:47:47 +00:00
parent e6a22e689e
commit 58e2d7a0d6
9 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/packet-dcerpc-nt.c
View File

@ -118,7 +118,7 @@ dissect_ndr_counted_string_helper(tvbuff_t *tvb, int offset,
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 @@ dissect_ndr_counted_byte_array_cb(tvbuff_t *tvb, int offset,
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 @@ dissect_ndr_counted_ascii_string_cb(tvbuff_t *tvb, int offset,
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);

4
epan/dissectors/packet-ipmi-se.c
View File

@ -2237,7 +2237,7 @@ rq11(tvbuff_t *tvb, proto_tree *tree)
val = tvb_get_guint8(tvb, 0);
proto_tree_add_uint_format(tree, hf_ipmi_se_11_rq_timeout, tvb, 0, 1,
val, val_to_str(val, vals_11_pef_timer, "Arm Timer for: %d sec"));
val, "%s", val_to_str(val, vals_11_pef_timer, "Arm Timer for: %d sec"));
}
static void
@ -2247,7 +2247,7 @@ rs11(tvbuff_t *tvb, proto_tree *tree)
val = tvb_get_guint8(tvb, 0);
proto_tree_add_uint_format(tree, hf_ipmi_se_11_rs_timeout, tvb, 0, 1,
val, val_to_str(val, vals_11_pef_timer, "Present Timer Countdown value: %d sec"));
val, "%s", val_to_str(val, vals_11_pef_timer, "Present Timer Countdown value: %d sec"));
}
/* Set PEF Configuration Parameters.

2
epan/dissectors/packet-mq.c
View File

@ -2279,7 +2279,7 @@ dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
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)"));
}
}
}

6
epan/dissectors/packet-q2931.c
View File

@ -1990,17 +1990,17 @@ dissect_q2931_ie(tvbuff_t *tvb, int offset, int len, proto_tree *tree,
"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,

2
epan/dissectors/packet-rtps2.c
View File

@ -3747,7 +3747,7 @@ static gint dissect_parameter_sequence(proto_tree *tree,
proto_tree_add_text(rtps_parameter_tree,
tvb,
offset,
param_length,
param_length, "%s",
buffer);
break;
}

2
epan/dissectors/packet-wccp.c
View File

@ -471,7 +471,7 @@ dissect_wccp2_info(tvbuff_t *tvb, int offset, guint16 length,
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,

2
epan/dissectors/packet-xml.c
View File

@ -292,7 +292,7 @@ static void after_xmlpi(void* tvbparse_data, const void* wanted_data _U_, tvbpar
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) {

2
epan/filesystem.c
View File

@ -951,7 +951,7 @@ get_persconffile_dir(const gchar *profilename)
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;

4
file.c
View File

@ -1153,7 +1153,6 @@ cf_merge_files(char **out_filenamep, int in_file_count,
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;
@ -1345,8 +1344,7 @@ cf_merge_files(char **out_filenamep, int in_file_count,
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);
}
}
}