Merge some funcs

diff --git a/README.md b/README.md
index c73d6b1..671ef29 100644 (file)
--- a/README.md
+++ b/README.md
@@ -226,7 +226,9 @@ GNU Build System
 * automake
 * autoconf-wrapper
 * automake-wrapper
+* autoconf-archive
 * argp-standalone
+* libtool
 * m4
 * gawk
 

diff --git a/TODO b/TODO
deleted file mode 100644 (file)
index f1d0268..0000000
--- a/TODO
+++ /dev/null
@@ -1,3 +0,0 @@
-* Merge the repeating functions in another module that can be shared between linux and freebsd.
-* Test other C library than the default shipped in FreeBSD.
-* If necessary, write more freebsd m4 tests to catch the new misbehaving non-default FreeBSD C library.

diff --git a/src/common.c b/src/common.c
index b051002..091ecc8 100644 (file)
--- a/src/common.c
+++ b/src/common.c
@@ -18,9 +18,31 @@
    MA 02110-1301, USA.
 */
 
-#include "config.h"
+/* Functions shared between Linux and FreeBSD */
+
+#include "config.h" /* Auto-generated */
+
+#include <sys/statvfs.h>
+#include <sys/utsname.h>
+
+#if defined(__linux__)
+#include <glob.h>
+#endif /* __linux__ */
+
+#if defined (HAVE_X11_XLIB_H)
+#include <X11/Xlib.h>
+#endif
+
 #include "include/headers.h"
 
