diff options
| -rw-r--r-- | asn1/s1ap/packet-s1ap-template.c | 1 | ||||
| -rw-r--r-- | asn1/s1ap/s1ap.cnf | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-s1ap.c | 17 |
3 files changed, 9 insertions, 11 deletions
diff --git a/asn1/s1ap/packet-s1ap-template.c b/asn1/s1ap/packet-s1ap-template.c index f7d4c49f1c..6f1a603152 100644 --- a/asn1/s1ap/packet-s1ap-template.c +++ b/asn1/s1ap/packet-s1ap-template.c @@ -30,7 +30,6 @@ #include <glib.h> #include <epan/packet.h> -#include <ctype.h> #include <epan/strutil.h> #include <epan/asn1.h> #include <epan/prefs.h> diff --git a/asn1/s1ap/s1ap.cnf b/asn1/s1ap/s1ap.cnf index d8d247a791..ed28c8f32b 100644 --- a/asn1/s1ap/s1ap.cnf +++ b/asn1/s1ap/s1ap.cnf @@ -231,7 +231,7 @@ obj_id = NULL; is_ascii = TRUE; for (p_offset=0; p_offset < length; p_offset++){ - if(!isalpha(tvb_get_guint8(parameter_tvb, p_offset ))){ + if(!g_ascii_isprint(tvb_get_guint8(parameter_tvb, p_offset ))){ is_ascii = FALSE; break; } diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c index 8f6642c35d..882721e726 100644 --- a/epan/dissectors/packet-s1ap.c +++ b/epan/dissectors/packet-s1ap.c @@ -38,7 +38,6 @@ #include <glib.h> #include <epan/packet.h> -#include <ctype.h> #include <epan/strutil.h> #include <epan/asn1.h> #include <epan/prefs.h> @@ -362,7 +361,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-s1ap-val.h ---*/ -#line 68 "../../asn1/s1ap/packet-s1ap-template.c" +#line 67 "../../asn1/s1ap/packet-s1ap-template.c" /* Initialize the protocol and registered fields */ static int proto_s1ap = -1; @@ -920,7 +919,7 @@ static int hf_s1ap_eHRPD_Sector_ID_01 = -1; /* EHRPD_Sector_ID */ static int hf_s1ap_eHRPDSectorLoadReportingResponse = -1; /* EHRPDSectorLoadReportingResponse */ /*--- End of included file: packet-s1ap-hf.c ---*/ -#line 75 "../../asn1/s1ap/packet-s1ap-template.c" +#line 74 "../../asn1/s1ap/packet-s1ap-template.c" /* Initialize the subtree pointers */ static int ett_s1ap = -1; @@ -1209,7 +1208,7 @@ static gint ett_s1ap_EHRPDCompositeAvailableCapacity = -1; static gint ett_s1ap_EHRPDMultiSectorLoadReportingResponseItem = -1; /*--- End of included file: packet-s1ap-ett.c ---*/ -#line 87 "../../asn1/s1ap/packet-s1ap-template.c" +#line 86 "../../asn1/s1ap/packet-s1ap-template.c" enum{ INITIATING_MESSAGE, @@ -3472,7 +3471,7 @@ dissect_s1ap_ENBname(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr is_ascii = TRUE; for (p_offset=0; p_offset < length; p_offset++){ - if(!isalpha(tvb_get_guint8(parameter_tvb, p_offset ))){ + if(!g_ascii_isprint(tvb_get_guint8(parameter_tvb, p_offset ))){ is_ascii = FALSE; break; } @@ -10473,7 +10472,7 @@ int dissect_s1ap_SONtransferCause_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-s1ap-fn.c ---*/ -#line 136 "../../asn1/s1ap/packet-s1ap-template.c" +#line 135 "../../asn1/s1ap/packet-s1ap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -10810,7 +10809,7 @@ proto_reg_handoff_s1ap(void) /*--- End of included file: packet-s1ap-dis-tab.c ---*/ -#line 223 "../../asn1/s1ap/packet-s1ap-template.c" +#line 222 "../../asn1/s1ap/packet-s1ap-template.c" } else { if (SctpPort != 0) { dissector_delete_uint("sctp.port", SctpPort, s1ap_handle); @@ -13027,7 +13026,7 @@ void proto_register_s1ap(void) { NULL, HFILL }}, /*--- End of included file: packet-s1ap-hfarr.c ---*/ -#line 251 "../../asn1/s1ap/packet-s1ap-template.c" +#line 250 "../../asn1/s1ap/packet-s1ap-template.c" }; /* List of subtrees */ @@ -13317,7 +13316,7 @@ void proto_register_s1ap(void) { &ett_s1ap_EHRPDMultiSectorLoadReportingResponseItem, /*--- End of included file: packet-s1ap-ettarr.c ---*/ -#line 264 "../../asn1/s1ap/packet-s1ap-template.c" +#line 263 "../../asn1/s1ap/packet-s1ap-template.c" }; module_t *s1ap_module; |