| 1 |
jer 14/06/19 19:24:06 |
| 2 |
|
| 3 |
Added: wireshark-1.12.0_rc2-va_list.patch |
| 4 |
Log: |
| 5 |
Add va_list patch by Steev Klimaszewski (bug #513860). |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-analyzer/wireshark/files/wireshark-1.12.0_rc2-va_list.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.12.0_rc2-va_list.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.12.0_rc2-va_list.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: wireshark-1.12.0_rc2-va_list.patch |
| 16 |
=================================================================== |
| 17 |
From 2cec3c824fdea93efd74c7f5fd85d04f60fe9863 Mon Sep 17 00:00:00 2001 |
| 18 |
From: Steev Klimaszewski <steev@g.o> |
| 19 |
Date: Thu, 19 Jun 2014 09:08:22 -0500 |
| 20 |
Subject: [PATCH] va_list can't be NULL on ARM. |
| 21 |
|
| 22 |
Signed-off-by: Steev Klimaszewski <steev@g.o> |
| 23 |
--- |
| 24 |
epan/expert.c | 6 ++++-- |
| 25 |
1 file changed, 4 insertions(+), 2 deletions(-) |
| 26 |
|
| 27 |
diff --git a/epan/expert.c b/epan/expert.c |
| 28 |
index 46be838..2adf01f 100644 |
| 29 |
--- a/epan/expert.c |
| 30 |
+++ b/epan/expert.c |
| 31 |
@@ -384,12 +384,13 @@ expert_set_info_vformat(packet_info *pinfo, proto_item *pi, int group, int sever |
| 32 |
void |
| 33 |
expert_add_info(packet_info *pinfo, proto_item *pi, expert_field *expindex) |
| 34 |
{ |
| 35 |
+ va_list unused; |
| 36 |
expert_field_info* eiinfo; |
| 37 |
|
| 38 |
/* Look up the item */ |
| 39 |
EXPERT_REGISTRAR_GET_NTH(expindex->ei, eiinfo); |
| 40 |
|
| 41 |
- expert_set_info_vformat(pinfo, pi, eiinfo->group, eiinfo->severity, *eiinfo->hf_info.p_id, FALSE, eiinfo->summary, NULL); |
| 42 |
+ expert_set_info_vformat(pinfo, pi, eiinfo->group, eiinfo->severity, *eiinfo->hf_info.p_id, FALSE, eiinfo->summary, unused); |
| 43 |
} |
| 44 |
|
| 45 |
void |
| 46 |
@@ -412,12 +413,13 @@ proto_tree_add_expert(proto_tree *tree, packet_info *pinfo, expert_field* expind |
| 47 |
{ |
| 48 |
expert_field_info* eiinfo; |
| 49 |
proto_item *ti; |
| 50 |
+ va_list unused; |
| 51 |
|
| 52 |
/* Look up the item */ |
| 53 |
EXPERT_REGISTRAR_GET_NTH(expindex->ei, eiinfo); |
| 54 |
|
| 55 |
ti = proto_tree_add_text(tree, tvb, start, length, "%s", eiinfo->summary); |
| 56 |
- expert_set_info_vformat(pinfo, ti, eiinfo->group, eiinfo->severity, *eiinfo->hf_info.p_id, FALSE, eiinfo->summary, NULL); |
| 57 |
+ expert_set_info_vformat(pinfo, ti, eiinfo->group, eiinfo->severity, *eiinfo->hf_info.p_id, FALSE, eiinfo->summary, unused); |
| 58 |
return ti; |
| 59 |
} |
| 60 |
|
| 61 |
-- |
| 62 |
1.8.5.5 |
Archives