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) (side-by-side diff)
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)
};
cfg = cfg_init(opts,CFGF_NONE);
if(!cfg)
throw std::runtime_error("failed to cfg_init()");
std::string::size_type ls = macaddress.rfind('/');
if(cfg_parse(cfg,gnu::autosprintf(
EYEKIN_CONF_DIR "/%s.conf",
(ls==std::string::npos)
? macaddress.c_str()
: macaddress.substr(ls+1).c_str()
)) ==CFG_PARSE_ERROR) {
if(cfg) cfg_free(cfg);
cfg=0;
throw std::runtime_error("failed to cfg_parse()");
}
}
eyekinfig_t::~eyekinfig_t() {
if(cfg) cfg_free(cfg);
}
std::string eyekinfig_t::get_targetdir() {
assert(cfg);
return gnu::autosprintf(cfg_getstr(cfg,"targetdir"),macaddress.c_str());
}
std::string eyekinfig_t::get_upload_key() {
assert(cfg);
return cfg_getstr(cfg,"uploadkey");
}
std::string eyekinfig_t::get_on_start_session() {
assert(cfg);
return cfg_getstr(cfg,"on-start-session");
}
std::string eyekinfig_t::get_on_upload_photo() {
assert(cfg);
return cfg_getstr(cfg,"on-upload-photo");
}
std::string eyekinfig_t::get_on_mark_last_photo_in_roll() {
assert(cfg);
return cfg_getstr(cfg,"on-mark-last-photo-in-roll");
}
int eyekinfig_t::get_umask() {
assert(cfg);
- return cfg_getint(cfg,"umask");
+ return 0777&cfg_getint(cfg,"umask");
}