From: Luke Howard <lukeh@padl.com>
Date: Wed, 9 Mar 2011 13:43:25 +0000 (+1100)
Subject: remove __attribute__((__unused__)) for now until we have a portable solution
X-Git-Tag: vm/20110310~17
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.orig;a=commitdiff_plain;h=d683d523c7b4b88a15423069520221ac575376e1

remove __attribute__((__unused__)) for now until we have a portable solution
---

diff --git a/Makefile.am b/Makefile.am
index f9be930..eaa3fc1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,9 +7,9 @@ gssdir = $(libdir)/gss
 gss_LTLIBRARIES = mech_eap.la
 
 mech_eap_la_CPPFLAGS = -DBUILD_GSSEAP_LIB -DSYSCONFDIR=\"${sysconfdir}\" -DDATAROOTDIR=\"${datarootdir}\"
-mech_eap_la_CFLAGS   = -g -Wall -fno-strict-aliasing \
+mech_eap_la_CFLAGS   = -g -Wunused-parameter -Wall -fno-strict-aliasing \
 			@KRB5_CFLAGS@ @EAP_CFLAGS@ @RADSEC_CFLAGS@ @TARGET_CFLAGS@
-mech_eap_la_CXXFLAGS = -g -Wall \
+mech_eap_la_CXXFLAGS = -g -Wunused-parameter -Wall \
 			@KRB5_CFLAGS@ @EAP_CFLAGS@ @RADSEC_CFLAGS@ \
 		        @SHIBRESOLVER_CXXFLAGS@ @SHIBSP_CXXFLAGS@ @TARGET_CFLAGS@
 mech_eap_la_LDFLAGS  = -avoid-version -module \
diff --git a/accept_sec_context.c b/accept_sec_context.c
index 1690937..723c932 100644
--- a/accept_sec_context.c
+++ b/accept_sec_context.c
@@ -42,10 +42,10 @@ static OM_uint32
 eapGssSmAcceptGssReauth(OM_uint32 *minor,
                         gss_cred_id_t cred,
                         gss_ctx_id_t ctx,
-                        gss_name_t target __attribute__((__unused__)),
-                        gss_OID mech __attribute__((__unused__)),
-                        OM_uint32 reqFlags __attribute__((__unused__)),
-                        OM_uint32 timeReq __attribute__((__unused__)),
+                        gss_name_t target,
+                        gss_OID mech,
+                        OM_uint32 reqFlags,
+                        OM_uint32 timeReq,
                         gss_channel_bindings_t chanBindings,
                         gss_buffer_t inputToken,
                         gss_buffer_t outputToken,
@@ -182,11 +182,11 @@ static OM_uint32
 eapGssSmAcceptIdentity(OM_uint32 *minor,
                        gss_cred_id_t cred,
                        gss_ctx_id_t ctx,
-                       gss_name_t target __attribute__((__unused__)),
-                       gss_OID mech __attribute__((__unused__)),
-                       OM_uint32 reqFlags __attribute__((__unused__)),
-                       OM_uint32 timeReq __attribute__((__unused__)),
-                       gss_channel_bindings_t chanBindings __attribute__((__unused__)),
+                       gss_name_t target,
+                       gss_OID mech,
+                       OM_uint32 reqFlags,
+                       OM_uint32 timeReq,
+                       gss_channel_bindings_t chanBindings,
                        gss_buffer_t inputToken,
                        gss_buffer_t outputToken,
                        OM_uint32 *smFlags)
@@ -466,10 +466,10 @@ static OM_uint32
 eapGssSmAcceptAuthenticate(OM_uint32 *minor,
                            gss_cred_id_t cred,
                            gss_ctx_id_t ctx,
-                           gss_name_t target __attribute__((__unused__)),
-                           gss_OID mech __attribute__((__unused__)),
-                           OM_uint32 reqFlags __attribute__((__unused__)),
-                           OM_uint32 timeReq __attribute__((__unused__)),
+                           gss_name_t target,
+                           gss_OID mech,
+                           OM_uint32 reqFlags,
+                           OM_uint32 timeReq,
                            gss_channel_bindings_t chanBindings,
                            gss_buffer_t inputToken,
                            gss_buffer_t outputToken,
@@ -600,10 +600,10 @@ static OM_uint32
 eapGssSmAcceptGssChannelBindings(OM_uint32 *minor,
                                  gss_cred_id_t cred,
                                  gss_ctx_id_t ctx,
-                                 gss_name_t target __attribute__((__unused__)),
-                                 gss_OID mech __attribute__((__unused__)),
-                                 OM_uint32 reqFlags __attribute__((__unused__)),
-                                 OM_uint32 timeReq __attribute__((__unused__)),
+                                 gss_name_t target,
+                                 gss_OID mech,
+                                 OM_uint32 reqFlags,
+                                 OM_uint32 timeReq,
                                  gss_channel_bindings_t chanBindings,
                                  gss_buffer_t inputToken,
                                  gss_buffer_t outputToken,
@@ -643,11 +643,11 @@ static OM_uint32
 eapGssSmAcceptReauthCreds(OM_uint32 *minor,
                           gss_cred_id_t cred,
                           gss_ctx_id_t ctx,
-                          gss_name_t target __attribute__((__unused__)),
-                          gss_OID mech __attribute__((__unused__)),
-                          OM_uint32 reqFlags __attribute__((__unused__)),
-                          OM_uint32 timeReq __attribute__((__unused__)),
-                          gss_channel_bindings_t chanBindings __attribute__((__unused__)),
+                          gss_name_t target,
+                          gss_OID mech,
+                          OM_uint32 reqFlags,
+                          OM_uint32 timeReq,
+                          gss_channel_bindings_t chanBindings,
                           gss_buffer_t inputToken,
                           gss_buffer_t outputToken,
                           OM_uint32 *smFlags)
@@ -923,10 +923,10 @@ static OM_uint32
 eapGssSmAcceptGssReauth(OM_uint32 *minor,
                         gss_cred_id_t cred,
                         gss_ctx_id_t ctx,
-                        gss_name_t target __attribute__((__unused__)),
+                        gss_name_t target,
                         gss_OID mech,
-                        OM_uint32 reqFlags __attribute__((__unused__)),
-                        OM_uint32 timeReq __attribute__((__unused__)),
+                        OM_uint32 reqFlags,
+                        OM_uint32 timeReq,
                         gss_channel_bindings_t chanBindings,
                         gss_buffer_t inputToken,
                         gss_buffer_t outputToken,
diff --git a/unwrap_iov.c b/unwrap_iov.c
index d5c3a52..fa9a6a5 100644
--- a/unwrap_iov.c
+++ b/unwrap_iov.c
@@ -70,7 +70,7 @@ unwrapToken(OM_uint32 *minor,
 #ifdef HAVE_HEIMDAL_VERSION
             krb5_crypto krbCrypto,
 #else
-            krb5_keyblock *unused __attribute__((__unused__)),
+            krb5_keyblock *unused,
 #endif
             int *conf_state,
             gss_qop_t *qop_state,