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@xxxxxxxxxx>
---
utils/mount/mount_config.h | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/utils/mount/mount_config.h b/utils/mount/mount_config.h
index 3023306..e86b4ba 100644
--- 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@xxxxxxxxxx>
*
* 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 *);
-inline void mount_config_init(char *program)
+static inline void mount_config_init(char *program)
{
xlog_open(program);
/*
@@ -32,19 +30,22 @@ inline void mount_config_init(char *program)
*/
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);
}
+
#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 */
-#endif
+
+#endif /* _LINUX_MOUNT_CONFIG_H */
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
