author | Michael Krelin <hacker@klever.net> | 2009-12-12 00:21:52 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2009-12-12 00:21:52 (UTC) |
commit | 29ab361797d5677ce3296555efa7fe34dedaf0d4 (patch) (unidiff) | |
tree | f0b328c790ddb405e56aa4c1653a73cbadd8135f /lib/hypnodata.cc | |
parent | f888c15a5df36dcd767823cf5c223540270524c3 (diff) | |
download | napkin-29ab361797d5677ce3296555efa7fe34dedaf0d4.zip napkin-29ab361797d5677ce3296555efa7fe34dedaf0d4.tar.gz napkin-29ab361797d5677ce3296555efa7fe34dedaf0d4.tar.bz2 |
Thanks to Kevin Turner for spotting and patching it.
-rw-r--r-- | lib/hypnodata.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/hypnodata.cc b/lib/hypnodata.cc index a64b7d7..376c7ff 100644 --- a/lib/hypnodata.cc +++ b/lib/hypnodata.cc | |||
@@ -1,26 +1,27 @@ | |||
1 | #include <stdlib.h> | 1 | #include <cstdio> |
2 | #include <string.h> | 2 | #include <cstdlib> |
3 | #include <cstring> | ||
3 | #include <napkin/exception.h> | 4 | #include <napkin/exception.h> |
4 | #include <napkin/util.h> | 5 | #include <napkin/util.h> |
5 | #include <napkin/types.h> | 6 | #include <napkin/types.h> |
6 | 7 | ||
7 | namespace napkin { | 8 | namespace napkin { |
8 | 9 | ||
9 | void hypnodata_t::clear() { | 10 | void hypnodata_t::clear() { |
10 | to_bed = alarm = 0; | 11 | to_bed = alarm = 0; |
11 | data_a = window = 0; | 12 | data_a = window = 0; |
12 | almost_awakes.clear(); | 13 | almost_awakes.clear(); |
13 | } | 14 | } |
14 | 15 | ||
15 | static time_t from_minute_w3c(const string& w3c) { | 16 | static time_t from_minute_w3c(const string& w3c) { |
16 | struct tm t; memset(&t,0,sizeof(t)); t.tm_isdst=-1; | 17 | struct tm t; memset(&t,0,sizeof(t)); t.tm_isdst=-1; |
17 | if(sscanf(w3c.c_str(),"%04d-%02d-%02dT%02d:%02d", | 18 | if(sscanf(w3c.c_str(),"%04d-%02d-%02dT%02d:%02d", |
18 | &t.tm_year,&t.tm_mon,&t.tm_mday,&t.tm_hour,&t.tm_min)!=5) | 19 | &t.tm_year,&t.tm_mon,&t.tm_mday,&t.tm_hour,&t.tm_min)!=5) |
19 | throw exception("failed to parse w3c time"); | 20 | throw exception("failed to parse w3c time"); |
20 | --t.tm_mon;t.tm_year-=1900; | 21 | --t.tm_mon;t.tm_year-=1900; |
21 | time_t rv = mktime(&t); | 22 | time_t rv = mktime(&t); |
22 | if(rv==(time_t)-1) | 23 | if(rv==(time_t)-1) |
23 | throw exception("failed to mktime()"); | 24 | throw exception("failed to mktime()"); |
24 | return rv; | 25 | return rv; |
25 | } | 26 | } |
26 | 27 | ||