summaryrefslogtreecommitdiffstats
path: root/support/nsm/file.c
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2010-12-13 14:47:42 -0500
committerSteve Dickson <steved@redhat.com>2010-12-13 14:56:11 -0500
commit089df7c754d9ebab0a7b804f396626ac95fee2e6 (patch)
tree81c742d8ed908d9cdf4e496843a7b8bbd9b1397b /support/nsm/file.c
parent7869a76207d3f4b3bd4ab57b4a7a8807ac2ff0c6 (diff)
downloadnfs-utils-089df7c754d9ebab0a7b804f396626ac95fee2e6.tar.gz
nfs-utils-089df7c754d9ebab0a7b804f396626ac95fee2e6.tar.xz
nfs-utils-089df7c754d9ebab0a7b804f396626ac95fee2e6.zip
libnsm.a: Replace __attribute_noinline__
Replace the __attribute_noinline__ form with __attribute__((__noinline__)). Even though the compiler didn't complain about __attribute_malloc__, also replace those in order to maintain consistent style throughout the source file. Fix for: https://bugzilla.linux-nfs.org/show_bug.cgi?id=194 Reported-by: "Gabor Z. Papp" <gzp@papp.hu> Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Steve Dickson <steved@redhat.com>
Diffstat (limited to 'support/nsm/file.c')
-rw-r--r--support/nsm/file.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/support/nsm/file.c b/support/nsm/file.c
index f4baeb9..4714bbf 100644
--- a/support/nsm/file.c
+++ b/support/nsm/file.c
@@ -126,7 +126,7 @@ exact_error_check(const ssize_t len, const size_t buflen)
* containing an appropriate pathname, or NULL if an error
* occurs. Caller must free the returned result with free(3).
*/
-__attribute_malloc__
+__attribute__((__malloc__))
static char *
nsm_make_record_pathname(const char *directory, const char *hostname)
{
@@ -174,7 +174,7 @@ nsm_make_record_pathname(const char *directory, const char *hostname)
* containing an appropriate pathname, or NULL if an error
* occurs. Caller must free the returned result with free(3).
*/
-__attribute_malloc__
+__attribute__((__malloc__))
static char *
nsm_make_pathname(const char *directory)
{
@@ -204,7 +204,7 @@ nsm_make_pathname(const char *directory)
* containing an appropriate pathname, or NULL if an error
* occurs. Caller must free the returned result with free(3).
*/
-__attribute_malloc__
+__attribute__((__malloc__))
static char *
nsm_make_temp_pathname(const char *pathname)
{
@@ -634,7 +634,7 @@ nsm_priv_to_hex(const char *priv, char *buf, const size_t buflen)
/*
* Returns the length in bytes of the created record.
*/
-__attribute_noinline__
+__attribute__((__noinline__))
static size_t
nsm_create_monitor_record(char *buf, const size_t buflen,
const struct sockaddr *sap, const struct mon *m)
@@ -784,7 +784,7 @@ out:
return result;
}
-__attribute_noinline__
+__attribute__((__noinline__))
static _Bool
nsm_parse_line(char *line, struct sockaddr_in *sin, struct mon *m)
{