External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-31 17:05:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

nss: Use macro to generate public API names

Browse Source 
The name of the exported functions for an NSS module is quite
fixed, it is derived from the module name:

  _nss_$module_$function

Since we will create another NSS module with very similar
implementation we might as well generate the function names at
the compile time.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2016-12-04 11:56:44 +01:00
parent 1f9db235e7
commit 30efb515ce
4 changed files with 42 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/nsslinktest.c
View File

@ -33,7 +33,7 @@ int main(int argc ATTRIBUTE_UNUSED,
* the fact this test has been built successfully means
* there's no linkage problem and therefore success is
* returned. */
_nss_libvirt_gethostbyname_r(NULL, NULL, NULL, 0, &err, &herrno);
NSS_NAME(gethostbyname)(NULL, NULL, NULL, 0, &err, &herrno);
return EXIT_SUCCESS;
}

12
tests/nsstest.c
View File

@ -53,12 +53,12 @@ testGetHostByName(const void *opaque)
memset(&resolved, 0, sizeof(resolved));
rv = _nss_libvirt_gethostbyname2_r(data->hostname,
data->af,
&resolved,
buf, sizeof(buf),
&tmp_errno,
&tmp_herrno);
rv = NSS_NAME(gethostbyname2)(data->hostname,
data->af,
&resolved,
buf, sizeof(buf),
&tmp_errno,
&tmp_herrno);
if (rv == NSS_STATUS_TRYAGAIN ||
rv == NSS_STATUS_UNAVAIL ||

41
tools/nss/libvirt_nss.c
View File

@ -253,23 +253,23 @@ findLease(const char *name,
enum nss_status
_nss_libvirt_gethostbyname_r(const char *name, struct hostent *result,
char *buffer, size_t buflen, int *errnop,
int *herrnop)
NSS_NAME(gethostbyname)(const char *name, struct hostent *result,
char *buffer, size_t buflen, int *errnop,
int *herrnop)
{
int af = ((_res.options & RES_USE_INET6) ? AF_INET6 : AF_INET);
return _nss_libvirt_gethostbyname3_r(name, af, result, buffer, buflen,
errnop, herrnop, NULL, NULL);
return NSS_NAME(gethostbyname3)(name, af, result, buffer, buflen,
errnop, herrnop, NULL, NULL);
}
enum nss_status
_nss_libvirt_gethostbyname2_r(const char *name, int af, struct hostent *result,
char *buffer, size_t buflen, int *errnop,
int *herrnop)
NSS_NAME(gethostbyname2)(const char *name, int af, struct hostent *result,
char *buffer, size_t buflen, int *errnop,
int *herrnop)
{
return _nss_libvirt_gethostbyname3_r(name, af, result, buffer, buflen,
errnop, herrnop, NULL, NULL);
return NSS_NAME(gethostbyname3)(name, af, result, buffer, buflen,
errnop, herrnop, NULL, NULL);
}
static inline void *
@ -287,9 +287,9 @@ move_and_align(void *buf, size_t len, size_t *idx)
}
enum nss_status
_nss_libvirt_gethostbyname3_r(const char *name, int af, struct hostent *result,
char *buffer, size_t buflen, int *errnop,
int *herrnop, int32_t *ttlp, char **canonp)
NSS_NAME(gethostbyname3)(const char *name, int af, struct hostent *result,
char *buffer, size_t buflen, int *errnop,
int *herrnop, int32_t *ttlp, char **canonp)
{
enum nss_status ret = NSS_STATUS_UNAVAIL;
char *r_name, **r_aliases, *r_addr, *r_addr_next, **r_addr_list;
@ -405,9 +405,9 @@ _nss_libvirt_gethostbyname3_r(const char *name, int af, struct hostent *result,
#ifdef HAVE_STRUCT_GAIH_ADDRTUPLE
enum nss_status
_nss_libvirt_gethostbyname4_r(const char *name, struct gaih_addrtuple **pat,
char *buffer, size_t buflen, int *errnop,
int *herrnop, int32_t *ttlp)
NSS_NAME(gethostbyname4)(const char *name, struct gaih_addrtuple **pat,
char *buffer, size_t buflen, int *errnop,
int *herrnop, int32_t *ttlp)
{
enum nss_status ret = NSS_STATUS_UNAVAIL;
leaseAddress *addr = NULL;
@ -517,9 +517,9 @@ aiforaf(const char *name, int af, struct addrinfo *pai, struct addrinfo **aip)
struct addrinfo hints, *res0, *res;
char **addrList;
if ((ret = _nss_libvirt_gethostbyname2_r(name, af, &resolved,
buf, sizeof(buf),
&err, &herr)) != NS_SUCCESS)
if ((ret = NSS_NAME(gethostbyname2)(name, af, &resolved,
buf, sizeof(buf),
&err, &herr)) != NS_SUCCESS)
return;
addrList = resolved.h_addr_list;
@ -604,8 +604,7 @@ _nss_compat_gethostbyname2_r(void *retval, void *mdata ATTRIBUTE_UNUSED, va_list
errnop = va_arg(ap, int *);
herrnop = va_arg(ap, int *);
ret = _nss_libvirt_gethostbyname2_r(
name, af, result, buffer, buflen, errnop, herrnop);
ret = NSS_NAME(gethostbyname2)(name, af, result, buffer, buflen, errnop, herrnop);
*(struct hostent **)retval = (ret == NS_SUCCESS) ? result : NULL;
return ret;

28
tools/nss/libvirt_nss.h
View File

@ -32,24 +32,26 @@
# include <nss.h>
# include <netdb.h>
enum nss_status
_nss_libvirt_gethostbyname_r(const char *name, struct hostent *result,
char *buffer, size_t buflen, int *errnop,
int *herrnop);
# define NSS_NAME(s) _nss_libvirt_##s##_r
enum nss_status
_nss_libvirt_gethostbyname2_r(const char *name, int af, struct hostent *result,
char *buffer, size_t buflen, int *errnop,
int *herrnop);
NSS_NAME(gethostbyname)(const char *name, struct hostent *result,
char *buffer, size_t buflen, int *errnop,
int *herrnop);
enum nss_status
_nss_libvirt_gethostbyname3_r(const char *name, int af, struct hostent *result,
char *buffer, size_t buflen, int *errnop,
int *herrnop, int32_t *ttlp, char **canonp);
NSS_NAME(gethostbyname2)(const char *name, int af, struct hostent *result,
char *buffer, size_t buflen, int *errnop,
int *herrnop);
enum nss_status
NSS_NAME(gethostbyname3)(const char *name, int af, struct hostent *result,
char *buffer, size_t buflen, int *errnop,
int *herrnop, int32_t *ttlp, char **canonp);
# ifdef HAVE_STRUCT_GAIH_ADDRTUPLE
enum nss_status
_nss_libvirt_gethostbyname4_r(const char *name, struct gaih_addrtuple **pat,
char *buffer, size_t buflen, int *errnop,
int *herrnop, int32_t *ttlp);
NSS_NAME(gethostbyname4)(const char *name, struct gaih_addrtuple **pat,
char *buffer, size_t buflen, int *errnop,
int *herrnop, int32_t *ttlp);
# endif /* HAVE_STRUCT_GAIH_ADDRTUPLE */
# if defined(HAVE_BSD_NSS)