summaryrefslogtreecommitdiffabout
path: root/lib/st-decode.cc
authorMichael Krelin <hacker@klever.net>2009-01-21 18:41:55 (UTC)
committer Michael Krelin <hacker@klever.net>2009-01-21 18:41:55 (UTC)
commita141dd88e782636ca6894939a019528d5d46518a (patch) (unidiff)
treecc02a12a89c860a324563d95b2e8711aa8522dc6 /lib/st-decode.cc
parent1bd0bb1abcfdb7b9ad296aa06284f05f66a61d98 (diff)
downloadnapkin-a141dd88e782636ca6894939a019528d5d46518a.zip
napkin-a141dd88e782636ca6894939a019528d5d46518a.tar.gz
napkin-a141dd88e782636ca6894939a019528d5d46518a.tar.bz2
add missing includes for gcc 4.3public/master
Thanks to Stas Bekman for spotting the problem. Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (limited to 'lib/st-decode.cc') (more/less context) (ignore whitespace changes)
-rw-r--r--lib/st-decode.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/st-decode.cc b/lib/st-decode.cc
index 0fb41de..b354250 100644
--- a/lib/st-decode.cc
+++ b/lib/st-decode.cc
@@ -1,96 +1,98 @@
1#include <stdlib.h>
2#include <string.h>
1#include <stdexcept> 3#include <stdexcept>
2#include <numeric> 4#include <numeric>
3#include <napkin/exception.h> 5#include <napkin/exception.h>
4#include <napkin/st/decode.h> 6#include <napkin/st/decode.h>
5 7
6namespace napkin { 8namespace napkin {
7 namespace sleeptracker { 9 namespace sleeptracker {
8 using std::invalid_argument; 10 using std::invalid_argument;
9 using std::runtime_error; 11 using std::runtime_error;
10 12
11 struct st_time_t { 13 struct st_time_t {
12 uint8_t hour; 14 uint8_t hour;
13 uint8_t min; 15 uint8_t min;
14 }; 16 };
15 struct st_date_t { 17 struct st_date_t {
16 uint8_t month; 18 uint8_t month;
17 uint8_t day; 19 uint8_t day;
18 uint8_t dow; 20 uint8_t dow;
19 }; 21 };
20 struct st_fulltime_t { 22 struct st_fulltime_t {
21 uint8_t hour; 23 uint8_t hour;
22 uint8_t min; 24 uint8_t min;
23 uint8_t sec; 25 uint8_t sec;
24 }; 26 };
25 struct st_data_header_t { 27 struct st_data_header_t {
26 char magic; 28 char magic;
27 st_date_t today; 29 st_date_t today;
28 uint8_t window; 30 uint8_t window;
29 st_time_t to_bed; 31 st_time_t to_bed;
30 st_time_t alarm; 32 st_time_t alarm;
31 uint8_t nawakes; 33 uint8_t nawakes;
32 }; 34 };
33 struct st_data_footer_t { 35 struct st_data_footer_t {
34 uint16_t data_a; 36 uint16_t data_a;
35 uint8_t checksum; 37 uint8_t checksum;
36 uint8_t eof_mark; 38 uint8_t eof_mark;
37 }; 39 };
38 40
39 static void back_a_day(struct tm& t) { 41 static void back_a_day(struct tm& t) {
40 time_t ts = mktime(&t); 42 time_t ts = mktime(&t);
41 if(ts==(time_t)-1) 43 if(ts==(time_t)-1)
42 throw exception_st_data("failed to make up time to step back a day"); 44 throw exception_st_data("failed to make up time to step back a day");
43 ts -= 60*60*24; 45 ts -= 60*60*24;
44 if(!localtime_r(&ts,&t)) 46 if(!localtime_r(&ts,&t))
45 throw exception_st_data("failed to localtime_r() while stepping back a day"); 47 throw exception_st_data("failed to localtime_r() while stepping back a day");
46 } 48 }
47 49
48 hypnodata_t& decode(hypnodata_t& rv,const void *data,size_t data_length) { 50 hypnodata_t& decode(hypnodata_t& rv,const void *data,size_t data_length) {
49 if(data_length < (sizeof(st_data_header_t)+sizeof(st_data_footer_t))) 51 if(data_length < (sizeof(st_data_header_t)+sizeof(st_data_footer_t)))
50 throw exception_st_data_envelope("not enough sleeptracker data to decode"); 52 throw exception_st_data_envelope("not enough sleeptracker data to decode");
51 st_data_header_t *h = (st_data_header_t*)data; 53 st_data_header_t *h = (st_data_header_t*)data;
52 if(h->magic != 'V') 54 if(h->magic != 'V')
53 throw exception_st_data_envelope("invalid magic in the data"); 55 throw exception_st_data_envelope("invalid magic in the data");
54 st_data_footer_t *f = (st_data_footer_t*)(static_cast<const char *>(data)+data_length-sizeof(st_data_footer_t)); 56 st_data_footer_t *f = (st_data_footer_t*)(static_cast<const char *>(data)+data_length-sizeof(st_data_footer_t));
55 if( (std::accumulate((uint8_t*)&h->today,(uint8_t*)&f->checksum,0)&0xFF) != f->checksum ) 57 if( (std::accumulate((uint8_t*)&h->today,(uint8_t*)&f->checksum,0)&0xFF) != f->checksum )
56 throw exception_st_data_integrity("checksum mismatch"); 58 throw exception_st_data_integrity("checksum mismatch");
57 st_fulltime_t *aawake = (st_fulltime_t*)&h[1]; 59 st_fulltime_t *aawake = (st_fulltime_t*)&h[1];
58 if((void*)&aawake[h->nawakes] != (void*)f) 60 if((void*)&aawake[h->nawakes] != (void*)f)
59 throw exception_st_data_envelope("unbelievably screwed up data"); 61 throw exception_st_data_envelope("unbelievably screwed up data");
60 rv.clear(); 62 rv.clear();
61 time_t now = time(0); 63 time_t now = time(0);
62 struct tm t; 64 struct tm t;
63 if(!localtime_r(&now,&t)) 65 if(!localtime_r(&now,&t))
64 throw exception_st_data("failed to localtime_r()"); 66 throw exception_st_data("failed to localtime_r()");
65 t.tm_mon = h->today.month-1; 67 t.tm_mon = h->today.month-1;
66 t.tm_mday = h->today.day; 68 t.tm_mday = h->today.day;
67 time_t mkt = mktime(&t); 69 time_t mkt = mktime(&t);
68 if(mkt == (time_t)-1) 70 if(mkt == (time_t)-1)
69 throw exception_st_data("failed to mktime() for a timestamp"); 71 throw exception_st_data("failed to mktime() for a timestamp");
70 if(mkt > now) { 72 if(mkt > now) {
71 --t.tm_year; 73 --t.tm_year;
72 } 74 }
73 struct tm ta; 75 struct tm ta;
74 memmove(&ta,&t,sizeof(ta)); 76 memmove(&ta,&t,sizeof(ta));
75 ta.tm_sec = 0; 77 ta.tm_sec = 0;
76 ta.tm_hour = h->alarm.hour; ta.tm_min = h->alarm.min; 78 ta.tm_hour = h->alarm.hour; ta.tm_min = h->alarm.min;
77 rv.alarm = mktime(&ta); 79 rv.alarm = mktime(&ta);
78 if(rv.alarm == (time_t)-1) 80 if(rv.alarm == (time_t)-1)
79 throw exception_st_data("failed to mktime() for alarm"); 81 throw exception_st_data("failed to mktime() for alarm");
80 struct tm tb; 82 struct tm tb;
81 memmove(&tb,&ta,sizeof(tb)); 83 memmove(&tb,&ta,sizeof(tb));
82 tb.tm_hour = h->to_bed.hour; tb.tm_min = h->to_bed.min; 84 tb.tm_hour = h->to_bed.hour; tb.tm_min = h->to_bed.min;
83 rv.to_bed = mktime(&tb); 85 rv.to_bed = mktime(&tb);
84 if(rv.to_bed == (time_t)-1) 86 if(rv.to_bed == (time_t)-1)
85 throw exception_st_data("failed to mktime() for 'to bed'"); 87 throw exception_st_data("failed to mktime() for 'to bed'");
86 if(rv.to_bed > rv.alarm) { 88 if(rv.to_bed > rv.alarm) {
87 back_a_day(tb); 89 back_a_day(tb);
88 rv.to_bed -= 24*60*60; 90 rv.to_bed -= 24*60*60;
89 } 91 }
90 struct tm taaw; 92 struct tm taaw;
91 memmove(&taaw,&tb,sizeof(taaw)); 93 memmove(&taaw,&tb,sizeof(taaw));
92 for(int rest=h->nawakes;rest;--rest,++aawake) { 94 for(int rest=h->nawakes;rest;--rest,++aawake) {
93 if( 95 if(
94 taaw.tm_mday!=ta.tm_mday 96 taaw.tm_mday!=ta.tm_mday
95 && ( 97 && (
96 aawake->hour < tb.tm_hour 98 aawake->hour < tb.tm_hour