Make sure files in this changeset are formatted properly

[collectd.git] / src / daemon / globals.c

diff --git a/src/daemon/globals.c b/src/daemon/globals.c
index b720cd8..85f1b11 100644 (file)
--- a/src/daemon/globals.c
+++ b/src/daemon/globals.c
@@ -1,6 +1,6 @@
 /**
  * collectd - src/globals.c
- * Copyright (C) 2017  Florian octo Forster
+ * Copyright (C) 2017  Google LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -21,18 +21,34 @@
  * DEALINGS IN THE SOFTWARE.
  **/
 
-#include "common.h"
+// clang-format off
+/*
+ * Explicit order is required or _FILE_OFFSET_BITS will have definition mismatches on Solaris
+ * See Github Issue #3193 for details
+ */
+#include "utils/common/common.h"
 #include "globals.h"
+// clang-format on
 
-void hostname_set(char const *hostname) {
-  sstrncpy(hostname_g, hostname, sizeof(hostname_g));
-}
+#if HAVE_KSTAT_H
+#include <kstat.h>
+#endif
 
 /*
  * Global variables
  */
 char *hostname_g;
 cdtime_t interval_g;
-int  timeout_g;
+int timeout_g;
+#if HAVE_KSTAT_H
 kstat_ctl_t *kc;
+#endif
 
+void hostname_set(char const *hostname) {
+  char *h = strdup(hostname);
+  if (h == NULL)
+    return;
+
+  sfree(hostname_g);
+  hostname_g = h;
+}