cleanup messages about missing features

Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
sheepdog · Sep 8, 2015 · c2c61d7 · c2c61d7
1 parent f8e0a4f
commit c2c61d7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git 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
@@ -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;