Move #include <linux/*.h> into individual commands, initialize struct

with memset() instead of = {}, and move TT.alarm to local variable.

3 files changed, 13 insertions, 11 deletions

diff --git a/lib/portability.h b/lib/portability.h
index 41128958..acc32fd4 100644
--- a/lib/portability.h
+++ b/lib/portability.h
@@ -175,7 +175,6 @@ void *memmem(const void *haystack, size_t haystack_length,
 // Linux headers not listed by POSIX or LSB
 #include <sys/mount.h>
 #ifdef __linux__
-#include <linux/rtc.h>
 #include <sys/statfs.h>
 #include <sys/swap.h>
 #include <sys/sysinfo.h>
diff --git a/toys/other/hwclock.c b/toys/other/hwclock.c
index 5ab308df..3b3ff690 100644
--- a/toys/other/hwclock.c
+++ b/toys/other/hwclock.c
@@ -25,6 +25,7 @@ config HWCLOCK
 
 #define FOR_hwclock
 #include "toys.h"
+#include <linux/rtc.h>
 
 GLOBALS(
   char *f;
diff --git a/toys/pending/rtcwake.c b/toys/pending/rtcwake.c
index 0da1de6b..61f76fbe 100644
--- a/toys/pending/rtcwake.c
+++ b/toys/pending/rtcwake.c
@@ -33,6 +33,7 @@ config RTCWAKE
 
 #define FOR_rtcwake
 #include "toys.h"
+#include <linux/rtc.h>
 
 GLOBALS(
   long long t, s;
@@ -41,11 +42,12 @@ GLOBALS(
 
 void rtcwake_main(void)
 {
-  struct rtc_wkalrm alarm = {};
+  struct rtc_wkalrm alarm;
   struct tm rtc_tm;
   time_t now, rtc_now, then;
   int fd, utc;
 
+  memset(&alarm, 0, sizeof(alarm));
   if (FLAG(list_modes)) {
     xreadfile("/sys/power/state", toybuf, sizeof(toybuf));
     printf("off no on disable show %s", toybuf);
@@ -77,17 +79,17 @@ void rtcwake_main(void)
   }
 
   if (!strcmp(TT.m, "show")) { // Don't suspend, just show current alarm.
-    xioctl(fd, RTC_WKALM_RD, &TT.alarm);
-    if (!TT.alarm.enabled) xputs("alarm: off");
+    xioctl(fd, RTC_WKALM_RD, &alarm);
+    if (!alarm.enabled) xputs("alarm: off");
     else {
-      if ((then = mktime((void *)&TT.alarm.time)) < 0) perror_exit("mktime");
+      if ((then = mktime((void *)&alarm.time)) < 0) perror_exit("mktime");
       xprintf("alarm: on %s", ctime(&then));
     }
     goto done;
   } else if (!strcmp(TT.m, "disable")) { // Cancel current alarm.
-    xioctl(fd, RTC_WKALM_RD, &TT.alarm);
-    TT.alarm.enabled = 0;
-    xioctl(fd, RTC_WKALM_SET, &TT.alarm);
+    xioctl(fd, RTC_WKALM_RD, &alarm);
+    alarm.enabled = 0;
+    xioctl(fd, RTC_WKALM_SET, &alarm);
     goto done;
   }
 
@@ -99,11 +101,11 @@ void rtcwake_main(void)
   } else help_exit("-m %s needs -s or -t", TT.m);
   if (FLAG(v)) xprintf("Wake time:\t%lld / %s", (long long)then, ctime(&then));
 
-  if (!(utc ? gmtime_r : localtime_r)(&then, (void *)&TT.alarm.time))
+  if (!(utc ? gmtime_r : localtime_r)(&then, (void *)&alarm.time))
     error_exit(utc ? "gmtime_r failed" : "localtime_r failed");
 
-  TT.alarm.enabled = 1;
-  xioctl(fd, RTC_WKALM_SET, &TT.alarm);
+  alarm.enabled = 1;
+  xioctl(fd, RTC_WKALM_SET, &alarm);
   sync();
 
   xprintf("wakeup using \"%s\" from %s at %s", TT.m, TT.d, ctime(&then));