From adf24fd4b1ebbcffe08f5c777c087206d3f12922 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Mayer?= Date: Tue, 14 Dec 2004 13:41:36 +0000 Subject: Fix the following gcc-4 error: ============== packet-ocsp.c:191: error: static declaration of 'Version_vals' follows non-static declaration packet-x509af.h:39: error: previous declaration of 'Version_vals' was here packet-ocsp.c: In function 'dissect_ocsp_T_response': packet-ocsp.c:398: warning: pointer targets in passing argument 5 of 'dissect_ber_identifier' differ in signedness packet-ocsp.c:398: warning: pointer targets in passing argument 7 of 'dissect_ber_identifier' differ in signedness make[4]: *** [packet-ocsp.lo] Error 1 ============== This fix is in the generated file only - please fix in the right source file too. svn path=/trunk/; revision=12751 --- epan/dissectors/packet-ocsp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'epan/dissectors/packet-ocsp.c') diff --git a/epan/dissectors/packet-ocsp.c b/epan/dissectors/packet-ocsp.c index 39aa52633d..16c261b11d 100644 --- a/epan/dissectors/packet-ocsp.c +++ b/epan/dissectors/packet-ocsp.c @@ -188,7 +188,7 @@ static int dissect_locator(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, } -static const value_string Version_vals[] = { +static const value_string OCSPVersion_vals[] = { { 0, "v1" }, { 0, NULL } }; @@ -838,7 +838,7 @@ void proto_register_ocsp(void) { "OCSPRequest/optionalSignature", HFILL }}, { &hf_ocsp_version, { "version", "ocsp.version", - FT_INT32, BASE_DEC, VALS(Version_vals), 0, + FT_INT32, BASE_DEC, VALS(OCSPVersion_vals), 0, "", HFILL }}, { &hf_ocsp_requestorName, { "requestorName", "ocsp.requestorName", -- cgit v1.2.3