1 files changed, 47 insertions, 47 deletions

diff --git a/epan/dissectors/asn1/tcap/packet-tcap-template.h b/epan/dissectors/asn1/tcap/packet-tcap-template.h
index 8e3a6ccd..abd2faef 100644
--- a/epan/dissectors/asn1/tcap/packet-tcap-template.h
+++ b/epan/dissectors/asn1/tcap/packet-tcap-template.h
@@ -49,13 +49,13 @@
 #define TC_ANSI_ALL 6
 
 struct tcap_private_t {
-  gboolean acv; /* Is the Application Context Version present */
+  bool acv; /* Is the Application Context Version present */
   const void * oid;
-  guint32 session_id;
+  uint32_t session_id;
   void * context;
-  gchar *TransactionID_str;
-  guint32 src_tid;
-  guint32 dst_tid;
+  char *TransactionID_str;
+  uint32_t src_tid;
+  uint32_t dst_tid;
 };
 
 /** @file
@@ -66,17 +66,17 @@ struct tcap_private_t {
 #define LENGTH_OID 23
 struct tcaphash_context_t {
   struct tcaphash_context_key_t * key;
-  guint32 session_id;
-  guint32 first_frame;
-  guint32 last_frame;
+  uint32_t session_id;
+  uint32_t first_frame;
+  uint32_t last_frame;
   nstime_t begin_time;	/**< time of arrival of TC_BEGIN */
   nstime_t end_time;	/**< time of closing message */
-  gboolean responded;	/**< true, if request has been responded */
-  gboolean closed;
-  gboolean upper_dissector;
-  gboolean oid_present;
-  gchar oid[LENGTH_OID+1];
-  gboolean subdissector_present;
+  bool responded;	/**< true, if request has been responded */
+  bool closed;
+  bool upper_dissector;
+  bool oid_present;
+  char oid[LENGTH_OID+1];
+  bool subdissector_present;
   dissector_handle_t subdissector_handle;
   void (* callback) (tvbuff_t *,packet_info *, proto_tree *, struct tcaphash_context_t *);
   struct tcaphash_begincall_t * begincall;
@@ -88,7 +88,7 @@ struct tcaphash_context_t {
 struct tcaphash_begincall_t {
   struct tcaphash_begin_info_key_t * beginkey;
   struct tcaphash_context_t * context;
-  gboolean father;
+  bool father;
   struct tcaphash_begincall_t * next_begincall;
   struct tcaphash_begincall_t * previous_begincall;
 };
@@ -96,7 +96,7 @@ struct tcaphash_begincall_t {
 struct tcaphash_contcall_t {
   struct tcaphash_cont_info_key_t * contkey;
   struct tcaphash_context_t * context;
-  gboolean father;
+  bool father;
   struct tcaphash_contcall_t * next_contcall;
   struct tcaphash_contcall_t * previous_contcall;
 };
@@ -104,7 +104,7 @@ struct tcaphash_contcall_t {
 struct tcaphash_endcall_t {
   struct tcaphash_end_info_key_t * endkey;
   struct tcaphash_context_t * context;
-  gboolean father;
+  bool father;
   struct tcaphash_endcall_t * next_endcall;
   struct tcaphash_endcall_t * previous_endcall;
 };
@@ -112,7 +112,7 @@ struct tcaphash_endcall_t {
 struct tcaphash_ansicall_t {
   struct tcaphash_ansi_info_key_t * ansikey;
   struct tcaphash_context_t * context;
-  gboolean father;
+  bool father;
   struct tcaphash_ansicall_t * next_ansicall;
   struct tcaphash_ansicall_t * previous_ansicall;
 };
@@ -121,44 +121,44 @@ struct tcaphash_ansicall_t {
    of the TC_BEGIN containing the InitialDP */
 
 struct tcaphash_context_key_t {
-  guint32 session_id;
+  uint32_t session_id;
 };
 
 struct tcaphash_begin_info_key_t {
-  guint32 hashKey;
-  guint32 tid;
-  guint32 pc_hash;
+  uint32_t hashKey;
+  uint32_t tid;
+  uint32_t pc_hash;
 };
 
 struct tcaphash_cont_info_key_t {
-  guint32 hashKey;
-  guint32 src_tid;
-  guint32 dst_tid;
-  guint32 opc_hash;
-  guint32 dpc_hash;
+  uint32_t hashKey;
+  uint32_t src_tid;
+  uint32_t dst_tid;
+  uint32_t opc_hash;
+  uint32_t dpc_hash;
 };
 
 struct tcaphash_end_info_key_t {
-  guint32 hashKey;
-  guint32 tid;
-  guint32 opc_hash;
-  guint32 dpc_hash;
+  uint32_t hashKey;
+  uint32_t tid;
+  uint32_t opc_hash;
+  uint32_t dpc_hash;
 };
 
 struct tcaphash_ansi_info_key_t {
-  guint32 hashKey;
-  guint32 tid;
-  guint32 opc_hash;
-  guint32 dpc_hash;
+  uint32_t hashKey;
+  uint32_t tid;
+  uint32_t opc_hash;
+  uint32_t dpc_hash;
 };
 
 
 /** List of infos to store for the analyse */
 struct tcapsrt_info_t {
-  guint32 tcap_session_id;
-  guint32 src_tid;
-  guint32 dst_tid;
-  guint8 ope;
+  uint32_t tcap_session_id;
+  uint32_t src_tid;
+  uint32_t dst_tid;
+  uint8_t ope;
 };
 
 /**
@@ -190,22 +190,22 @@ struct tcaphash_context_t * tcapsrt_call_matching(tvbuff_t *tvb,
 						  proto_tree *tree,
 						  struct tcapsrt_info_t * p_tcap_info);
 
-WS_DLL_PUBLIC gboolean gtcap_StatSRT;
+WS_DLL_PUBLIC bool gtcap_StatSRT;
 
-extern gint tcap_standard;
+extern int tcap_standard;
 
 extern const value_string tcap_component_type_str[];
 void proto_reg_handoff_tcap(void);
 void proto_register_tcap(void);
 
-extern dissector_handle_t get_itu_tcap_subdissector(guint32 ssn);
-dissector_handle_t get_ansi_tcap_subdissector(guint32 ssn);
+extern dissector_handle_t get_itu_tcap_subdissector(uint32_t ssn);
+dissector_handle_t get_ansi_tcap_subdissector(uint32_t ssn);
 
-extern void add_ansi_tcap_subdissector(guint32 ssn, dissector_handle_t dissector);
-WS_DLL_PUBLIC void add_itu_tcap_subdissector(guint32 ssn, dissector_handle_t dissector);
+extern void add_ansi_tcap_subdissector(uint32_t ssn, dissector_handle_t dissector);
+WS_DLL_PUBLIC void add_itu_tcap_subdissector(uint32_t ssn, dissector_handle_t dissector);
 
-extern void delete_ansi_tcap_subdissector(guint32 ssn, dissector_handle_t dissector);
-WS_DLL_PUBLIC void delete_itu_tcap_subdissector(guint32 ssn, dissector_handle_t dissector);
+extern void delete_ansi_tcap_subdissector(uint32_t ssn, dissector_handle_t dissector);
+WS_DLL_PUBLIC void delete_itu_tcap_subdissector(uint32_t ssn, dissector_handle_t dissector);
 
 extern void call_tcap_dissector(dissector_handle_t, tvbuff_t*, packet_info*, proto_tree*);