diff options
author | Arthur de Jong <arthur@arthurdejong.org> | 2013-10-29 20:01:30 +0100 |
---|---|---|
committer | Arthur de Jong <arthur@arthurdejong.org> | 2013-10-29 23:20:01 +0100 |
commit | f8af48faa18b6d9017ea64f4df2d6ee2b1743df3 (patch) | |
tree | c27c3d3932b850c65854ca4b855fbb68d262207b /nss | |
parent | 88801f9e5a01e580adae4f386c0c755fb2a17b79 (diff) |
Fix a number of compiler warnings
This includes a number of small fixes for issues that were formerly
masked by the incorrect AC_LANG_PROGRAM check.
Diffstat (limited to 'nss')
-rw-r--r-- | nss/bsdnss.c | 13 | ||||
-rw-r--r-- | nss/ethers.c | 2 | ||||
-rw-r--r-- | nss/group.c | 2 | ||||
-rw-r--r-- | nss/netgroup.c | 3 | ||||
-rw-r--r-- | nss/networks.c | 2 | ||||
-rw-r--r-- | nss/passwd.c | 2 | ||||
-rw-r--r-- | nss/protocols.c | 2 | ||||
-rw-r--r-- | nss/rpc.c | 2 | ||||
-rw-r--r-- | nss/services.c | 2 |
9 files changed, 16 insertions, 14 deletions
diff --git a/nss/bsdnss.c b/nss/bsdnss.c index e2037ba..85c62b8 100644 --- a/nss/bsdnss.c +++ b/nss/bsdnss.c @@ -6,7 +6,7 @@ Copyright (C) 2003 Jacques Vidrine Copyright (C) 2006 Artem Kazakov Copyright (C) 2009 Alexander V. Chernikov - Copyright (C) 2011, 2012 Arthur de Jong + Copyright (C) 2011, 2012, 2013 Arthur de Jong Copyright (C) 2011 Tom Judge This library is free software; you can redistribute it and/or @@ -85,7 +85,7 @@ static ns_mtab methods[] = { { NSDB_PASSWD_COMPAT, "endpwent", __nss_compat_endpwent, _nss_ldap_endpwent }, }; -int __nss_compat_gethostbyname(void *retval, void *mdata, va_list ap) +int __nss_compat_gethostbyname(void UNUSED(*retval), void *mdata, va_list ap) { nss_status_t (*fn)(const char *, struct hostent *, char *, size_t, int *, int *); const char *name; @@ -105,7 +105,7 @@ int __nss_compat_gethostbyname(void *retval, void *mdata, va_list ap) return status; } -int __nss_compat_gethostbyname2(void *retval, void *mdata, va_list ap) +int __nss_compat_gethostbyname2(void UNUSED(*retval), void *mdata, va_list ap) { nss_status_t (*fn)(const char *, struct hostent *, char *, size_t, int *, int *); const char *name; @@ -125,7 +125,7 @@ int __nss_compat_gethostbyname2(void *retval, void *mdata, va_list ap) return status; } -int __nss_compat_gethostbyaddr(void *retval, void *mdata, va_list ap) +int __nss_compat_gethostbyaddr(void UNUSED(*retval), void *mdata, va_list ap) { struct in_addr *addr; int len; @@ -165,7 +165,8 @@ static int __gr_addgid(gid_t gid, gid_t *groups, int maxgrp, int *groupc) return ret; } -int __freebsd_getgroupmembership(void *retval, void *mdata, va_list ap) +int __freebsd_getgroupmembership(void UNUSED(*retval), void UNUSED(*mdata_), + va_list ap) { int err; nss_status_t s; @@ -199,7 +200,7 @@ int __freebsd_getgroupmembership(void *retval, void *mdata, va_list ap) return __nss_compat_result(s, 0); } -ns_mtab *nss_module_register(const char *source, unsigned int *mtabsize, +ns_mtab *nss_module_register(const char UNUSED(*source), unsigned int *mtabsize, nss_module_unregister_fn *unreg) { *mtabsize = sizeof(methods) / sizeof(methods[0]); diff --git a/nss/ethers.c b/nss/ethers.c index 9273fc4..b094a66 100644 --- a/nss/ethers.c +++ b/nss/ethers.c @@ -107,7 +107,7 @@ static char *etherent2str(struct etherent *result, char *buffer, int res; res = snprintf(buffer, buflen, "%s %s", ether_ntoa(&result->e_addr), result->e_name); - if ((res < 0) || (res >= buflen)) + if ((res < 0) || (res >= (int)buflen)) return NULL; return buffer; } diff --git a/nss/group.c b/nss/group.c index c00b086..5945718 100644 --- a/nss/group.c +++ b/nss/group.c @@ -194,7 +194,7 @@ static char *group2str(struct group *result, char *buffer, size_t buflen) int res, i; res = snprintf(buffer, buflen, "%s:%s:%d:", result->gr_name, result->gr_passwd, (int)result->gr_gid); - if ((res < 0) || (res >= buflen)) + if ((res < 0) || (res >= (int)buflen)) return NULL; if (result->gr_mem) for (i = 0; result->gr_mem[i]; i++) diff --git a/nss/netgroup.c b/nss/netgroup.c index 3777c4c..bd70768 100644 --- a/nss/netgroup.c +++ b/nss/netgroup.c @@ -321,7 +321,8 @@ static nss_backend_op_t netgroup_setnetgrent_ops[] = { netgroup_setnetgrent_getnetgrent, }; -static nss_status_t netgroup_setnetgrent_constructor(nss_backend_t *be, void *args) +static nss_status_t netgroup_setnetgrent_constructor(nss_backend_t UNUSED(*be), + void *args) { struct setnetgrent_backend *ngbe; nss_status_t retv; diff --git a/nss/networks.c b/nss/networks.c index 4130205..6d12ca6 100644 --- a/nss/networks.c +++ b/nss/networks.c @@ -170,7 +170,7 @@ static char *netent2str(struct netent *result, char *buffer, size_t buflen) struct in_addr priv_in_addr; priv_in_addr.s_addr = result->n_net; res = snprintf(buffer, buflen, "%s %s", result->n_name, inet_ntoa(priv_in_addr)); - if ((res < 0) || (res >= buflen)) + if ((res < 0) || (res >= (int)buflen)) return NULL; if (result->n_aliases) for (i = 0; result->n_aliases[i]; i++) diff --git a/nss/passwd.c b/nss/passwd.c index 8e69692..c17d8cc 100644 --- a/nss/passwd.c +++ b/nss/passwd.c @@ -106,7 +106,7 @@ static char *passwd2str(struct passwd *result, char *buffer, size_t buflen) result->pw_name, result->pw_passwd, (int)result->pw_uid, (int)result->pw_gid, result->pw_gecos, result->pw_dir, result->pw_shell); - if ((res < 0) || (res >= buflen)) + if ((res < 0) || (res >= (int)buflen)) return NULL; return buffer; } diff --git a/nss/protocols.c b/nss/protocols.c index 7787161..4944dff 100644 --- a/nss/protocols.c +++ b/nss/protocols.c @@ -98,7 +98,7 @@ static char *protoent2str(struct protoent *result, char *buffer, size_t buflen) { int res, i; res = snprintf(buffer, buflen, "%s\t\t%d", result->p_name, result->p_proto); - if ((res < 0) || (res >= buflen)) + if ((res < 0) || (res >= (int)buflen)) return NULL; if (result->p_aliases) for (i = 0; result->p_aliases[i]; i++) @@ -97,7 +97,7 @@ static char *rpcent2str(struct rpcent *result, char *buffer, size_t buflen) { int res, i; res = snprintf(buffer, buflen, "%s %d", result->r_name, result->r_number); - if ((res < 0) || (res >= buflen)) + if ((res < 0) || (res >= (int)buflen)) return NULL; if (result->r_aliases) for (i = 0; result->r_aliases[i]; i++) diff --git a/nss/services.c b/nss/services.c index a83a6ec..a2df9cb 100644 --- a/nss/services.c +++ b/nss/services.c @@ -106,7 +106,7 @@ static char *servent2str(struct servent *result, char *buffer, size_t buflen) int res, i; res = snprintf(buffer, buflen, "%s %d/%s", result->s_name, result->s_port, result->s_proto); - if ((res < 0) || (res >= buflen)) + if ((res < 0) || (res >= (int)buflen)) return NULL; if (result->s_aliases) for (i = 0; result->s_aliases[i]; i++) |