diff options
| author | Guy Harris <guy@alum.mit.edu> | 2010-02-23 04:35:23 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2010-02-23 04:35:23 +0000 |
| commit | b395a98305d447d544b480f5de59b3d76b7e7797 (patch) | |
| tree | 3da9f7edf233ea0fd8da8fe6176170656152bb1a /epan/dissectors/packet-ldap.c | |
| parent | c85899e946cf25597d3bd1328632bbb5c5456012 (diff) | |
Squelch a bunch of compiler warnings.
svn path=/trunk/; revision=31961
Diffstat (limited to 'epan/dissectors/packet-ldap.c')
| -rw-r--r-- | epan/dissectors/packet-ldap.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index d048144537..5e156f15bc 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -635,7 +635,7 @@ static int dissect_mscldap_ntver_flags(proto_tree *parent_tree, tvbuff_t *tvb, i } /* This string contains the last LDAPString that was decoded */ -static char *attributedesc_string=NULL; +static const char *attributedesc_string=NULL; /* This string contains the last AssertionValue that was decoded */ static char *ldapvalue_string=NULL; @@ -759,14 +759,14 @@ finished: } /* This string contains the last Filter item that was decoded */ -static char *Filter_string=NULL; +static const char *Filter_string=NULL; static char *and_filter_string=NULL; static char *or_filter_string=NULL; static char *substring_value=NULL; -static char *substring_item_init=NULL; -static char *substring_item_any=NULL; -static char *substring_item_final=NULL; -static char *matching_rule_string=NULL; +static const char *substring_item_init=NULL; +static const char *substring_item_any=NULL; +static const char *substring_item_final=NULL; +static const char *matching_rule_string=NULL; static gboolean matching_rule_dnattr=FALSE; /* Global variables */ @@ -971,7 +971,7 @@ static int dissect_ldap_LDAPString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 324 "ldap.cnf" tvbuff_t *parameter_tvb = NULL; - char *ldapstring = NULL; + const char *ldapstring = NULL; gchar *sc = NULL; /* semi-colon pointer */ offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -4113,22 +4113,22 @@ static int dissect_mscldap_netlogon_flags(proto_tree *parent_tree, tvbuff_t *tvb proto_item *item; proto_tree *tree=NULL; guint fields[] = { - hf_mscldap_netlogon_flags_fnc, - hf_mscldap_netlogon_flags_dnc, - hf_mscldap_netlogon_flags_dns, - hf_mscldap_netlogon_flags_wdc, - hf_mscldap_netlogon_flags_rodc, - hf_mscldap_netlogon_flags_ndnc, - hf_mscldap_netlogon_flags_good_timeserv, - hf_mscldap_netlogon_flags_writable, - hf_mscldap_netlogon_flags_closest, - hf_mscldap_netlogon_flags_timeserv, - hf_mscldap_netlogon_flags_kdc, - hf_mscldap_netlogon_flags_ds, - hf_mscldap_netlogon_flags_ldap, - hf_mscldap_netlogon_flags_gc, - hf_mscldap_netlogon_flags_pdc, - 0 }; + hf_mscldap_netlogon_flags_fnc, + hf_mscldap_netlogon_flags_dnc, + hf_mscldap_netlogon_flags_dns, + hf_mscldap_netlogon_flags_wdc, + hf_mscldap_netlogon_flags_rodc, + hf_mscldap_netlogon_flags_ndnc, + hf_mscldap_netlogon_flags_good_timeserv, + hf_mscldap_netlogon_flags_writable, + hf_mscldap_netlogon_flags_closest, + hf_mscldap_netlogon_flags_timeserv, + hf_mscldap_netlogon_flags_kdc, + hf_mscldap_netlogon_flags_ds, + hf_mscldap_netlogon_flags_ldap, + hf_mscldap_netlogon_flags_gc, + hf_mscldap_netlogon_flags_pdc, + 0 }; guint *field; header_field_info *hfi; gboolean one_bit_set = FALSE; |