mount.nfs: Eliminate compiler warning in utils/mount/mount.c

Clean up.

In file included from mount.c:41:
mount_config.h:35: warning: no previous prototype for mount_config_opts

Functions defined in include files are usually declared as "static
inline," eliminating the need for a forward declaration.

While I was there, I also fixed the macro that prevents including
mount_config.h multiple times, and fixed some white space damage.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/utils/mount/mount_config.h b/utils/mount/mount_config.h
index 3023306e5446248b2e00047a222400903aaad58e..e86b4ba0a95285a9f5932c9831ce153d229fb6af 100644 (file)
--- a/utils/mount/mount_config.h
+++ b/utils/mount/mount_config.h
@@ -1,7 +1,7 @@
-#ifndef _LINUX_MOUNT__CONFIG_H
-#define _LINUX_MOUNT_CONFIG__H
+#ifndef _LINUX_MOUNT_CONFIG_H
+#define _LINUX_MOUNT_CONFIG_H

 /*
 /*

- * mount_config.h -- mount configuration file routines 
+ * mount_config.h -- mount configuration file routines

  * Copyright (C) 2008 Red Hat, Inc <nfs@redhat.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * Copyright (C) 2008 Red Hat, Inc <nfs@redhat.com>
  *
  * This program is free software; you can redistribute it and/or modify


@@ -16,15 +16,13 @@
  *
  */
 
  *
  */
 

-inline void mount_config_init(char *);
-

 #ifdef MOUNT_CONFIG
 #include "conffile.h"
 #include "xlog.h"
 
 extern char *conf_get_mntopts(char *, char *, char *);
 
 #ifdef MOUNT_CONFIG
 #include "conffile.h"
 #include "xlog.h"
 
 extern char *conf_get_mntopts(char *, char *, char *);
 

-inline void mount_config_init(char *program)
+static inline void mount_config_init(char *program)

 {
        xlog_open(program);
        /*
 {
        xlog_open(program);
        /*


@@ -32,19 +30,22 @@ inline void mount_config_init(char *program)
         */
        conf_init();
 }
         */
        conf_init();
 }

-inline char *mount_config_opts(char *spec, 
+
+static inline char *mount_config_opts(char *spec,

                char *mount_point, char *mount_opts)
 {
        return conf_get_mntopts(spec, mount_point, mount_opts);
 }
                char *mount_point, char *mount_opts)
 {
        return conf_get_mntopts(spec, mount_point, mount_opts);
 }

+

 #else /* MOUNT_CONFIG */
 
 #else /* MOUNT_CONFIG */
 

-inline void mount_config_init(char *program) { }
+static inline void mount_config_init(char *program) { }

 
 

-inline char *mount_config_opts(char *spec, 
+static inline char *mount_config_opts(char *spec,

                char *mount_point, char *mount_opts)
 {
        return mount_opts;
 }
 #endif /* MOUNT_CONFIG */
                char *mount_point, char *mount_opts)
 {
        return mount_opts;
 }
 #endif /* MOUNT_CONFIG */

-#endif
+
+#endif /* _LINUX_MOUNT_CONFIG_H */