| author | Michael Krelin <hacker@klever.net> | 2012-01-20 20:46:30 (UTC) |
|---|---|---|
| committer | Michael Krelin <hacker@klever.net> | 2012-01-20 20:46:30 (UTC) |
| commit | 62d09cb2346588773a9e25ac9e9a942816b8581a (patch) (side-by-side diff) | |
| tree | 791221bad465ac702a481490d5fdab0a96b6e185 | |
| parent | a9f093cc83926b0e83324aa9e022903563d9d801 (diff) | |
| download | iii-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>
| -rw-r--r-- | src/eyefiservice.cc | 2 | ||||
| -rw-r--r-- | src/eyefiworker.cc | 4 | ||||
| -rw-r--r-- | src/eyefiworker.h | 2 | ||||
| -rw-r--r-- | src/eyekinfig.cc | 2 | ||||
| -rw-r--r-- | src/eyetil.cc | 10 | ||||
| -rw-r--r-- | src/iiid.cc | 2 |
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 @@ -93,3 +93,3 @@ int eyefiService::MarkLastPhotoInRoll( std::string macaddress, int mergedelta, - struct rns__MarkLastPhotoInRollResponse &r ) { + struct rns__MarkLastPhotoInRollResponse&/* r */ ) { #ifndef NDEBUG diff --git a/src/eyefiworker.cc b/src/eyefiworker.cc index 2d7827c..c051482 100644 --- a/src/eyefiworker.cc +++ b/src/eyefiworker.cc @@ -18,4 +18,4 @@ eyefiworker::eyefiworker() -int eyefiworker::run(int port) { - if(!soap_valid_socket(bind(0,port,64))) +int eyefiworker::run(int bindport) { + if(!soap_valid_socket(bind(0,bindport,64))) throw std::runtime_error("failed to bind()"); diff --git a/src/eyefiworker.h b/src/eyefiworker.h index c08ec8b..afb97c7 100644 --- a/src/eyefiworker.h +++ b/src/eyefiworker.h @@ -10,3 +10,3 @@ class eyefiworker : public eyefiService { - int run(int port); + int run(int port) __attribute__ ((noreturn)); diff --git a/src/eyekinfig.cc b/src/eyekinfig.cc index 27a5a56..56c74a7 100644 --- a/src/eyekinfig.cc +++ b/src/eyekinfig.cc @@ -65,3 +65,3 @@ int eyekinfig_t::get_umask() { assert(cfg); - return cfg_getint(cfg,"umask"); + return 0777&cfg_getint(cfg,"umask"); } diff --git a/src/eyetil.cc b/src/eyetil.cc index 2e6ab7e..11e2fb7 100644 --- a/src/eyetil.cc +++ b/src/eyetil.cc @@ -20,3 +20,3 @@ binary_t& binary_t::from_hex(const std::string& h) { throw std::runtime_error("odd number of characters in hexadecimal number"); - int rvs = hs>>1; + size_t rvs = hs>>1; resize(rvs); @@ -25,5 +25,5 @@ binary_t& binary_t::from_hex(const std::string& h) { char t[3] = { 0,0,0 }; - for(int i=0;i<rvs;++i) { + for(size_t i=0;i<rvs;++i) { t[0]=*(hp++); t[1]=*(hp++); - *(oi++) = strtol(t,0,16); + *(oi++) = static_cast<binary_t::value_type>(0xff&strtol(t,0,16)); } @@ -56,3 +56,3 @@ std::string binary_t::hex() const { for(const_iterator i=begin(),ie=end();i!=ie;++i) { - int rc = snprintf(t,sizeof(t),"%02x",*i); + size_t rc = snprintf(t,sizeof(t),"%02x",*i); assert(rc<sizeof(t)); @@ -160,3 +160,3 @@ struct block512_t { while(uint32_t hw = sum>>16) sum = (sum&0xffff)+hw; - return ~sum; + return 0xffff&~sum; } diff --git a/src/iiid.cc b/src/iiid.cc index 6c23790..c026050 100644 --- a/src/iiid.cc +++ b/src/iiid.cc @@ -55,3 +55,3 @@ int main(int argc,char **argv) try { case 'p': - port = strtol(optarg,0,0); + port = 0xffff&strtol(optarg,0,0); if(errno) { |