summaryrefslogtreecommitdiffabout
path: root/src/eyekinfig.cc
authorMichael Krelin <hacker@klever.net>2012-01-20 20:46:30 (UTC)
committer Michael Krelin <hacker@klever.net>2012-01-20 20:46:30 (UTC)
commit62d09cb2346588773a9e25ac9e9a942816b8581a (patch) (unidiff)
tree791221bad465ac702a481490d5fdab0a96b6e185 /src/eyekinfig.cc
parenta9f093cc83926b0e83324aa9e022903563d9d801 (diff)
downloadiii-62d09cb2346588773a9e25ac9e9a942816b8581a.zip
iii-62d09cb2346588773a9e25ac9e9a942816b8581a.tar.gz
iii-62d09cb2346588773a9e25ac9e9a942816b8581a.tar.bz2
minor but numerous changes from compiler-happiness department
Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (limited to 'src/eyekinfig.cc') (more/less context) (ignore whitespace changes)
-rw-r--r--src/eyekinfig.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/eyekinfig.cc b/src/eyekinfig.cc
index 27a5a56..56c74a7 100644
--- a/src/eyekinfig.cc
+++ b/src/eyekinfig.cc
@@ -18,50 +18,50 @@ eyekinfig_t::eyekinfig_t(const std::string& ma)
18 }; 18 };
19 cfg = cfg_init(opts,CFGF_NONE); 19 cfg = cfg_init(opts,CFGF_NONE);
20 if(!cfg) 20 if(!cfg)
21 throw std::runtime_error("failed to cfg_init()"); 21 throw std::runtime_error("failed to cfg_init()");
22 std::string::size_type ls = macaddress.rfind('/'); 22 std::string::size_type ls = macaddress.rfind('/');
23 if(cfg_parse(cfg,gnu::autosprintf( 23 if(cfg_parse(cfg,gnu::autosprintf(
24 EYEKIN_CONF_DIR "/%s.conf", 24 EYEKIN_CONF_DIR "/%s.conf",
25 (ls==std::string::npos) 25 (ls==std::string::npos)
26 ? macaddress.c_str() 26 ? macaddress.c_str()
27 : macaddress.substr(ls+1).c_str() 27 : macaddress.substr(ls+1).c_str()
28 )) ==CFG_PARSE_ERROR) { 28 )) ==CFG_PARSE_ERROR) {
29 if(cfg) cfg_free(cfg); 29 if(cfg) cfg_free(cfg);
30 cfg=0; 30 cfg=0;
31 throw std::runtime_error("failed to cfg_parse()"); 31 throw std::runtime_error("failed to cfg_parse()");
32 } 32 }
33 } 33 }
34 34
35eyekinfig_t::~eyekinfig_t() { 35eyekinfig_t::~eyekinfig_t() {
36 if(cfg) cfg_free(cfg); 36 if(cfg) cfg_free(cfg);
37} 37}
38 38
39std::string eyekinfig_t::get_targetdir() { 39std::string eyekinfig_t::get_targetdir() {
40 assert(cfg); 40 assert(cfg);
41 return gnu::autosprintf(cfg_getstr(cfg,"targetdir"),macaddress.c_str()); 41 return gnu::autosprintf(cfg_getstr(cfg,"targetdir"),macaddress.c_str());
42} 42}
43 43
44std::string eyekinfig_t::get_upload_key() { 44std::string eyekinfig_t::get_upload_key() {
45 assert(cfg); 45 assert(cfg);
46 return cfg_getstr(cfg,"uploadkey"); 46 return cfg_getstr(cfg,"uploadkey");
47} 47}
48 48
49std::string eyekinfig_t::get_on_start_session() { 49std::string eyekinfig_t::get_on_start_session() {
50 assert(cfg); 50 assert(cfg);
51 return cfg_getstr(cfg,"on-start-session"); 51 return cfg_getstr(cfg,"on-start-session");
52} 52}
53std::string eyekinfig_t::get_on_upload_photo() { 53std::string eyekinfig_t::get_on_upload_photo() {
54 assert(cfg); 54 assert(cfg);
55 return cfg_getstr(cfg,"on-upload-photo"); 55 return cfg_getstr(cfg,"on-upload-photo");
56} 56}
57 57
58std::string eyekinfig_t::get_on_mark_last_photo_in_roll() { 58std::string eyekinfig_t::get_on_mark_last_photo_in_roll() {
59 assert(cfg); 59 assert(cfg);
60 return cfg_getstr(cfg,"on-mark-last-photo-in-roll"); 60 return cfg_getstr(cfg,"on-mark-last-photo-in-roll");
61} 61}
62 62
63 63
64int eyekinfig_t::get_umask() { 64int eyekinfig_t::get_umask() {
65 assert(cfg); 65 assert(cfg);
66 return cfg_getint(cfg,"umask"); 66 return 0777&cfg_getint(cfg,"umask");
67} 67}