From c2c61d78678050a4c983cfa4aebc9263a0020b29 Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Mon, 7 Sep 2015 15:07:23 +0000 Subject: [PATCH] cleanup messages about missing features Signed-off-by: Vasiliy Tolstov --- sheep/sheep.c | 4 ++++ sheep/sheep_priv.h | 12 ------------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/sheep/sheep.c b/sheep/sheep.c index 2236f1c54..502c51cd2 100644 --- a/sheep/sheep.c +++ b/sheep/sheep.c @@ -1027,12 +1027,16 @@ int main(int argc, char **argv) if (ret) goto cleanup_journal; + #ifdef HAVE_HTTP if (http_options && http_init(http_options) != 0) goto cleanup_journal; + #endif + #ifdef HAVE_NFS ret = nfs_init(NULL); if (ret) goto cleanup_journal; + #endif if (pid_file && (create_pidfile(pid_file) != 0)) { sd_err("failed to pid file '%s' - %m", pid_file); diff --git a/sheep/sheep_priv.h b/sheep/sheep_priv.h index 54412fada..5d299414c 100644 --- a/sheep/sheep_priv.h +++ b/sheep/sheep_priv.h @@ -631,24 +631,12 @@ static inline bool is_ec_dentry(const char *dentry) /* http.c */ #ifdef HAVE_HTTP int http_init(const char *options); -#else -static inline int http_init(const char *options) -{ - sd_notice("http service is not compiled"); - return 0; -} #endif /* END BUILD_HTTP */ #ifdef HAVE_NFS int nfs_init(const char *options); int nfs_create(const char *name); int nfs_delete(const char *name); -#else -static inline int nfs_init(const char *options) -{ - sd_notice("nfs server service is not compiled"); - return 0; -} #endif extern bool wildcard_recovery;