emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rtcwake: remove a static variable

Browse Source 
function                                             old     new   delta
rtc_time                                               4       -      -4
rtcwake_main                                         479     474      -5
------------------------------------------------------------------------------
(add/remove: 0/1 grow/shrink: 0/1 up/down: 0/-9)               Total: -9 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2009-10-08 16:04:50 +02:00
parent ef5bc2c39c
commit 784d095877
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
util-linux/rtcwake.c
View File

@ -30,8 +30,6 @@
#define SYS_POWER_PATH "/sys/power/state" #define SYS_POWER_PATH "/sys/power/state"
#define DEFAULT_MODE "standby" #define DEFAULT_MODE "standby"
static time_t rtc_time;
static NOINLINE bool may_wakeup(const char *rtcname) static NOINLINE bool may_wakeup(const char *rtcname)
{ {
ssize_t ret; ssize_t ret;
@ -50,7 +48,7 @@ static NOINLINE bool may_wakeup(const char *rtcname)
return strncmp(buf, "enabled\n", 8) == 0; return strncmp(buf, "enabled\n", 8) == 0;
} }
static NOINLINE void setup_alarm(int fd, time_t *wakeup) static NOINLINE void setup_alarm(int fd, time_t *wakeup, time_t rtc_time)
{ {
struct tm *tm; struct tm *tm;
struct linux_rtc_wkalrm wake; struct linux_rtc_wkalrm wake;
@ -102,6 +100,8 @@ static NOINLINE void setup_alarm(int fd, time_t *wakeup)
int rtcwake_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int rtcwake_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int rtcwake_main(int argc UNUSED_PARAM, char **argv) int rtcwake_main(int argc UNUSED_PARAM, char **argv)
{ {
time_t rtc_time;
unsigned opt; unsigned opt;
const char *rtcname = NULL; const char *rtcname = NULL;
const char *suspend; const char *suspend;
@ -170,7 +170,7 @@ int rtcwake_main(int argc UNUSED_PARAM, char **argv)
alarm_time += sys_time - rtc_time; alarm_time += sys_time - rtc_time;
} else } else
alarm_time = rtc_time + seconds + 1; alarm_time = rtc_time + seconds + 1;
setup_alarm(fd, &alarm_time); setup_alarm(fd, &alarm_time, rtc_time);
sync(); sync();
printf("wakeup from \"%s\" at %s", suspend, ctime(&alarm_time)); printf("wakeup from \"%s\" at %s", suspend, ctime(&alarm_time));