diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-09-12 04:55:06 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2014-09-15 13:56:57 -0400 |
| commit | 69046e28fcdf42ecbbe777f080fff9656e242ed4 (patch) | |
| tree | b5c516adda0e458b1776ceab4fe8584e399b97e5 /utils/statd | |
| parent | f1816585555b8505c04375818ccfb797202d1f84 (diff) | |
| download | nfs-utils-69046e28fcdf42ecbbe777f080fff9656e242ed4.tar.gz nfs-utils-69046e28fcdf42ecbbe777f080fff9656e242ed4.tar.xz nfs-utils-69046e28fcdf42ecbbe777f080fff9656e242ed4.zip | |
replace __attribute_malloc__ with the more portable __attribute__((__malloc__))
Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
Signed-off-by: Steve Dickson <steved@redhat.com>
Diffstat (limited to 'utils/statd')
| -rw-r--r-- | utils/statd/hostname.c | 6 | ||||
| -rw-r--r-- | utils/statd/sm-notify.c | 8 | ||||
| -rw-r--r-- | utils/statd/statd.h | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/utils/statd/hostname.c b/utils/statd/hostname.c index 746ecc7..c61087c 100644 --- a/utils/statd/hostname.c +++ b/utils/statd/hostname.c @@ -105,7 +105,7 @@ statd_present_address(const struct sockaddr *sap, char *buf, const size_t buflen * Look up the hostname; report exceptional errors. Caller must * call freeaddrinfo(3) if a valid addrinfo is returned. */ -__attribute_malloc__ +__attribute__((__malloc__)) static struct addrinfo * get_addrinfo(const char *hostname, const struct addrinfo *hint) { @@ -184,7 +184,7 @@ get_nameinfo(const struct sockaddr *sap, * We won't monitor peers that don't have a reverse map. The canonical * name gives us a key for our monitor list. */ -__attribute_malloc__ +__attribute__((__malloc__)) char * statd_canonical_name(const char *hostname) { @@ -234,7 +234,7 @@ statd_canonical_name(const char *hostname) * NULL if some error occurs. Caller must free the returned * list with freeaddrinfo(3). */ -__attribute_malloc__ +__attribute__((__malloc__)) static struct addrinfo * statd_canonical_list(const char *hostname) { diff --git a/utils/statd/sm-notify.c b/utils/statd/sm-notify.c index 9dbe5d9..5994b2f 100644 --- a/utils/statd/sm-notify.c +++ b/utils/statd/sm-notify.c @@ -74,7 +74,7 @@ static int record_pid(void); static struct nsm_host * hosts = NULL; -__attribute_malloc__ +__attribute__((__malloc__)) static struct addrinfo * smn_lookup(const char *name) { @@ -149,7 +149,7 @@ smn_get_hostname(const struct sockaddr *sap, * if the canonical name doesn't exist or cannot be determined. * The caller must free the result with free(3). */ -__attribute_malloc__ +__attribute__((__malloc__)) static char * smn_verify_my_name(const char *name) { @@ -189,7 +189,7 @@ smn_verify_my_name(const char *name) return retval; } -__attribute_malloc__ +__attribute__((__malloc__)) static struct nsm_host * smn_alloc_host(const char *hostname, const char *mon_name, const char *my_name, const time_t timestamp) @@ -343,7 +343,7 @@ static int smn_socket(void) * If admin specified a source address or srcport, then convert those * to a sockaddr and return it. Otherwise, return an ANYADDR address. */ -__attribute_malloc__ +__attribute__((__malloc__)) static struct addrinfo * smn_bind_address(const char *srcaddr, const char *srcport) { diff --git a/utils/statd/statd.h b/utils/statd/statd.h index e89e666..a1d8035 100644 --- a/utils/statd/statd.h +++ b/utils/statd/statd.h @@ -25,7 +25,7 @@ extern _Bool statd_matchhostname(const char *hostname1, const char *hostname2); extern _Bool statd_present_address(const struct sockaddr *sap, char *buf, const size_t buflen); -__attribute_malloc__ +__attribute__((__malloc__)) extern char * statd_canonical_name(const char *hostname); extern void my_svc_run(void); |