X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=utils%2Fmount%2Fmount_config.h;h=e86b4ba0a95285a9f5932c9831ce153d229fb6af;hb=93dcf64cc4a9e67f693aea35c8193428015f4a30;hp=2af9f9de532176639ff800b348eb3d76bf197289;hpb=9082582d6675e45067838805a65b6fcc07164557;p=nfs-utils.git diff --git a/utils/mount/mount_config.h b/utils/mount/mount_config.h index 2af9f9d..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 * * This program is free software; you can redistribute it and/or modify @@ -16,32 +16,36 @@ * */ -inline void mount_config_init(void); - #ifdef MOUNT_CONFIG #include "conffile.h" +#include "xlog.h" + extern char *conf_get_mntopts(char *, char *, char *); -inline void mount_config_init() +static inline void mount_config_init(char *program) { + xlog_open(program); /* * Read the the default mount options */ 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() { } +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 */