summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--lib/hypnodata.cc2
-rw-r--r--lib/st-decode.cc2
-rw-r--r--src/db.cc2
3 files changed, 6 insertions, 0 deletions
diff --git a/lib/hypnodata.cc b/lib/hypnodata.cc
index 977fb76..a64b7d7 100644
--- a/lib/hypnodata.cc
+++ b/lib/hypnodata.cc
@@ -1,32 +1,34 @@
1#include <stdlib.h>
2#include <string.h>
1#include <napkin/exception.h> 3#include <napkin/exception.h>
2#include <napkin/util.h> 4#include <napkin/util.h>
3#include <napkin/types.h> 5#include <napkin/types.h>
4 6
5namespace napkin { 7namespace napkin {
6 8
7 void hypnodata_t::clear() { 9 void hypnodata_t::clear() {
8 to_bed = alarm = 0; 10 to_bed = alarm = 0;
9 data_a = window = 0; 11 data_a = window = 0;
10 almost_awakes.clear(); 12 almost_awakes.clear();
11 } 13 }
12 14
13 static time_t from_minute_w3c(const string& w3c) { 15 static time_t from_minute_w3c(const string& w3c) {
14 struct tm t; memset(&t,0,sizeof(t)); t.tm_isdst=-1; 16 struct tm t; memset(&t,0,sizeof(t)); t.tm_isdst=-1;
15 if(sscanf(w3c.c_str(),"%04d-%02d-%02dT%02d:%02d", 17 if(sscanf(w3c.c_str(),"%04d-%02d-%02dT%02d:%02d",
16 &t.tm_year,&t.tm_mon,&t.tm_mday,&t.tm_hour,&t.tm_min)!=5) 18 &t.tm_year,&t.tm_mon,&t.tm_mday,&t.tm_hour,&t.tm_min)!=5)
17 throw exception("failed to parse w3c time"); 19 throw exception("failed to parse w3c time");
18 --t.tm_mon;t.tm_year-=1900; 20 --t.tm_mon;t.tm_year-=1900;
19 time_t rv = mktime(&t); 21 time_t rv = mktime(&t);
20 if(rv==(time_t)-1) 22 if(rv==(time_t)-1)
21 throw exception("failed to mktime()"); 23 throw exception("failed to mktime()");
22 return rv; 24 return rv;
23 } 25 }
24 26
25 void hypnodata_t::set_to_bed(const string& w3c) { 27 void hypnodata_t::set_to_bed(const string& w3c) {
26 to_bed = from_minute_w3c(w3c); } 28 to_bed = from_minute_w3c(w3c); }
27 void hypnodata_t::set_alarm(const string& w3c) { 29 void hypnodata_t::set_alarm(const string& w3c) {
28 alarm = from_minute_w3c(w3c); } 30 alarm = from_minute_w3c(w3c); }
29 void hypnodata_t::set_window(const string& str) { 31 void hypnodata_t::set_window(const string& str) {
30 window = strtol(str.c_str(),0,10); /* TODO: check for error */ 32 window = strtol(str.c_str(),0,10); /* TODO: check for error */
31 } 33 }
32 void hypnodata_t::set_data_a(const string& str) { 34 void hypnodata_t::set_data_a(const string& str) {
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,32 +1,34 @@
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 };
diff --git a/src/db.cc b/src/db.cc
index c350e68..2b4a7eb 100644
--- a/src/db.cc
+++ b/src/db.cc
@@ -1,35 +1,37 @@
1#include <unistd.h> 1#include <unistd.h>
2#include <sys/stat.h> 2#include <sys/stat.h>
3#include <sys/types.h> 3#include <sys/types.h>
4#include <stdlib.h>
5#include <string.h>
4#include <cassert> 6#include <cassert>
5#include <napkin/exception.h> 7#include <napkin/exception.h>
6#include "db.h" 8#include "db.h"
7 9
8#include "config.h" 10#include "config.h"
9 11
10namespace napkin { 12namespace napkin {
11 13
12 extern const char *sql_bootstrap; 14 extern const char *sql_bootstrap;
13 15
14 db_t::db_t() { 16 db_t::db_t() {
15 const char *h = getenv("HOME"); 17 const char *h = getenv("HOME");
16 if(h) { 18 if(h) {
17 datadir = h; 19 datadir = h;
18 datadir += "/."PACKAGE_NAME"/"; 20 datadir += "/."PACKAGE_NAME"/";
19 }else{ 21 }else{
20#if defined(HAVE_GET_CURRENT_DIR_NAME) 22#if defined(HAVE_GET_CURRENT_DIR_NAME)
21 char *cwd = get_current_dir_name(); 23 char *cwd = get_current_dir_name();
22 if(!cwd) 24 if(!cwd)
23 throw napkin::exception("failed to get_current_dir_name()"); 25 throw napkin::exception("failed to get_current_dir_name()");
24 datadir = cwd; 26 datadir = cwd;
25 free(cwd); 27 free(cwd);
26#elif defined(HAVE_GETCWD) 28#elif defined(HAVE_GETCWD)
27 { 29 {
28 char cwd[ 30 char cwd[
29# if defined(MAXPATH) 31# if defined(MAXPATH)
30 MAXPATH 32 MAXPATH
31# elif defined(MAXPATHLEN) 33# elif defined(MAXPATHLEN)
32 MAXPATHLEN 34 MAXPATHLEN
33# else /* maxpath */ 35# else /* maxpath */
34 512 36 512
35# endif /* maxpath */ 37# endif /* maxpath */