fence-agents: RHEL6 - fence_kdump: fix compiler warnings

rohara rohara at fedoraproject.org
Mon Aug 1 10:41:07 UTC 2011


Gitweb:        http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commitdiff;h=490b6325630710d8c8bff032ee3b074a2d4a2cf2
Commit:        490b6325630710d8c8bff032ee3b074a2d4a2cf2
Parent:        b3bc36322062ed35c48c4dc23b98cc4a7fa80dcb
Author:        Ryan O'Hara <rohara at redhat.com>
AuthorDate:    Tue Jul 26 13:56:29 2011 -0500
Committer:     Ryan O'Hara <rohara at redhat.com>
CommitterDate: Mon Aug 1 05:33:49 2011 -0500

fence_kdump: fix compiler warnings

Change 'inline void' function to 'static inline void' to avoid compiler
warnings.

Resolves: rhbz#461948

Signed-off-by: Ryan O'Hara <rohara at redhat.com>
Reviewed-by: Fabio M. Di Nitto <fdinitto at redhat.com>
---
 fence/agents/kdump/message.h |    2 +-
 fence/agents/kdump/options.h |   28 ++++++++++++++--------------
 fence/agents/kdump/version.h |    2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/fence/agents/kdump/message.h b/fence/agents/kdump/message.h
index 11e6d0f..3d1d2b4 100644
--- a/fence/agents/kdump/message.h
+++ b/fence/agents/kdump/message.h
@@ -32,7 +32,7 @@ typedef struct __attribute__ ((packed)) fence_kdump_msg {
     uint32_t version;
 } fence_kdump_msg_t;
 
-inline void
+static inline void
 init_message (fence_kdump_msg_t *msg)
 {
     msg->magic   = FENCE_KDUMP_MAGIC;
diff --git a/fence/agents/kdump/options.h b/fence/agents/kdump/options.h
index 6c7d274..10fa2a2 100644
--- a/fence/agents/kdump/options.h
+++ b/fence/agents/kdump/options.h
@@ -73,20 +73,20 @@ typedef struct fence_kdump_node {
     struct list_head list;
 } fence_kdump_node_t;
 
-inline void
+static inline void
 init_node (fence_kdump_node_t *node)
 {
     node->info = NULL;
 }
 
-inline void
+static inline void
 free_node (fence_kdump_node_t *node)
 {
     freeaddrinfo (node->info);
     free (node);
 }
 
-inline void
+static inline void
 print_node (const fence_kdump_node_t *node)
 {
     fprintf (stdout, "[debug]: node {       \n");
@@ -97,7 +97,7 @@ print_node (const fence_kdump_node_t *node)
     fprintf (stdout, "[debug]: }            \n");
 }
 
-inline void
+static inline void
 init_options (fence_kdump_opts_t *opts)
 {
     opts->nodename = NULL;
@@ -112,7 +112,7 @@ init_options (fence_kdump_opts_t *opts)
     INIT_LIST_HEAD (&opts->nodes);
 }
 
-inline void
+static inline void
 free_options (fence_kdump_opts_t *opts)
 {
     fence_kdump_node_t *node;
@@ -126,7 +126,7 @@ free_options (fence_kdump_opts_t *opts)
     free (opts->nodename);
 }
 
-inline void
+static inline void
 print_options (fence_kdump_opts_t *opts)
 {
     fence_kdump_node_t *node;
@@ -146,7 +146,7 @@ print_options (fence_kdump_opts_t *opts)
     }
 }
 
-inline void
+static inline void
 set_option_nodename (fence_kdump_opts_t *opts, const char *arg)
 {
     if (opts->nodename != NULL) {
@@ -156,7 +156,7 @@ set_option_nodename (fence_kdump_opts_t *opts, const char *arg)
     opts->nodename = strdup (arg);
 }
 
-inline void
+static inline void
 set_option_ipport (fence_kdump_opts_t *opts, const char *arg)
 {
     opts->ipport = atoi (arg);
@@ -167,7 +167,7 @@ set_option_ipport (fence_kdump_opts_t *opts, const char *arg)
     }
 }
 
-inline void
+static inline void
 set_option_family (fence_kdump_opts_t *opts, const char *arg)
 {
     if (!strcasecmp (arg, "auto")) {
@@ -182,7 +182,7 @@ set_option_family (fence_kdump_opts_t *opts, const char *arg)
     }
 }
 
-inline void
+static inline void
 set_option_action (fence_kdump_opts_t *opts, const char *arg)
 {
     if (!strcasecmp (arg, "off")) {
@@ -195,7 +195,7 @@ set_option_action (fence_kdump_opts_t *opts, const char *arg)
     }
 }
 
-inline void
+static inline void
 set_option_count (fence_kdump_opts_t *opts, const char *arg)
 {
     opts->count = atoi (arg);
@@ -206,7 +206,7 @@ set_option_count (fence_kdump_opts_t *opts, const char *arg)
     }
 }
 
-inline void
+static inline void
 set_option_interval (fence_kdump_opts_t *opts, const char *arg)
 {
     opts->interval = atoi (arg);
@@ -217,7 +217,7 @@ set_option_interval (fence_kdump_opts_t *opts, const char *arg)
     }
 }
 
-inline void
+static inline void
 set_option_timeout (fence_kdump_opts_t *opts, const char *arg)
 {
     opts->timeout = atoi (arg);
@@ -228,7 +228,7 @@ set_option_timeout (fence_kdump_opts_t *opts, const char *arg)
     }
 }
 
-inline void
+static inline void
 set_option_verbose (fence_kdump_opts_t *opts, const char *arg)
 {
     if (arg != NULL) {
diff --git a/fence/agents/kdump/version.h b/fence/agents/kdump/version.h
index e7959c4..ed178b1 100644
--- a/fence/agents/kdump/version.h
+++ b/fence/agents/kdump/version.h
@@ -24,7 +24,7 @@
 
 #define FENCE_KDUMP_VERSION "0.1"
 
-inline void
+static inline void
 print_version (const char *self)
 {
     fprintf (stdout, "%s %s\n", basename (self), FENCE_KDUMP_VERSION);


More information about the cluster-commits mailing list