From 82d17d860eb8d1d97c34e862847423ed3873ef84 Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 17 Feb 2009 22:02:51 +0000
Subject: [PATCH] Warning fixes
---
libraries/libldap/abandon.c | 3 ---
libraries/libldap/gssapi.c | 8 ++++----
libraries/libldap/ldap-int.h | 10 ++++++++++
libraries/libldap/os-ip.c | 2 +-
libraries/libldap/os-local.c | 2 +-
libraries/libldap/result.c | 2 --
libraries/liblutil/meter.c | 1 -
7 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/libraries/libldap/abandon.c b/libraries/libldap/abandon.c
index bc7e5fe4a1..e8b32a0f3e 100644
--- a/libraries/libldap/abandon.c
+++ b/libraries/libldap/abandon.c
@@ -349,7 +349,6 @@ ldap_int_bisect_find( ber_int_t *v, ber_len_t n, ber_int_t id, int *idxp )
end,
rc = 0;
- assert( n >= 0 );
assert( id >= 0 );
begin = 0;
@@ -410,7 +409,6 @@ ldap_int_bisect_insert( ber_int_t **vp, ber_len_t *np, int id, int idx )
assert( vp != NULL );
assert( np != NULL );
- assert( *np >= 0 );
assert( idx >= 0 );
assert( (unsigned) idx <= *np );
@@ -451,7 +449,6 @@ ldap_int_bisect_delete( ber_int_t **vp, ber_len_t *np, int id, int idx )
assert( vp != NULL );
assert( np != NULL );
- assert( *np >= 0 );
assert( idx >= 0 );
assert( (unsigned) idx < *np );
diff --git a/libraries/libldap/gssapi.c b/libraries/libldap/gssapi.c
index 2f1385f327..c80ca2f8e7 100644
--- a/libraries/libldap/gssapi.c
+++ b/libraries/libldap/gssapi.c
@@ -351,8 +351,6 @@ map_gsserr2ldap(
int gss_rc,
OM_uint32 minor_status )
{
- OM_uint32 min2;
- OM_uint32 msg_ctx = 0;
char msg[256];
Debug( LDAP_DEBUG_ANY, "%s\n",
@@ -561,7 +559,7 @@ guess_service_principal(
}
ret = snprintf( svc_principal, svc_principal_size - 1, principal_fmt, str);
- if (ret < 0 || ret >= svc_principal_size - 1) {
+ if (ret < 0 || (size_t)ret + 1 >= svc_principal_size) {
ld->ld_errno = LDAP_LOCAL_ERROR;
return ld->ld_errno;
}
@@ -996,7 +994,9 @@ ldap_gssapi_bind(
LDAP *ld,
LDAP_CONST char *dn,
LDAP_CONST char *creds )
-{ return LDAP_NOT_SUPPORTED; }
+{
+ return LDAP_NOT_SUPPORTED;
+}
int
ldap_gssapi_bind_s(
diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index 81c4e6e1d1..f079753ed3 100644
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -694,6 +694,16 @@ LDAP_F (void) ldap_int_tls_destroy LDAP_P(( struct ldapoptions *lo ));
LDAP_F (char **) ldap_value_dup LDAP_P((
char *const *vals ));
+/*
+ * in gssapi.c
+ */
+#ifdef HAVE_GSSAPI
+LDAP_F(int) ldap_int_gssapi_get_option LDAP_P(( LDAP *ld, int option, void *arg ));
+LDAP_F(int) ldap_int_gssapi_set_option LDAP_P(( LDAP *ld, int option, void *arg ));
+LDAP_F(int) ldap_int_gssapi_config LDAP_P(( struct ldapoptions *lo, int option, const char *arg ));
+LDAP_F(void) ldap_int_gssapi_close LDAP_P(( LDAP *ld, LDAPConn *lc ));
+#endif
+
LDAP_END_DECL
#endif /* _LDAP_INT_H */
diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c
index 3fc414564b..a3a3306f93 100644
--- a/libraries/libldap/os-ip.c
+++ b/libraries/libldap/os-ip.c
@@ -207,7 +207,7 @@ ldap_pvt_is_socket_ready(LDAP *ld, int s)
== AC_SOCKET_ERROR )
{
/* XXX: needs to be replace with ber_stream_read() */
- int rc = read(s, &ch, 1);
+ (void)read(s, &ch, 1);
TRACE;
return -1;
}
diff --git a/libraries/libldap/os-local.c b/libraries/libldap/os-local.c
index 3c643c774a..aafce8b8e2 100644
--- a/libraries/libldap/os-local.c
+++ b/libraries/libldap/os-local.c
@@ -149,7 +149,7 @@ ldap_pvt_is_socket_ready(LDAP *ld, int s)
== AC_SOCKET_ERROR )
{
/* XXX: needs to be replace with ber_stream_read() */
- int rc = read(s, &ch, 1);
+ (void)read(s, &ch, 1);
TRACE;
return -1;
}
diff --git a/libraries/libldap/result.c b/libraries/libldap/result.c
index 21f02c9831..ad62a02d30 100644
--- a/libraries/libldap/result.c
+++ b/libraries/libldap/result.c
@@ -106,7 +106,6 @@ ldap_result(
struct timeval *timeout,
LDAPMessage **result )
{
- LDAPMessage *lm;
int rc;
assert( ld != NULL );
@@ -1384,7 +1383,6 @@ ldap_abandoned( LDAP *ld, ber_int_t msgid, int *idxp )
assert( idxp != NULL );
assert( msgid >= 0 );
- assert( ld->ld_nabandoned >= 0 );
return ldap_int_bisect_find( ld->ld_abandoned, ld->ld_nabandoned, msgid, idxp );
}
diff --git a/libraries/liblutil/meter.c b/libraries/liblutil/meter.c
index 6c631c7bd7..0bbbdc0307 100644
--- a/libraries/liblutil/meter.c
+++ b/libraries/liblutil/meter.c
@@ -141,7 +141,6 @@ lutil_meter_update (
int rc;
assert( meter != NULL );
- assert( position >= 0 );
lutil_get_now( &now );
--
GitLab