+#if defined(__FreeBSD__)
+#include "include/freebzd.h"
+#endif /* __FreeBSD__ */
+
+#if defined(__linux__)
+static uint_fast16_t glob_packages(const char *);
+#endif /* __linux__ */
+
 void
 exit_with_err(const char *str1, const char *str2) {
   printf("%s %s\n", str1, str2);
@@ -42,3 +64,237 @@ get_temp(const char *str1, char *str2) {
 
   FILL_UINT_ARR(str2, temp);
 }
+
+
+void 
+get_ssd(char *str1, unsigned char num) {
+  uintmax_t val = 0;
+  struct statvfs ssd;
+
+  if (-1 == (statvfs(getenv("HOME"), &ssd))) {
+    FUNC_FAILED("statvfs()");
+  }
+
+  switch(num) {
+    case 1:
+      FILL_ARR(str1, FMT_UINT "%s",
+        (uintmax_t)(ssd.f_blocks * ssd.f_bsize) / GB, "GB");
+      break;
+    case 2:
+      FILL_ARR(str1, FMT_UINT "%s",
+        (uintmax_t)(ssd.f_bfree * ssd.f_bsize) / GB, "GB");
+      break;
+    case 3:
+      FILL_ARR(str1, FMT_UINT "%s",
+        (uintmax_t)(ssd.f_bavail * ssd.f_bsize) / GB, "GB");
+      break;
+    case 4:
+      {
+        val = (uintmax_t)((
+          ssd.f_blocks - ssd.f_bfree) * ssd.f_bsize) / GB;
+        FILL_UINT_ARR(str1, val);
+      }
+      break;
+  }
+
+}
+
+
+void 
+get_kernel(char *str1, unsigned char num) {
+  struct utsname KerneL;
+  if (-1 == (uname(&KerneL))) {
+    FUNC_FAILED("uname()");
+  }
+
+  switch(num) {
+    case 1:
+      FILL_STR_ARR(1, str1, KerneL.sysname);
+      break;
+    case 2:
+      FILL_STR_ARR(1, str1, KerneL.nodename);
+      break;
+    case 3:
+      FILL_STR_ARR(1, str1, KerneL.release);
+      break;
+    case 4:
+      FILL_STR_ARR(1, str1, KerneL.version);
+      break;
+    case 5:
+      FILL_STR_ARR(1, str1, KerneL.machine);
+      break;
+    case 6:
+      FILL_STR_ARR(2, str1, KerneL.sysname, KerneL.release);
+      break;
+  }
+
+}
+
+#if defined(__linux__)
+/* Source (my improved screenfetch-c fork):
+ * https://github.com/wifiextender/screenfetch-c/blob/master/src/plat/linux/detect.c */
+static uint_fast16_t 
+glob_packages(const char *str1) {
+  uint_fast16_t packs_num = 0;
+  glob_t gl;
+
+  if (0 == (glob(str1, GLOB_NOSORT, NULL, &gl)))
+    packs_num = gl.gl_pathc;
+
+  else {
+    exit_with_err("Could not traverse", str1);
+  }
+
+  globfree(&gl);
+
+  return packs_num;
+}
+#endif /* __linux__ */
+
+
+/* Let the compiler strip the code
+ * instead conditionally checking 
+ * each time the program is executed */
+void 
+get_packs(char *str1) {
+  uint_fast16_t packages = 0;
+
+#if DISTRO == ARCHLINUX
+  packages = glob_packages("/var/lib/pacman/local/*");
+
+#elif DISTRO == FRUGALWARE
+  FILE *pkgs_file = popen("pacman-g2 -Q 2> /dev/null | wc -l", "r");
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-result"
+  fscanf(pkgs_file, "%"SCNuFAST16, &packages);
+#pragma GCC diagnostic pop
+
+  pclose(pkgs_file);
+
+#elif DISTRO == DEBIAN
+  packages = glob_packages("/var/lib/dpkg/info/*.list");
+
+#elif DISTRO == SLACKWARE
+  packages = glob_packages("/var/log/packages/*");
+
+#elif DISTRO == GENTOO
+  packages = glob_packages("/var/db/pkg/*/*");
+
+#elif DISTRO == RHEL
+  FILE *pkgs_file = popen("rpm -qa 2> /dev/null | wc -l", "r");
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-result"
+  fscanf(pkgs_file, "%"SCNuFAST16, &packages);
+#pragma GCC diagnostic pop
+
+  pclose(pkgs_file);
+
+#elif DISTRO == ANGSTROM
+  FILE *pkgs_file = popen("opkg list-installed 2> /dev/null | wc -l", "r");
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-result"
+  fscanf(pkgs_file, "%"SCNuFAST16, &packages);
+#pragma GCC diagnostic pop
+
+  pclose(pkgs_file);
+
+#elif DISTRO == FREEBSD
+  FILE *pkgs_file = popen("pkg info | wc -l", "r");
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-result"
+  fscanf(pkgs_file, "%"SCNuFAST16, &packages);
+#pragma GCC diagnostic pop
+
+  pclose(pkgs_file);
+
+#endif
+
+  FILL_ARR(str1, "%"PRIuFAST16, packages);
+}
+
+
+void
+get_uptime(char *str1) {
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+  struct timespec tc = {0};
+#pragma GCC diagnostic pop
+
+  uintmax_t now = 0;
+
+#if defined(__linux__)
+  if (-1 == (clock_gettime(CLOCK_BOOTTIME, &tc))) {
+    FUNC_FAILED("clock_gettime()");
+  }
+
+  now = (uintmax_t)tc.tv_sec;
+#else
+  int mib[2] = { CTL_KERN, KERN_BOOTTIME };
+  time_t t;
+  size_t len = sizeof(tc);
+
+  if (0 != sysctl(mib, 2, &tc, &len, NULL, 0)) {
+    FUNC_FAILED("sysctl()");
+  }
+
+  if (-1 == (t = time(NULL))) {
+    FUNC_FAILED("time()");
+  }
+
+  now = (uintmax_t)t - (uintmax_t)tc.tv_sec;
+#endif /* __linux__ */
+
+  if ((0 != (now / 86400))) { /* days */
+    FILL_ARR(str1, FMT_UINT "d " FMT_UINT "h " FMT_UINT "m",
+      (now / 86400),
+      ((now / 3600) % 24),
+      ((now / 60) % 60));
+    return;
+  }
+  if (59 < (now / 60)) { /* hours */
+    FILL_ARR(str1, FMT_UINT "h " FMT_UINT "m",
+      ((now / 3600) % 24),
+      ((now / 60) % 60));
+    return;
+  }
+
+  FILL_ARR(str1, FMT_UINT "m", ((now / 60) % 60));
+}
+
+
+/* The `strftime' man page showed potential bugs */
+void 
+get_taim(char *str1) {
+  char time_str[VLA];
+  time_t t;
+  struct tm *taim;
+
+  if (-1 == (t = time(NULL)) || 
+      NULL == (taim = localtime(&t)) ||
+      0 == (strftime(time_str, VLA, "%I:%M %p", taim))) {
+    exit_with_err(ERR, "time() or localtime() or strftime() failed");
+  }
+  FILL_STR_ARR(1, str1, time_str);
+}
+
+
+#if defined (HAVE_X11_XLIB_H)
+void 
+set_status(const char *str1) {
+  Display *display = XOpenDisplay(NULL);
+
+  if (display) {
+    XStoreName(display, DefaultRootWindow(display), str1);
+    XSync(display, 0);
+    XCloseDisplay(display);
+
+  } else {
+    exit_with_err(CANNOT_OPEN, "X server");
+  }
+}
+#endif

diff --git a/src/cpu.c b/src/cpu.c
index 2eac272..e87b425 100644 (file)
--- a/src/cpu.c
+++ b/src/cpu.c
@@ -18,7 +18,7 @@
    MA 02110-1301, USA.
 */
 
-#include "config.h"
+#include "config.h" /* Auto-generated */
 
 #include "include/headers.h"
 #include "prototypes/cpu.h"

diff --git a/src/freebsd_functions.c b/src/freebsd_functions.c
index ff6b451..05b1635 100644 (file)
--- a/src/freebsd_functions.c
+++ b/src/freebsd_functions.c
@@ -32,17 +32,10 @@
 
 #include "config.h" /* Auto-generated */
 
-#if defined (HAVE_X11_XLIB_H)
-#include <X11/Xlib.h>
-#endif
-
-#include "include/headers.h"
-
-#include <sys/statvfs.h>
-#include <sys/utsname.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 
+#include "include/headers.h"
 #include "include/freebzd.h"
 
 void 
@@ -89,87 +82,6 @@ get_ram(char *str1, unsigned char num) {
 }
 
 
-void 
-get_ssd(char *str1, unsigned char num) {
-  uintmax_t val = 0;
-  struct statvfs ssd;
-
-  if (-1 == (statvfs(getenv("HOME"), &ssd))) {
-    FUNC_FAILED("statvfs()");
-  }
-
-  switch(num) {
-    case 1:
-      FILL_ARR(str1, FMT_UINT "%s",
-        (uintmax_t)(ssd.f_blocks * ssd.f_bsize) / GB, "GB");
-      break;
-    case 2:
-      FILL_ARR(str1, FMT_UINT "%s",
-        (uintmax_t)(ssd.f_bfree * ssd.f_bsize) / GB, "GB");
-      break;
-    case 3:
-      FILL_ARR(str1, FMT_UINT "%s",
-        (uintmax_t)(ssd.f_bavail * ssd.f_bsize) / GB, "GB");
-      break;
-    case 4:
-      {
-        val = (uintmax_t)((
-          ssd.f_blocks - ssd.f_bfree) * ssd.f_bsize) / GB;
-        FILL_UINT_ARR(str1, val);
-      }
-      break;
-  }
-
-}
-
-
-void 
-get_packs(char *str1) {
-  uint_fast16_t packages = 0;
-  FILE *pkgs_file = popen("pkg info | wc -l", "r");
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-result"
-  fscanf(pkgs_file, "%"SCNuFAST16, &packages);
-#pragma GCC diagnostic pop
-
-  pclose(pkgs_file);
-
-  FILL_ARR(str1, "%"PRIuFAST16, packages);
-}
-
-
-void 
-get_kernel(char *str1, unsigned char num) {
-  struct utsname KerneL;
-  if (-1 == (uname(&KerneL))) {
-    FUNC_FAILED("uname()");
-  }
-
-  switch(num) {
-    case 1:
-      FILL_STR_ARR(1, str1, KerneL.sysname);
-      break;
-    case 2:
-      FILL_STR_ARR(1, str1, KerneL.nodename);
-      break;
-    case 3:
-      FILL_STR_ARR(1, str1, KerneL.release);
-      break;
-    case 4:
-      FILL_STR_ARR(1, str1, KerneL.version);
-      break;
-    case 5:
-      FILL_STR_ARR(1, str1, KerneL.machine);
-      break;
-    case 6:
-      FILL_STR_ARR(2, str1, KerneL.sysname, KerneL.release);
-      break;
-  }
-
-}
-
-
 void
 get_loadavg(char *str1) {
   double up[3];
@@ -181,79 +93,6 @@ get_loadavg(char *str1) {
 }
 
 
-void
-get_uptime(char *str1) {
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-  struct timespec tc = {0};
-#pragma GCC diagnostic pop
-
-  int mib[2] = { CTL_KERN, KERN_BOOTTIME };
-  time_t t;
-  uintmax_t now = 0;
-  size_t len = sizeof(tc);
-
-  if (0 != sysctl(mib, 2, &tc, &len, NULL, 0)) {
-    FUNC_FAILED("sysctl()");
-  }
-
-  if (-1 == (t = time(NULL))) {
-    FUNC_FAILED("time()");
-  }
-
-  now = (uintmax_t)t - (uintmax_t)tc.tv_sec;
-  if ((0 != (now / 86400))) { /* days */
-    FILL_ARR(str1, FMT_UINT "d " FMT_UINT "h " FMT_UINT "m",
-      (now / 86400),
-      ((now / 3600) % 24),
-      ((now / 60) % 60));
-    return;
-  }
-  if (59 < (now / 60)) { /* hours */
-    FILL_ARR(str1, FMT_UINT "h " FMT_UINT "m",
-      ((now / 3600) % 24),
-      ((now / 60) % 60));
-    return;
-  }
-
-  FILL_ARR(str1, FMT_UINT "m", ((now / 60) % 60));
-}
-
-
-/* The `strftime' man page showed potential bugs */
-void 
-get_taim(char *str1) {
-  char time_str[VLA];
-  time_t t;
-  struct tm *taim;
-
-  if (-1 == (t = time(NULL)) || 
-      NULL == (taim = localtime(&t)) ||
-      0 == (strftime(time_str, VLA, "%I:%M %p", taim))) {
-    exit_with_err(ERR, "time() or localtime() or strftime() failed");
-  }
-  FILL_STR_ARR(1, str1, time_str);
-}
-
-
-#if defined (HAVE_X11_XLIB_H)
-void 
-set_status(const char *str1) {
-  Display *display = XOpenDisplay(NULL);
-
-  if (display) {
-    XStoreName(display, DefaultRootWindow(display), str1);
-    XSync(display, 0);
-    XCloseDisplay(display);
-
-  } else {
-    exit_with_err(CANNOT_OPEN, "X server");
-  }
-}
-#endif
-
-
 /* 
   sysctl -a|grep 'aibs'
   dev.aibs.0.volt.0: 1356 850 1600

diff --git a/src/include/freebzd.h b/src/include/freebzd.h
index fc5ab52..8f2d97e 100644 (file)
--- a/src/include/freebzd.h
+++ b/src/include/freebzd.h
@@ -25,8 +25,8 @@
 #include <sys/sysctl.h>
 
 #define SYSCTLVAL(x, y) \
-if (0 != sysctlbyname(x, y, &len, NULL, 0)) { \
-  exit(EXIT_FAILURE); \
-}
+  if (0 != sysctlbyname(x, y, &len, NULL, 0)) { \
+    FUNC_FAILED("sysctlbyname()"); \
+  }
 
 #endif /* INCLUDE_FREEBZD_HEADERZ_H_ */

diff --git a/src/linux_functions.c b/src/linux_functions.c
index bd473f3..432c89e 100644 (file)
--- a/src/linux_functions.c
+++ b/src/linux_functions.c
@@ -30,21 +30,11 @@
  * Do not add any -Wno flags just to mute the compilers snafus
  * */
 
-#include <sys/statvfs.h>
 #include <sys/sysinfo.h>
-#include <sys/utsname.h>
-#include <glob.h>
 
 #include "config.h" /* Auto-generated */
-
-#if defined (HAVE_X11_XLIB_H)
-#include <X11/Xlib.h>
-#endif
-
 #include "include/headers.h"
 
-static uint_fast16_t glob_packages(const char *);
-
 void 
 get_ram(char *str1, unsigned char num) {
   uintmax_t used = 0, total = 0;
@@ -84,40 +74,6 @@ get_ram(char *str1, unsigned char num) {
 }
 
 
-void 
-get_ssd(char *str1, unsigned char num) {
-  uintmax_t val = 0;
-  struct statvfs ssd;
-
-  if (-1 == (statvfs(getenv("HOME"), &ssd))) {
-    FUNC_FAILED("statvfs()");
-  }
-
-  switch(num) {
-    case 1:
-      FILL_ARR(str1, FMT_UINT "%s",
-        (uintmax_t)(ssd.f_blocks * ssd.f_bsize) / GB, "GB");
-      break;
-    case 2:
-      FILL_ARR(str1, FMT_UINT "%s",
-        (uintmax_t)(ssd.f_bfree * ssd.f_bsize) / GB, "GB");
-      break;
-    case 3:
-      FILL_ARR(str1, FMT_UINT "%s",
-        (uintmax_t)(ssd.f_bavail * ssd.f_bsize) / GB, "GB");
-      break;
-    case 4:
-      {
-        val = (uintmax_t)((
-          ssd.f_blocks - ssd.f_bfree) * ssd.f_bsize) / GB;
-        FILL_UINT_ARR(str1, val);
-      }
-      break;
-  }
-
-}
-
-
 void
 get_ssd_model(char *str1, char *str2) {
   FILE *fp;
@@ -134,112 +90,6 @@ get_ssd_model(char *str1, char *str2) {
 }
 
 
-/* Source (my improved screenfetch-c fork):
- * https://github.com/wifiextender/screenfetch-c/blob/master/src/plat/linux/detect.c */
-static uint_fast16_t 
-glob_packages(const char *str1) {
-  uint_fast16_t packs_num = 0;
-  glob_t gl;
-
-  if (0 == (glob(str1, GLOB_NOSORT, NULL, &gl)))
-    packs_num = gl.gl_pathc;
-
-  else {
-    exit_with_err("Could not traverse", str1);
-  }
-
-  globfree(&gl);
-
-  return packs_num;
-}
-
-
-/* Let the compiler strip the code
- * instead conditionally checking 
- * each time the program is executed */
-void 
-get_packs(char *str1) {
-  uint_fast16_t packages = 0;
-
-#if DISTRO == ARCHLINUX
-  packages = glob_packages("/var/lib/pacman/local/*");
-
-#elif DISTRO == FRUGALWARE
-  FILE *pkgs_file = popen("pacman-g2 -Q 2> /dev/null | wc -l", "r");
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-result"
-  fscanf(pkgs_file, "%"SCNuFAST16, &packages);
-#pragma GCC diagnostic pop
-
-  pclose(pkgs_file);
-
-#elif DISTRO == DEBIAN
-  packages = glob_packages("/var/lib/dpkg/info/*.list");
-
-#elif DISTRO == SLACKWARE
-  packages = glob_packages("/var/log/packages/*");
-
-#elif DISTRO == GENTOO
-  packages = glob_packages("/var/db/pkg/*/*");
-
-#elif DISTRO == RHEL
-  FILE *pkgs_file = popen("rpm -qa 2> /dev/null | wc -l", "r");
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-result"
-  fscanf(pkgs_file, "%"SCNuFAST16, &packages);
-#pragma GCC diagnostic pop
-
-  pclose(pkgs_file);
-
-#elif DISTRO == ANGSTROM
-  FILE *pkgs_file = popen("opkg list-installed 2> /dev/null | wc -l", "r");
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-result"
-  fscanf(pkgs_file, "%"SCNuFAST16, &packages);
-#pragma GCC diagnostic pop
-
-  pclose(pkgs_file);
-
-#endif
-
-  FILL_ARR(str1, "%"PRIuFAST16, packages);
-}
-
-
-void 
-get_kernel(char *str1, unsigned char num) {
-  struct utsname KerneL;
-  if (-1 == (uname(&KerneL))) {
-    FUNC_FAILED("uname()");
-  }
-
-  switch(num) {
-    case 1:
-      FILL_STR_ARR(1, str1, KerneL.sysname);
-      break;
-    case 2:
-      FILL_STR_ARR(1, str1, KerneL.nodename);
-      break;
-    case 3:
-      FILL_STR_ARR(1, str1, KerneL.release);
-      break;
-    case 4:
-      FILL_STR_ARR(1, str1, KerneL.version);
-      break;
-    case 5:
-      FILL_STR_ARR(1, str1, KerneL.machine);
-      break;
-    case 6:
-      FILL_STR_ARR(2, str1, KerneL.sysname, KerneL.release);
-      break;
-  }
-
-}
-
-
 void
 get_loadavg(char *str1) {
   struct sysinfo up;
@@ -253,38 +103,6 @@ get_loadavg(char *str1) {
 }
 
 
-void
-get_uptime(char *str1) {
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-  struct timespec tc = {0};
-#pragma GCC diagnostic pop
-
-  uintmax_t now = 0;
-  if (-1 == (clock_gettime(CLOCK_BOOTTIME, &tc))) {
-    FUNC_FAILED("clock_gettime()");
-  }
-
-  now = (uintmax_t)tc.tv_sec;
-  if ((0 != (now / 86400))) { /* days */
-    FILL_ARR(str1, FMT_UINT "d " FMT_UINT "h " FMT_UINT "m",
-      (now / 86400),
-      ((now / 3600) % 24),
-      ((now / 60) % 60));
-    return;
-  }
-  if (59 < (now / 60)) { /* hours */
-    FILL_ARR(str1, FMT_UINT "h " FMT_UINT "m",
-      ((now / 3600) % 24),
-      ((now / 60) % 60));
-    return;
-  }
-
-  FILL_ARR(str1, FMT_UINT "m", ((now / 60) % 60));
-}
-
-
 void 
 get_voltage(char *str1) {
   float voltage[4];
@@ -377,39 +195,6 @@ get_mobo_temp(char *str1) {
 }
 
 
-/* The `strftime' man page showed potential bugs */
-void 
-get_taim(char *str1) {
-  char time_str[VLA];
-  time_t t;
-  struct tm *taim;
-
-  if (-1 == (t = time(NULL)) || 
-      NULL == (taim = localtime(&t)) ||
-      0 == (strftime(time_str, VLA, "%I:%M %p", taim))) {
-    exit_with_err(ERR, "time() or localtime() or strftime() failed");
-  }
-  FILL_STR_ARR(1, str1, time_str);
-}
-
-
-#if defined (HAVE_X11_XLIB_H)
-void 
-set_status(const char *str1) {
-  Display *display = XOpenDisplay(NULL);
-
-  if (display) {
-    XStoreName(display, DefaultRootWindow(display), str1);
-    XSync(display, 0);
-    XCloseDisplay(display);
-
-  } else {
-    exit_with_err(CANNOT_OPEN, "X server");
-  }
-}
-#endif
-
-
 void 
 get_statio(char *str1, char *str2) {
   uintmax_t statio[7];

diff --git a/src/main.c b/src/main.c
index a31ee41..d005987 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -18,7 +18,7 @@
    MA 02110-1301, USA.
 */
 
-#include "config.h" /* auto-generated */
+#include "config.h" /* Auto-generated */
 #include "include/headers.h"
 #include "prototypes/options.h"
 

diff --git a/src/net.c b/src/net.c
index c8326e0..afe98f9 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -15,7 +15,7 @@
    MA 02110-1301, USA.
 */
 
-#include "config.h"
+#include "config.h" /* Auto-generated */
 
 #if WITH_NET == 1
 

diff --git a/src/options.c b/src/options.c
index 48fbc20..751f920 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -20,7 +20,7 @@
 
 #include <argp.h>
 
-#include "config.h" /* auto-generated */
+#include "config.h" /* Auto-generated */
 #include "include/headers.h"
 #include "prototypes/cpu.h"
 #include "prototypes/sound.h"

diff --git a/src/prototypes/common.h b/src/prototypes/common.h
index c2b05c1..99322ab 100644 (file)
--- a/src/prototypes/common.h
+++ b/src/prototypes/common.h
@@ -23,5 +23,14 @@
 
 void get_temp(const char *, char *);
 void exit_with_err(const char *, const char *);
+void get_ssd(char *, unsigned char num);
+void get_kernel(char *, unsigned char num);
+void get_packs(char *);
+void get_taim(char *);
+void get_uptime(char *);
+
+#if defined (HAVE_X11_XLIB_H)
+void set_status(const char *);
+#endif
 
 #endif /* COMMON_H_ */

diff --git a/src/prototypes/functions.h b/src/prototypes/functions.h
index 5620f99..cbcc4d7 100644 (file)
--- a/src/prototypes/functions.h
+++ b/src/prototypes/functions.h
@@ -22,12 +22,7 @@
 #define FUNCTIONS_H_
 
 void get_ram(char *, unsigned char num);
-void get_ssd(char *, unsigned char num);
-void get_packs(char *);
-void get_kernel(char *, unsigned char num);
 void get_loadavg(char *);
-void get_uptime(char *);
-void get_taim(char *);
 void get_voltage(char *);
 void get_mobo(char *);
 void get_mobo_temp(char *);
@@ -39,8 +34,4 @@ void get_statio(char *, char *);
 void get_battery(char *);
 #endif
 
-#if defined (HAVE_X11_XLIB_H)
-void set_status(const char *);
-#endif
-
 #endif /* FUNCTIONS_H_ */

diff --git a/src/sound.c b/src/sound.c
index 152d741..07da4d7 100644 (file)
--- a/src/sound.c
+++ b/src/sound.c
@@ -18,7 +18,7 @@
    MA 02110-1301, USA.
 */
 
-#include "config.h"
+#include "config.h" /* Auto-generated */
 
 #if defined (HAVE_MPD_CLIENT_H)
 #include <mpd/client.h>