summaryrefslogtreecommitdiffabout
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
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 (more/less context) (show whitespace changes)
-rw-r--r--src/eyefiservice.cc2
-rw-r--r--src/eyefiworker.cc4
-rw-r--r--src/eyefiworker.h2
-rw-r--r--src/eyekinfig.cc2
-rw-r--r--src/eyetil.cc10
-rw-r--r--src/iiid.cc2
6 files changed, 11 insertions, 11 deletions
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc
index 2586ade..e89b2fc 100644
--- a/src/eyefiservice.cc
+++ b/src/eyefiservice.cc
@@ -91,7 +91,7 @@ int eyefiService::GetPhotoStatus(
91 91
92int eyefiService::MarkLastPhotoInRoll( 92int eyefiService::MarkLastPhotoInRoll(
93 std::string macaddress, int mergedelta, 93 std::string macaddress, int mergedelta,
94 struct rns__MarkLastPhotoInRollResponse &r ) { 94 struct rns__MarkLastPhotoInRollResponse&/* r */ ) {
95#ifndef NDEBUG 95#ifndef NDEBUG
96 syslog(LOG_DEBUG, 96 syslog(LOG_DEBUG,
97 "MarkLastPhotoInRoll request from %s with mergedelta=%d", 97 "MarkLastPhotoInRoll request from %s with mergedelta=%d",
diff --git a/src/eyefiworker.cc b/src/eyefiworker.cc
index 2d7827c..c051482 100644
--- a/src/eyefiworker.cc
+++ b/src/eyefiworker.cc
@@ -16,8 +16,8 @@ eyefiworker::eyefiworker()
16 ; 16 ;
17 } 17 }
18 18
19int eyefiworker::run(int port) { 19int eyefiworker::run(int bindport) {
20 if(!soap_valid_socket(bind(0,port,64))) 20 if(!soap_valid_socket(bind(0,bindport,64)))
21 throw std::runtime_error("failed to bind()"); 21 throw std::runtime_error("failed to bind()");
22 signal(SIGCHLD,SIG_IGN); 22 signal(SIGCHLD,SIG_IGN);
23 while(true) { 23 while(true) {
diff --git a/src/eyefiworker.h b/src/eyefiworker.h
index c08ec8b..afb97c7 100644
--- a/src/eyefiworker.h
+++ b/src/eyefiworker.h
@@ -8,7 +8,7 @@ class eyefiworker : public eyefiService {
8 8
9 eyefiworker(); 9 eyefiworker();
10 10
11 int run(int port); 11 int run(int port) __attribute__ ((noreturn));
12 12
13}; 13};
14 14
diff --git a/src/eyekinfig.cc b/src/eyekinfig.cc
index 27a5a56..56c74a7 100644
--- a/src/eyekinfig.cc
+++ b/src/eyekinfig.cc
@@ -63,5 +63,5 @@ std::string eyekinfig_t::get_on_mark_last_photo_in_roll() {
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}
diff --git a/src/eyetil.cc b/src/eyetil.cc
index 2e6ab7e..11e2fb7 100644
--- a/src/eyetil.cc
+++ b/src/eyetil.cc
@@ -18,14 +18,14 @@ binary_t& binary_t::from_hex(const std::string& h) {
18 std::string::size_type hs = h.length(); 18 std::string::size_type hs = h.length();
19 if(hs&1) 19 if(hs&1)
20 throw std::runtime_error("odd number of characters in hexadecimal number"); 20 throw std::runtime_error("odd number of characters in hexadecimal number");
21 int rvs = hs>>1; 21 size_t rvs = hs>>1;
22 resize(rvs); 22 resize(rvs);
23 const unsigned char *hp = (const unsigned char*)h.data(); 23 const unsigned char *hp = (const unsigned char*)h.data();
24 iterator oi=begin(); 24 iterator oi=begin();
25 char t[3] = { 0,0,0 }; 25 char t[3] = { 0,0,0 };
26 for(int i=0;i<rvs;++i) { 26 for(size_t i=0;i<rvs;++i) {
27 t[0]=*(hp++); t[1]=*(hp++); 27 t[0]=*(hp++); t[1]=*(hp++);
28 *(oi++) = strtol(t,0,16); 28 *(oi++) = static_cast<binary_t::value_type>(0xff&strtol(t,0,16));
29 } 29 }
30 return *this; 30 return *this;
31} 31}
@@ -54,7 +54,7 @@ std::string binary_t::hex() const {
54 rv.reserve((size()<<1)+1); 54 rv.reserve((size()<<1)+1);
55 char t[3] = {0,0,0}; 55 char t[3] = {0,0,0};
56 for(const_iterator i=begin(),ie=end();i!=ie;++i) { 56 for(const_iterator i=begin(),ie=end();i!=ie;++i) {
57 int rc = snprintf(t,sizeof(t),"%02x",*i); 57 size_t rc = snprintf(t,sizeof(t),"%02x",*i);
58 assert(rc<sizeof(t)); 58 assert(rc<sizeof(t));
59 rv += t; 59 rv += t;
60 } 60 }
@@ -158,7 +158,7 @@ struct block512_t {
158 static uint16_t tcpcksum(block512_t& data) { 158 static uint16_t tcpcksum(block512_t& data) {
159 uint32_t sum = std::accumulate(data.data,data.data+words,0); 159 uint32_t sum = std::accumulate(data.data,data.data+words,0);
160 while(uint32_t hw = sum>>16) sum = (sum&0xffff)+hw; 160 while(uint32_t hw = sum>>16) sum = (sum&0xffff)+hw;
161 return ~sum; 161 return 0xffff&~sum;
162 } 162 }
163 163
164}; 164};
diff --git a/src/iiid.cc b/src/iiid.cc
index 6c23790..c026050 100644
--- a/src/iiid.cc
+++ b/src/iiid.cc
@@ -53,7 +53,7 @@ int main(int argc,char **argv) try {
53 exit(0); 53 exit(0);
54 break; 54 break;
55 case 'p': 55 case 'p':
56 port = strtol(optarg,0,0); 56 port = 0xffff&strtol(optarg,0,0);
57 if(errno) { 57 if(errno) {
58 std::cerr << "Failed to parse port number" << std::endl; 58 std::cerr << "Failed to parse port number" << std::endl;
59 exit(1); 59 exit(1);