diff options
32 files changed, 54 insertions, 16 deletions
diff --git a/asn1/camel/packet-camel-template.c b/asn1/camel/packet-camel-template.c index b70d927ddf..9acc33ce0c 100644 --- a/asn1/camel/packet-camel-template.c +++ b/asn1/camel/packet-camel-template.c @@ -43,6 +43,7 @@ #include <epan/asn1.h> #include <epan/expert.h> +#include <stdlib.h> #include <string.h> #include "packet-ber.h" diff --git a/asn1/gsm_map/packet-gsm_map-template.c b/asn1/gsm_map/packet-gsm_map-template.c index 4ec30d754d..4d31d45d3e 100644 --- a/asn1/gsm_map/packet-gsm_map-template.c +++ b/asn1/gsm_map/packet-gsm_map-template.c @@ -54,6 +54,7 @@ #include <epan/oids.h> #include <epan/expert.h> +#include <stdlib.h> #include <string.h> #include <epan/asn1.h> @@ -31,6 +31,7 @@ #endif #include <stdio.h> +#include <stdlib.h> #include <string.h> #include <glib.h> diff --git a/capture_opts.c b/capture_opts.c index f7c7104297..4ab473a570 100644 --- a/capture_opts.c +++ b/capture_opts.c @@ -25,6 +25,7 @@ #include "config.h" #include <stdio.h> +#include <stdlib.h> #ifdef HAVE_LIBPCAP diff --git a/capture_sync.c b/capture_sync.c index ec650ff3f8..81cbb1204f 100644 --- a/capture_sync.c +++ b/capture_sync.c @@ -28,6 +28,7 @@ #include <glib.h> #include <stdio.h> +#include <stdlib.h> #include <ctype.h> #include <string.h> diff --git a/color_filters.c b/color_filters.c index ca71e219e4..250ef5b867 100644 --- a/color_filters.c +++ b/color_filters.c @@ -30,6 +30,7 @@ #include <glib.h> #include <stdio.h> +#include <stdlib.h> #include <ctype.h> #include <string.h> diff --git a/epan/decode_as.c b/epan/decode_as.c index ee4205a29a..9f8791e765 100644 --- a/epan/decode_as.c +++ b/epan/decode_as.c @@ -24,6 +24,8 @@ #include "config.h" +#include <stdlib.h> + #include <glib.h> #include "decode_as.h" diff --git a/epan/dissectors/packet-bt-dht.c b/epan/dissectors/packet-bt-dht.c index 1f560097c8..39aee30a35 100644 --- a/epan/dissectors/packet-bt-dht.c +++ b/epan/dissectors/packet-bt-dht.c @@ -28,6 +28,8 @@ #include "config.h" +#include <stdlib.h> + #include <epan/packet.h> #include <epan/conversation.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c index 4440275b03..bca870f7fb 100644 --- a/epan/dissectors/packet-camel.c +++ b/epan/dissectors/packet-camel.c @@ -51,6 +51,7 @@ #include <epan/asn1.h> #include <epan/expert.h> +#include <stdlib.h> #include <string.h> #include "packet-ber.h" @@ -602,7 +603,7 @@ static int hf_camel_present = -1; /* INTEGER */ static int hf_camel_InvokeId_present = -1; /* InvokeId_present */ /*--- End of included file: packet-camel-hf.c ---*/ -#line 109 "../../asn1/camel/packet-camel-template.c" +#line 110 "../../asn1/camel/packet-camel-template.c" static struct camelsrt_info_t * gp_camelsrt_info; @@ -829,7 +830,7 @@ static gint ett_camel_T_problem = -1; static gint ett_camel_InvokeId = -1; /*--- End of included file: packet-camel-ett.c ---*/ -#line 137 "../../asn1/camel/packet-camel-template.c" +#line 138 "../../asn1/camel/packet-camel-template.c" static expert_field ei_camel_unknown_invokeData = EI_INIT; static expert_field ei_camel_unknown_returnResultData = EI_INIT; @@ -1157,7 +1158,7 @@ static const value_string camel_ectTreatmentIndicator_values[] = { #define noInvokeId NULL /*--- End of included file: packet-camel-val.h ---*/ -#line 280 "../../asn1/camel/packet-camel-template.c" +#line 281 "../../asn1/camel/packet-camel-template.c" /*--- Included file: packet-camel-table.c ---*/ @@ -1247,7 +1248,7 @@ static const value_string camel_err_code_string_vals[] = { /*--- End of included file: packet-camel-table.c ---*/ -#line 282 "../../asn1/camel/packet-camel-template.c" +#line 283 "../../asn1/camel/packet-camel-template.c" static char camel_number_to_char(int number) { @@ -7010,7 +7011,7 @@ static void dissect_CAP_U_ABORT_REASON_PDU(tvbuff_t *tvb _U_, packet_info *pinfo /*--- End of included file: packet-camel-fn.c ---*/ -#line 329 "../../asn1/camel/packet-camel-template.c" +#line 330 "../../asn1/camel/packet-camel-template.c" /*--- Included file: packet-camel-table2.c ---*/ @@ -7217,7 +7218,7 @@ static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset,a /*--- End of included file: packet-camel-table2.c ---*/ -#line 331 "../../asn1/camel/packet-camel-template.c" +#line 332 "../../asn1/camel/packet-camel-template.c" static guint8 camel_pdu_type = 0; @@ -7416,7 +7417,7 @@ void proto_reg_handoff_camel(void) { /*--- End of included file: packet-camel-dis-tab.c ---*/ -#line 522 "../../asn1/camel/packet-camel-template.c" +#line 523 "../../asn1/camel/packet-camel-template.c" } else { range_foreach(ssn_range, range_delete_callback); g_free(ssn_range); @@ -9530,7 +9531,7 @@ void proto_register_camel(void) { "InvokeId_present", HFILL }}, /*--- End of included file: packet-camel-hfarr.c ---*/ -#line 695 "../../asn1/camel/packet-camel-template.c" +#line 696 "../../asn1/camel/packet-camel-template.c" }; /* List of subtrees */ @@ -9745,7 +9746,7 @@ void proto_register_camel(void) { &ett_camel_InvokeId, /*--- End of included file: packet-camel-ettarr.c ---*/ -#line 711 "../../asn1/camel/packet-camel-template.c" +#line 712 "../../asn1/camel/packet-camel-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index 2367339363..fce2fd63b7 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -27,6 +27,7 @@ #include <glib.h> #include <stdio.h> +#include <stdlib.h> #include <ctype.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c index e232fa5bd4..bbd8ca377d 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -62,6 +62,7 @@ #include <epan/oids.h> #include <epan/expert.h> +#include <stdlib.h> #include <string.h> #include <epan/asn1.h> diff --git a/epan/dissectors/packet-icmp.c b/epan/dissectors/packet-icmp.c index 1a4bedcdbc..f3fe003319 100644 --- a/epan/dissectors/packet-icmp.c +++ b/epan/dissectors/packet-icmp.c @@ -34,6 +34,8 @@ #include "config.h" +#include <stdlib.h> + #include <glib.h> #include <time.h> diff --git a/epan/dissectors/packet-memcache.c b/epan/dissectors/packet-memcache.c index 39aeb6e39b..25fd50f561 100644 --- a/epan/dissectors/packet-memcache.c +++ b/epan/dissectors/packet-memcache.c @@ -33,6 +33,7 @@ #include "config.h" #include <stdio.h> +#include <stdlib.h> #include <glib.h> diff --git a/epan/dissectors/packet-rtpproxy.c b/epan/dissectors/packet-rtpproxy.c index f0f35f7533..872ffadf92 100644 --- a/epan/dissectors/packet-rtpproxy.c +++ b/epan/dissectors/packet-rtpproxy.c @@ -30,6 +30,7 @@ #include "config.h" +#include <stdlib.h> #include <ctype.h> #include <glib.h> diff --git a/epan/dissectors/packet-rtsp.c b/epan/dissectors/packet-rtsp.c index a64daefbe6..03afbef167 100644 --- a/epan/dissectors/packet-rtsp.c +++ b/epan/dissectors/packet-rtsp.c @@ -32,6 +32,7 @@ #include "config.h" #include <stdio.h> +#include <stdlib.h> #include <ctype.h> #include <glib.h> diff --git a/epan/dissectors/packet-soupbintcp.c b/epan/dissectors/packet-soupbintcp.c index 8635df66b3..704c0661fd 100644 --- a/epan/dissectors/packet-soupbintcp.c +++ b/epan/dissectors/packet-soupbintcp.c @@ -56,6 +56,8 @@ #include "config.h" +#include <stdlib.h> + #include <epan/conversation.h> #include <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/prefs-int.h b/epan/prefs-int.h index 7438bc3004..52fc65fa6e 100644 --- a/epan/prefs-int.h +++ b/epan/prefs-int.h @@ -121,7 +121,7 @@ struct preference { gint *enump; const char **string; range_t **range; - uat_t* uat; + struct epan_uat* uat; color_t *colorp; GList** list; } varp; /**< pointer to variable storing the value */ diff --git a/epan/prefs.h b/epan/prefs.h index 729ece2a4c..24445dd4ae 100644 --- a/epan/prefs.h +++ b/epan/prefs.h @@ -36,7 +36,6 @@ extern "C" { #include <epan/addr_resolv.h> #include <epan/params.h> #include <epan/range.h> -#include <epan/uat.h> #include "ws_symbol_export.h" @@ -55,6 +54,8 @@ extern "C" { #define ST_MAX_BURSTRES 600000 /* somewhat arbirary limit of 10 minutes */ #define ST_MAX_BURSTBUCKETS 100 /* somewhat arbirary limit - more buckets degrade performance */ +struct epan_uat; + /* * Convert a string listing name resolution types to a bitmask of * those types. @@ -455,7 +456,7 @@ WS_DLL_PUBLIC void prefs_register_uat_preference(module_t *module, const char *name, const char* title, const char *description, - uat_t* uat); + struct epan_uat* uat); /* * Register a color preference. Currently does not have any "GUI Dialog" support diff --git a/plugins/wimaxasncp/packet-wimaxasncp.c b/plugins/wimaxasncp/packet-wimaxasncp.c index fca46c301f..05c9b99ed0 100644 --- a/plugins/wimaxasncp/packet-wimaxasncp.c +++ b/plugins/wimaxasncp/packet-wimaxasncp.c @@ -31,6 +31,7 @@ #include "config.h" #include <stdio.h> +#include <stdlib.h> #include <ctype.h> #include <glib.h> diff --git a/ui/cli/tap-megacostat.c b/ui/cli/tap-megacostat.c index 1111c22267..afab364b39 100644 --- a/ui/cli/tap-megacostat.c +++ b/ui/cli/tap-megacostat.c @@ -27,8 +27,9 @@ #include "config.h" #include <stdio.h> - +#include <stdlib.h> #include <string.h> + #include "epan/packet_info.h" #include <epan/tap.h> #include <epan/stat_cmd_args.h> diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c index dff5ed7bb3..520ee65366 100644 --- a/ui/gtk/capture_dlg.c +++ b/ui/gtk/capture_dlg.c @@ -27,9 +27,9 @@ #ifdef HAVE_LIBPCAP -#include <string.h> - #include <stdio.h> +#include <stdlib.h> +#include <string.h> #include <gtk/gtk.h> diff --git a/ui/gtk/gui_utils.c b/ui/gtk/gui_utils.c index 8fc19d0e76..a9c636106f 100644 --- a/ui/gtk/gui_utils.c +++ b/ui/gtk/gui_utils.c @@ -26,6 +26,7 @@ #include "config.h" +#include <stdlib.h> #include <string.h> #include <locale.h> diff --git a/ui/gtk/main_80211_toolbar.c b/ui/gtk/main_80211_toolbar.c index 0989e988e1..2d3347f88e 100644 --- a/ui/gtk/main_80211_toolbar.c +++ b/ui/gtk/main_80211_toolbar.c @@ -29,6 +29,7 @@ #include "config.h" #include <stdio.h> +#include <stdlib.h> #include <string.h> #include <gtk/gtk.h> diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c index 2bc15aa531..559d368338 100644 --- a/ui/gtk/main_menubar.c +++ b/ui/gtk/main_menubar.c @@ -26,6 +26,7 @@ #include <gtk/gtk.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> #include <wsutil/u3.h> diff --git a/ui/gtk/packet_list.c b/ui/gtk/packet_list.c index 7304a5ab16..be8ed89cb3 100644 --- a/ui/gtk/packet_list.c +++ b/ui/gtk/packet_list.c @@ -27,9 +27,10 @@ #include "config.h" +#include <stdio.h> +#include <stdlib.h> #include <string.h> -#include <stdio.h> #include <gtk/gtk.h> #include <glib.h> diff --git a/ui/gtk/prefs_column.c b/ui/gtk/prefs_column.c index d95f3cbe9f..884846693a 100644 --- a/ui/gtk/prefs_column.c +++ b/ui/gtk/prefs_column.c @@ -24,6 +24,7 @@ #include "config.h" +#include <stdlib.h> #include <string.h> #include <gtk/gtk.h> diff --git a/ui/gtk/prefs_dlg.c b/ui/gtk/prefs_dlg.c index 691203fa30..c1aeb2282d 100644 --- a/ui/gtk/prefs_dlg.c +++ b/ui/gtk/prefs_dlg.c @@ -26,6 +26,7 @@ #include <gtk/gtk.h> +#include <stdlib.h> #include <string.h> #include <epan/packet.h> diff --git a/ui/gtk/prefs_font_color.c b/ui/gtk/prefs_font_color.c index 9cfbc80a62..3520570cce 100644 --- a/ui/gtk/prefs_font_color.c +++ b/ui/gtk/prefs_font_color.c @@ -24,6 +24,8 @@ #include "config.h" +#include <stdlib.h> + #include <gtk/gtk.h> #include <epan/proto.h> diff --git a/ui/gtk/prefs_gui.c b/ui/gtk/prefs_gui.c index 9cfb4ef1b0..b649ddc50c 100644 --- a/ui/gtk/prefs_gui.c +++ b/ui/gtk/prefs_gui.c @@ -23,6 +23,8 @@ */ #include "config.h" + +#include <stdlib.h> #include <string.h> #include <gtk/gtk.h> diff --git a/ui/gtk/time_shift_dlg.c b/ui/gtk/time_shift_dlg.c index 8a8ddb0b05..06835f8773 100644 --- a/ui/gtk/time_shift_dlg.c +++ b/ui/gtk/time_shift_dlg.c @@ -25,6 +25,8 @@ #include "config.h" +#include <stdlib.h> + #include "globals.h" #include <gtk/gtk.h> diff --git a/ui/gtk/voip_calls.c b/ui/gtk/voip_calls.c index 5f07028d56..52b352c909 100644 --- a/ui/gtk/voip_calls.c +++ b/ui/gtk/voip_calls.c @@ -34,6 +34,8 @@ */ #include "config.h" + +#include <stdlib.h> #include <string.h> #include <epan/epan.h> diff --git a/ui/recent.c b/ui/recent.c index 6abcbf45f8..e91de5bf29 100644 --- a/ui/recent.c +++ b/ui/recent.c @@ -26,6 +26,7 @@ #include "config.h" #include <stdio.h> +#include <stdlib.h> #include <string.h> #include <ctype.h> #include <errno.h> |