diff options
48 files changed, 49 insertions, 49 deletions
diff --git a/wiretap/5views.h b/wiretap/5views.h index 79d4477cb1..26240fa213 100644 --- a/wiretap/5views.h +++ b/wiretap/5views.h @@ -23,7 +23,7 @@ #include <glib.h> #include <wtap.h> -int _5views_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val _5views_open(wtap *wth, int *err, gchar **err_info); gboolean _5views_dump_open(wtap_dumper *wdh, int *err); int _5views_dump_can_write_encap(int encap); diff --git a/wiretap/aethra.h b/wiretap/aethra.h index 5c36ff4499..7ed2f829f2 100644 --- a/wiretap/aethra.h +++ b/wiretap/aethra.h @@ -24,6 +24,6 @@ #include <glib.h> #include <wtap.h> -int aethra_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val aethra_open(wtap *wth, int *err, gchar **err_info); #endif diff --git a/wiretap/ascendtext.h b/wiretap/ascendtext.h index 369ffa1cd2..3c2736cfa7 100644 --- a/wiretap/ascendtext.h +++ b/wiretap/ascendtext.h @@ -27,6 +27,6 @@ #define ASCEND_MAX_DATA_COLS 16 #define ASCEND_MAX_PKT_LEN (ASCEND_MAX_DATA_ROWS * ASCEND_MAX_DATA_COLS) -int ascend_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val ascend_open(wtap *wth, int *err, gchar **err_info); #endif diff --git a/wiretap/ber.h b/wiretap/ber.h index 0448ad6bb8..e16b09cc2d 100644 --- a/wiretap/ber.h +++ b/wiretap/ber.h @@ -23,6 +23,6 @@ #include <glib.h> #include "ws_symbol_export.h" -int ber_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val ber_open(wtap *wth, int *err, gchar **err_info); #endif diff --git a/wiretap/btsnoop.h b/wiretap/btsnoop.h index 66f699b448..7611fb4d42 100644 --- a/wiretap/btsnoop.h +++ b/wiretap/btsnoop.h @@ -23,7 +23,7 @@ #include <glib.h> #include "ws_symbol_export.h" -int btsnoop_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val btsnoop_open(wtap *wth, int *err, gchar **err_info); gboolean btsnoop_dump_open_h1(wtap_dumper *wdh, int *err); gboolean btsnoop_dump_open_h4(wtap_dumper *wdh, int *err); int btsnoop_dump_can_write_encap(int encap); diff --git a/wiretap/camins.h b/wiretap/camins.h index 785488e361..676b2cf5bd 100644 --- a/wiretap/camins.h +++ b/wiretap/camins.h @@ -28,6 +28,6 @@ #include <glib.h> #include <wiretap/wtap.h> -int camins_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val camins_open(wtap *wth, int *err, gchar **err_info); #endif /* _CAMINS_H */ diff --git a/wiretap/catapult_dct2000.h b/wiretap/catapult_dct2000.h index e145a643d9..250ca95843 100644 --- a/wiretap/catapult_dct2000.h +++ b/wiretap/catapult_dct2000.h @@ -24,7 +24,7 @@ #include <glib.h> #include "ws_symbol_export.h" -int catapult_dct2000_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val catapult_dct2000_open(wtap *wth, int *err, gchar **err_info); gboolean catapult_dct2000_dump_open(wtap_dumper *wdh, int *err); int catapult_dct2000_dump_can_write_encap(int encap); diff --git a/wiretap/commview.h b/wiretap/commview.h index 7c02006b48..74dc53ed91 100644 --- a/wiretap/commview.h +++ b/wiretap/commview.h @@ -25,7 +25,7 @@ #include <glib.h> #include "ws_symbol_export.h" -int commview_open(wtap *wth, int *err, gchar **err_info _U_); +wtap_open_return_val commview_open(wtap *wth, int *err, gchar **err_info _U_); int commview_dump_can_write_encap(int encap); gboolean commview_dump_open(wtap_dumper *wdh, int *err); diff --git a/wiretap/cosine.h b/wiretap/cosine.h index c6bb424251..00ea3d9e46 100644 --- a/wiretap/cosine.h +++ b/wiretap/cosine.h @@ -28,6 +28,6 @@ #include <wtap.h> #include "ws_symbol_export.h" -int cosine_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val cosine_open(wtap *wth, int *err, gchar **err_info); #endif diff --git a/wiretap/csids.h b/wiretap/csids.h index 8f19f63964..ca9a6bc46d 100644 --- a/wiretap/csids.h +++ b/wiretap/csids.h @@ -25,6 +25,6 @@ #include <wtap.h> #include "ws_symbol_export.h" -int csids_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val csids_open(wtap *wth, int *err, gchar **err_info); #endif diff --git a/wiretap/daintree-sna.h b/wiretap/daintree-sna.h index 1ad396a4e3..90fc1ca44b 100644 --- a/wiretap/daintree-sna.h +++ b/wiretap/daintree-sna.h @@ -27,7 +27,7 @@ #include <wtap.h> #include "ws_symbol_export.h" -int daintree_sna_open(wtap *wth, int *err, gchar **err_info _U_); +wtap_open_return_val daintree_sna_open(wtap *wth, int *err, gchar **err_info _U_); #endif /* __DAINTREE_SNA_H__ */ diff --git a/wiretap/dbs-etherwatch.h b/wiretap/dbs-etherwatch.h index d28e33dae1..8a72277fce 100644 --- a/wiretap/dbs-etherwatch.h +++ b/wiretap/dbs-etherwatch.h @@ -25,6 +25,6 @@ #include <wtap.h> #include "ws_symbol_export.h" -int dbs_etherwatch_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val dbs_etherwatch_open(wtap *wth, int *err, gchar **err_info); #endif diff --git a/wiretap/dct3trace.h b/wiretap/dct3trace.h index d7bfc9cad9..886e4e759a 100644 --- a/wiretap/dct3trace.h +++ b/wiretap/dct3trace.h @@ -24,6 +24,6 @@ #include <wtap.h> #include "ws_symbol_export.h" -int dct3trace_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val dct3trace_open(wtap *wth, int *err, gchar **err_info); #endif diff --git a/wiretap/erf.h b/wiretap/erf.h index 44a293f464..a123898bea 100644 --- a/wiretap/erf.h +++ b/wiretap/erf.h @@ -103,7 +103,7 @@ union erf_subhdr { #define RECORDS_FOR_ERF_CHECK 20 #define FCS_BITS 32 -int erf_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val erf_open(wtap *wth, int *err, gchar **err_info); int erf_dump_can_write_encap(int encap); int erf_dump_open(wtap_dumper *wdh, int *err); diff --git a/wiretap/eyesdn.h b/wiretap/eyesdn.h index c000a8bf6a..214de90f44 100644 --- a/wiretap/eyesdn.h +++ b/wiretap/eyesdn.h @@ -26,7 +26,7 @@ #include <wtap.h> #include "ws_symbol_export.h" -int eyesdn_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val eyesdn_open(wtap *wth, int *err, gchar **err_info); enum EyeSDN_TYPES { EYESDN_ENCAP_ISDN=0, diff --git a/wiretap/hcidump.h b/wiretap/hcidump.h index 96453f9f36..b5ff9fbc7e 100644 --- a/wiretap/hcidump.h +++ b/wiretap/hcidump.h @@ -25,6 +25,6 @@ #include <wtap.h> #include "ws_symbol_export.h" -int hcidump_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val hcidump_open(wtap *wth, int *err, gchar **err_info); #endif diff --git a/wiretap/i4btrace.h b/wiretap/i4btrace.h index 7b94eec88a..4f4a0dcbe0 100644 --- a/wiretap/i4btrace.h +++ b/wiretap/i4btrace.h @@ -26,6 +26,6 @@ #include <wtap.h> #include "ws_symbol_export.h" -int i4btrace_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val i4btrace_open(wtap *wth, int *err, gchar **err_info); #endif diff --git a/wiretap/ipfix.h b/wiretap/ipfix.h index 578af4ca61..a4b0677b74 100644 --- a/wiretap/ipfix.h +++ b/wiretap/ipfix.h @@ -25,6 +25,6 @@ #include <wtap.h> #include "ws_symbol_export.h" -int ipfix_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val ipfix_open(wtap *wth, int *err, gchar **err_info); #endif diff --git a/wiretap/iptrace.h b/wiretap/iptrace.h index 0b44ff684d..90cffa2a0c 100644 --- a/wiretap/iptrace.h +++ b/wiretap/iptrace.h @@ -25,6 +25,6 @@ #include <glib.h> #include <wtap.h> -int iptrace_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val iptrace_open(wtap *wth, int *err, gchar **err_info); #endif diff --git a/wiretap/iseries.h b/wiretap/iseries.h index 95373e4a61..bc81c40dc4 100644 --- a/wiretap/iseries.h +++ b/wiretap/iseries.h @@ -24,6 +24,6 @@ #include <glib.h> #include <wtap.h> -int iseries_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val iseries_open(wtap *wth, int *err, gchar **err_info); #endif diff --git a/wiretap/k12.h b/wiretap/k12.h index 64a46f0d77..87e776f28b 100644 --- a/wiretap/k12.h +++ b/wiretap/k12.h @@ -24,10 +24,10 @@ #include <glib.h> #include <wtap.h> -int k12_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val k12_open(wtap *wth, int *err, gchar **err_info); int k12_dump_can_write_encap(int encap); gboolean k12_dump_open(wtap_dumper *wdh, int *err); -int k12text_open(wtap *wth, int *err, gchar **err_info _U_); +wtap_open_return_val k12text_open(wtap *wth, int *err, gchar **err_info _U_); int k12text_dump_can_write_encap(int encap); gboolean k12text_dump_open(wtap_dumper *wdh, int *err); diff --git a/wiretap/lanalyzer.h b/wiretap/lanalyzer.h index d36de2711d..f249c78b5c 100644 --- a/wiretap/lanalyzer.h +++ b/wiretap/lanalyzer.h @@ -24,7 +24,7 @@ #include <glib.h> #include <wtap.h> -int lanalyzer_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val lanalyzer_open(wtap *wth, int *err, gchar **err_info); gboolean lanalyzer_dump_open(wtap_dumper *wdh, int *err); int lanalyzer_dump_can_write_encap(int encap); diff --git a/wiretap/libpcap.h b/wiretap/libpcap.h index 4763312fb2..545c1f6406 100644 --- a/wiretap/libpcap.h +++ b/wiretap/libpcap.h @@ -100,7 +100,7 @@ struct pcaprec_nokia_hdr { guint8 stuff[4]; /* mysterious stuff */ }; -int libpcap_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val libpcap_open(wtap *wth, int *err, gchar **err_info); gboolean libpcap_dump_open(wtap_dumper *wdh, int *err); int libpcap_dump_can_write_encap(int encap); diff --git a/wiretap/logcat.h b/wiretap/logcat.h index 71a0e7da5b..447c4dcb71 100644 --- a/wiretap/logcat.h +++ b/wiretap/logcat.h @@ -57,7 +57,7 @@ struct logger_entry_v2 { /* char msg[0]; *//* the entry's payload */ }; -int logcat_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val logcat_open(wtap *wth, int *err, gchar **err_info); gboolean logcat_binary_dump_open(wtap_dumper *wdh, int *err); diff --git a/wiretap/logcat_text.h b/wiretap/logcat_text.h index 90f88ec0f1..41fb1d343c 100644 --- a/wiretap/logcat_text.h +++ b/wiretap/logcat_text.h @@ -25,7 +25,7 @@ #include "wtap.h" -int logcat_text_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val logcat_text_open(wtap *wth, int *err, gchar **err_info); gboolean logcat_text_brief_dump_open(wtap_dumper *wdh, int *err); gboolean logcat_text_process_dump_open(wtap_dumper *wdh, int *err); diff --git a/wiretap/mime_file.h b/wiretap/mime_file.h index 7c3d05a95e..5344ef31aa 100644 --- a/wiretap/mime_file.h +++ b/wiretap/mime_file.h @@ -24,6 +24,6 @@ #include <glib.h> #include <wtap.h> -int mime_file_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val mime_file_open(wtap *wth, int *err, gchar **err_info); #endif diff --git a/wiretap/mp2t.h b/wiretap/mp2t.h index a207b60afb..ea8755fc30 100644 --- a/wiretap/mp2t.h +++ b/wiretap/mp2t.h @@ -26,6 +26,6 @@ #include <glib.h> #include <wtap.h> -int mp2t_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val mp2t_open(wtap *wth, int *err, gchar **err_info); #endif diff --git a/wiretap/mpeg.h b/wiretap/mpeg.h index 6f44af2a95..24251ce069 100644 --- a/wiretap/mpeg.h +++ b/wiretap/mpeg.h @@ -26,6 +26,6 @@ #include <glib.h> #include <wtap.h> -int mpeg_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val mpeg_open(wtap *wth, int *err, gchar **err_info); #endif diff --git a/wiretap/netmon.h b/wiretap/netmon.h index 5f5f05ef11..60fefd7021 100644 --- a/wiretap/netmon.h +++ b/wiretap/netmon.h @@ -24,7 +24,7 @@ #include <glib.h> #include <wtap.h> -int netmon_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val netmon_open(wtap *wth, int *err, gchar **err_info); gboolean netmon_dump_open(wtap_dumper *wdh, int *err); int netmon_dump_can_write_encap_1_x(int encap); int netmon_dump_can_write_encap_2_x(int encap); diff --git a/wiretap/netscaler.h b/wiretap/netscaler.h index b269ff9e1f..a4e080f594 100644 --- a/wiretap/netscaler.h +++ b/wiretap/netscaler.h @@ -113,7 +113,7 @@ #define NSPR_HEADER_VERSION206 0x26 #define NSPR_HEADER_VERSION300 0x30 -int nstrace_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val nstrace_open(wtap *wth, int *err, gchar **err_info); int nstrace_10_dump_can_write_encap(int encap); int nstrace_20_dump_can_write_encap(int encap); int nstrace_30_dump_can_write_encap(int encap); diff --git a/wiretap/netscreen.h b/wiretap/netscreen.h index f652f0cd44..ec6e687772 100644 --- a/wiretap/netscreen.h +++ b/wiretap/netscreen.h @@ -49,6 +49,6 @@ #define NETSCREEN_MAX_PACKET_LEN 65536 -int netscreen_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val netscreen_open(wtap *wth, int *err, gchar **err_info); #endif diff --git a/wiretap/nettl.h b/wiretap/nettl.h index e15fd3d1d4..b54b9bc334 100644 --- a/wiretap/nettl.h +++ b/wiretap/nettl.h @@ -128,7 +128,7 @@ #define NETTL_HDR_PDU_MASK 0x30000000 -int nettl_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val nettl_open(wtap *wth, int *err, gchar **err_info); gboolean nettl_dump_open(wtap_dumper *wdh, int *err); int nettl_dump_can_write_encap(int encap); diff --git a/wiretap/network_instruments.h b/wiretap/network_instruments.h index 1d6065a172..340bb3dff1 100644 --- a/wiretap/network_instruments.h +++ b/wiretap/network_instruments.h @@ -21,7 +21,7 @@ #include <glib.h> #include <wtap.h> -int network_instruments_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val network_instruments_open(wtap *wth, int *err, gchar **err_info); int network_instruments_dump_can_write_encap(int encap); gboolean network_instruments_dump_open(wtap_dumper *wdh, int *err); diff --git a/wiretap/netxray.h b/wiretap/netxray.h index df28c774e2..bb424dc7b9 100644 --- a/wiretap/netxray.h +++ b/wiretap/netxray.h @@ -24,7 +24,7 @@ #include <glib.h> #include <wtap.h> -int netxray_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val netxray_open(wtap *wth, int *err, gchar **err_info); int netxray_dump_can_write_encap_1_1(int encap); gboolean netxray_dump_open_1_1(wtap_dumper *wdh, int *err); int netxray_dump_can_write_encap_2_0(int encap); diff --git a/wiretap/ngsniffer.h b/wiretap/ngsniffer.h index db0c525b1e..a2729f42d6 100644 --- a/wiretap/ngsniffer.h +++ b/wiretap/ngsniffer.h @@ -24,7 +24,7 @@ #include <glib.h> #include <wtap.h> -int ngsniffer_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val ngsniffer_open(wtap *wth, int *err, gchar **err_info); gboolean ngsniffer_dump_open(wtap_dumper *wdh, int *err); int ngsniffer_dump_can_write_encap(int encap); diff --git a/wiretap/packetlogger.h b/wiretap/packetlogger.h index 199cd36421..28299c5948 100644 --- a/wiretap/packetlogger.h +++ b/wiretap/packetlogger.h @@ -27,7 +27,7 @@ #include <glib.h> #include <wtap.h> -int packetlogger_open(wtap *wth, int *err, gchar **err_info _U_); +wtap_open_return_val packetlogger_open(wtap *wth, int *err, gchar **err_info _U_); #endif /* __PACKETLOGGER_H__ */ diff --git a/wiretap/pcapng.h b/wiretap/pcapng.h index 92c4ca1136..a568ab1a94 100644 --- a/wiretap/pcapng.h +++ b/wiretap/pcapng.h @@ -25,7 +25,7 @@ #include <wtap.h> #include "ws_symbol_export.h" -int pcapng_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val pcapng_open(wtap *wth, int *err, gchar **err_info); gboolean pcapng_dump_open(wtap_dumper *wdh, int *err); int pcapng_dump_can_write_encap(int encap); diff --git a/wiretap/peekclassic.h b/wiretap/peekclassic.h index b3f4201252..0b4857c4a6 100644 --- a/wiretap/peekclassic.h +++ b/wiretap/peekclassic.h @@ -26,6 +26,6 @@ #include <wtap.h> #include "ws_symbol_export.h" -int peekclassic_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val peekclassic_open(wtap *wth, int *err, gchar **err_info); #endif diff --git a/wiretap/peektagged.h b/wiretap/peektagged.h index 62a42306f9..52c074bfff 100644 --- a/wiretap/peektagged.h +++ b/wiretap/peektagged.h @@ -23,6 +23,6 @@ #include <glib.h> #include "ws_symbol_export.h" -int peektagged_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val peektagged_open(wtap *wth, int *err, gchar **err_info); #endif diff --git a/wiretap/pppdump.h b/wiretap/pppdump.h index 67ab1aaa02..da1bb703db 100644 --- a/wiretap/pppdump.h +++ b/wiretap/pppdump.h @@ -25,6 +25,6 @@ #include <wtap.h> #include "ws_symbol_export.h" -int pppdump_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val pppdump_open(wtap *wth, int *err, gchar **err_info); #endif diff --git a/wiretap/radcom.h b/wiretap/radcom.h index 6daacffbef..35bfff9d25 100644 --- a/wiretap/radcom.h +++ b/wiretap/radcom.h @@ -26,6 +26,6 @@ #include <wtap.h> #include "ws_symbol_export.h" -int radcom_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val radcom_open(wtap *wth, int *err, gchar **err_info); #endif diff --git a/wiretap/snoop.h b/wiretap/snoop.h index b8b29098c1..dc1130b88c 100644 --- a/wiretap/snoop.h +++ b/wiretap/snoop.h @@ -25,7 +25,7 @@ #include <wtap.h> #include "ws_symbol_export.h" -int snoop_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val snoop_open(wtap *wth, int *err, gchar **err_info); gboolean snoop_dump_open(wtap_dumper *wdh, int *err); int snoop_dump_can_write_encap(int encap); diff --git a/wiretap/stanag4607.h b/wiretap/stanag4607.h index bb3f2b3d78..602aaf87fd 100644 --- a/wiretap/stanag4607.h +++ b/wiretap/stanag4607.h @@ -25,6 +25,6 @@ #include <wiretap/wtap.h> #include "ws_symbol_export.h" -int stanag4607_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val stanag4607_open(wtap *wth, int *err, gchar **err_info); #endif diff --git a/wiretap/tnef.h b/wiretap/tnef.h index 154ba6df1b..16aa0df110 100644 --- a/wiretap/tnef.h +++ b/wiretap/tnef.h @@ -27,6 +27,6 @@ #define TNEF_SIGNATURE 0x223E9F78 -int tnef_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val tnef_open(wtap *wth, int *err, gchar **err_info); #endif diff --git a/wiretap/toshiba.h b/wiretap/toshiba.h index 4b3ffffeb8..ba49e06ddd 100644 --- a/wiretap/toshiba.h +++ b/wiretap/toshiba.h @@ -25,6 +25,6 @@ #include <wtap.h> #include "ws_symbol_export.h" -int toshiba_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val toshiba_open(wtap *wth, int *err, gchar **err_info); #endif diff --git a/wiretap/visual.h b/wiretap/visual.h index 123538a061..dfa9818dc1 100644 --- a/wiretap/visual.h +++ b/wiretap/visual.h @@ -30,7 +30,7 @@ #include <wtap.h> #include "ws_symbol_export.h" -int visual_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val visual_open(wtap *wth, int *err, gchar **err_info); gboolean visual_dump_open(wtap_dumper *wdh, int *err); int visual_dump_can_write_encap(int encap); diff --git a/wiretap/vms.h b/wiretap/vms.h index 1d37b4746c..7ca660090d 100644 --- a/wiretap/vms.h +++ b/wiretap/vms.h @@ -26,6 +26,6 @@ #include <wtap.h> #include "ws_symbol_export.h" -int vms_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val vms_open(wtap *wth, int *err, gchar **err_info); #endif diff --git a/wiretap/vwr.h b/wiretap/vwr.h index 9ef3e1803a..c6a41ad8d9 100644 --- a/wiretap/vwr.h +++ b/wiretap/vwr.h @@ -24,6 +24,6 @@ #include "ws_symbol_export.h" -int vwr_open(wtap *wth, int *err, gchar **err_info); +wtap_open_return_val vwr_open(wtap *wth, int *err, gchar **err_info); #endif |