Prep v228: Add remaining updates from upstream (2/3)

[elogind.git] / src / basic / hostname-util.c

diff --git a/src/basic/hostname-util.c b/src/basic/hostname-util.c
index a55b4149d4eff9e9350ef13f9d7846fd6bed6de6..6ad479d55fa53fdfbf9c559929abc4f3be8e6b23 100644 (file)
--- a/src/basic/hostname-util.c
+++ b/src/basic/hostname-util.c
@@ -19,11 +19,14 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <sys/utsname.h>
 #include <ctype.h>
+#include <sys/utsname.h>
 
-#include "util.h"
+//#include "fd-util.h"
+#include "fileio.h"
 #include "hostname-util.h"
+#include "string-util.h"
+#include "util.h"
 
 /// UNNEEDED by elogind
 #if 0
@@ -113,6 +116,8 @@ bool hostname_is_valid(const char *s, bool allow_trailing_dot) {
         return true;
 }
 
+/// UNNEEDED by elogind
+#if 0
 char* hostname_cleanup(char *s) {
         char *p, *d;
         bool dot;
@@ -142,6 +147,7 @@ char* hostname_cleanup(char *s) {
 
         return s;
 }
+#endif // 0
 
 bool is_localhost(const char *hostname) {
         assert(hostname);