minor but numerous changes from compiler-happiness department

Signed-off-by: Michael Krelin <hacker@klever.net>

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
@@ -88,13 +88,13 @@ int eyefiService::GetPhotoStatus(
     r.fileid = 1; r.offset = 0;
     return SOAP_OK;
 }
 
 int eyefiService::MarkLastPhotoInRoll(
 	std::string macaddress, int mergedelta,
-	struct rns__MarkLastPhotoInRollResponse &r ) {
+	struct rns__MarkLastPhotoInRollResponse&/* r */ ) {
 #ifndef NDEBUG
     syslog(LOG_DEBUG,
 	    "MarkLastPhotoInRoll request from %s with mergedelta=%d",
 	    macaddress.c_str(), mergedelta );
 #endif
     std::string cmd = eyekinfig_t(macaddress).get_on_mark_last_photo_in_roll();
diff --git a/src/eyefiworker.cc b/src/eyefiworker.cc
index 2d7827c..c051482 100644
--- a/src/eyefiworker.cc
+++ b/src/eyefiworker.cc
@@ -13,14 +13,14 @@ eyefiworker::eyefiworker()
 #else
 #error Something is wrong with sigpipe prevention on the platform
 #endif
 	    ;
     }
 
-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()");
     signal(SIGCHLD,SIG_IGN);
     while(true) {
 	if(!soap_valid_socket(accept()))
 	    throw std::runtime_error("failed to accept()");
 	pid_t p = fork();
diff --git a/src/eyefiworker.h b/src/eyefiworker.h
index c08ec8b..afb97c7 100644
--- a/src/eyefiworker.h
+++ b/src/eyefiworker.h
@@ -5,11 +5,11 @@
 
 class eyefiworker : public eyefiService {
     public:
 
 	eyefiworker();
 
-	int run(int port);
+	int run(int port) __attribute__ ((noreturn));
 
 };
 
 #endif /* __EYEFIWORKER_H */
diff --git a/src/eyekinfig.cc b/src/eyekinfig.cc
index 27a5a56..56c74a7 100644
--- a/src/eyekinfig.cc
+++ b/src/eyekinfig.cc
@@ -60,8 +60,8 @@ std::string eyekinfig_t::get_on_mark_last_photo_in_roll() {
     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");
 }
diff --git a/src/eyetil.cc b/src/eyetil.cc
index 2e6ab7e..11e2fb7 100644
--- a/src/eyetil.cc
+++ b/src/eyetil.cc
@@ -15,20 +15,20 @@
 #endif
 
 binary_t& binary_t::from_hex(const std::string& h) {
     std::string::size_type hs = h.length();
     if(hs&1)
 	throw std::runtime_error("odd number of characters in hexadecimal number");
-    int rvs = hs>>1;
+    size_t rvs = hs>>1;
     resize(rvs);
     const unsigned char *hp = (const unsigned char*)h.data();
     iterator oi=begin();
     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));
     }
     return *this;
 }
 
 binary_t& binary_t::from_data(const void *d,size_t s) {
     resize(s);
@@ -51,13 +51,13 @@ binary_t& binary_t::make_nonce() {
 
 std::string binary_t::hex() const {
     std::string rv;
     rv.reserve((size()<<1)+1);
     char t[3] = {0,0,0};
     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));
 	rv += t;
     }
     return rv;
 }
 
@@ -155,13 +155,13 @@ struct block512_t {
     enum { words = 512 / sizeof(uint16_t) };
     uint16_t data[words];
 
     static uint16_t tcpcksum(block512_t& data) {
 	uint32_t sum = std::accumulate(data.data,data.data+words,0);
 	while(uint32_t hw = sum>>16) sum = (sum&0xffff)+hw;
-	return ~sum;
+	return 0xffff&~sum;
     }
 
 };
 #pragma pack()
 
 binary_t integrity_digest(const void *ptr,size_t size,const std::string& ukey) {
diff --git a/src/iiid.cc b/src/iiid.cc
index 6c23790..c026050 100644
--- a/src/iiid.cc
+++ b/src/iiid.cc
@@ -50,13 +50,13 @@ int main(int argc,char **argv) try {
 	    case 'L':
 		extern const char *COPYING;
 		std::cerr << COPYING << std::endl;
 		exit(0);
 		break;
 	    case 'p':
-		port = strtol(optarg,0,0);
+		port = 0xffff&strtol(optarg,0,0);
 		if(errno) {
 		    std::cerr << "Failed to parse port number" << std::endl;
 		    exit(1);
 		}
 		break;
 	    default: