From 7586ab64db1b8124d5eaf91974e7237760b9ae63 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Thu, 17 Nov 2005 05:02:30 +0000 Subject: Squelch some const vs. non-const warnings. svn path=/trunk/; revision=16525 --- asn1/x411/x411.cnf | 2 +- asn1/x509if/x509if.cnf | 2 +- epan/dissectors/packet-x411.c | 2 +- epan/dissectors/packet-x509if.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/asn1/x411/x411.cnf b/asn1/x411/x411.cnf index 1b67c0d54d..6fc533a945 100644 --- a/asn1/x411/x411.cnf +++ b/asn1/x411/x411.cnf @@ -291,7 +291,7 @@ UniversalOrganizationalUnitNames B "x411.extension-attribute.27" "universal-orga FN_VARIANT = _str VAL_PTR = &content_type_id #.FN_BODY ExtendedContentType - char *name = NULL; + const char *name = NULL; %(DEFAULT_BODY)s diff --git a/asn1/x509if/x509if.cnf b/asn1/x509if/x509if.cnf index 63f964bca7..1a24ae1c21 100644 --- a/asn1/x509if/x509if.cnf +++ b/asn1/x509if/x509if.cnf @@ -99,7 +99,7 @@ RequestAttribute/selectedValues/_item ra_selectedValues_item FN_VARIANT = _str HF_INDEX = hf_x509if_object_identifier_id VAL_PTR = &object_identifier_id #.FN_BODY AttributeId - char *name; + const char *name; %(DEFAULT_BODY)s diff --git a/epan/dissectors/packet-x411.c b/epan/dissectors/packet-x411.c index 042c342bac..d833074e83 100644 --- a/epan/dissectors/packet-x411.c +++ b/epan/dissectors/packet-x411.c @@ -2094,7 +2094,7 @@ static int dissect_built_in_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t static int dissect_x411_ExtendedContentType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - char *name = NULL; + const char *name = NULL; offset = dissect_ber_object_identifier_str(implicit_tag, pinfo, tree, tvb, offset, hf_index, &content_type_id); diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c index 8670f14171..746a0d51c8 100644 --- a/epan/dissectors/packet-x509if.c +++ b/epan/dissectors/packet-x509if.c @@ -365,7 +365,7 @@ static int dissect_description(packet_info *pinfo, proto_tree *tree, tvbuff_t *t static int dissect_x509if_AttributeId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - char *name; + const char *name; offset = dissect_ber_object_identifier_str(implicit_tag, pinfo, tree, tvb, offset, hf_x509if_object_identifier_id, &object_identifier_id); -- cgit v1.2.3