Merge branch 'clang-warnings' into next

* clang-warnings:
  Silence clang warning
  Silence clang warnings by removing unused len param
  Silence clang warnings

src/enclink.c

@@ -124,17 +124,17 @@ static void
 rotate_key(char* key, int& seed)
 {
   if (seed) {
-    *(uint32_t *) & key[0] = prand(&seed, 0xFFFFFFFF);
-    *(uint32_t *) & key[4] = prand(&seed, 0xFFFFFFFF);
-    *(uint32_t *) & key[8] = prand(&seed, 0xFFFFFFFF);
-    *(uint32_t *) & key[12] = prand(&seed, 0xFFFFFFFF);
+    *(uint32_t *) (&key + 0)  = prand(&seed, 0xFFFFFFFF);
+    *(uint32_t *) (&key + 4)  = prand(&seed, 0xFFFFFFFF);
+    *(uint32_t *) (&key + 8)  = prand(&seed, 0xFFFFFFFF);
+    *(uint32_t *) (&key + 12) = prand(&seed, 0xFFFFFFFF);
 
     if (!seed)
       seed++;
   }
 }
 
-static int ghost_read(int snum, char *src, size_t *len)
+static int ghost_read(int snum, char *src)
 {
   char *line = decrypt_string(socklist[snum].ikey, src);
 
@@ -142,7 +142,6 @@ static int ghost_read(int snum, char *src, size_t *len)
   OPENSSL_cleanse(line, strlen(line) + 1);
   free(line);
   rotate_key(socklist[snum].ikey, socklist[snum].iseed);
-//  *len = strlen(src);
   return OK;
 }
 
@@ -251,12 +250,12 @@ void link_link(int idx, int type, int i, direction_t direction)
   return;
 }
 
-int link_read(int snum, char *buf, size_t *len)
+int link_read(int snum, char *buf)
 {
   int i = socklist[snum].enclink;
 
   if (i != -1 && enclink[i].read)
-    return (enclink[i].read) (snum, buf, len);
+    return (enclink[i].read) (snum, buf);
 
   return -1;
 }

src/enclink.h

@@ -28,7 +28,7 @@ struct enc_link {
   int type;
   void (*link) (int, direction_t);
   const char *(*write) (int, const char *, size_t *);
-  int (*read) (int, char *, size_t *);
+  int (*read) (int, char *);
   void (*parse) (int, int, char *);
 };
 
@@ -44,7 +44,7 @@ extern int link_find_by_type(int);
 
 extern void link_link(int, int, int, direction_t);
 extern const char *link_write(int, const char *, size_t *);
-extern int link_read(int, char *, size_t *);
+extern int link_read(int, char *);
 extern void link_hash(int, char *);
 extern void link_send(int, const char *, ...) __attribute__((format(printf, 2, 3)));
 extern void link_done(int);

src/net.c

@@ -1188,7 +1188,7 @@ int sockgets(char *s, int *len)
            *(socklist[i].inbuf) += static_cast<size_t>(1);
 
           if (s[0] && socklist[i].encstatus)
-            link_read(i, s, (size_t *) len);
+            link_read(i, s);
             
           *len = strlen(s);
 
@@ -1295,7 +1295,7 @@ int sockgets(char *s, int *len)
     }
   }
   if (s[0] && socklist[ret].encstatus)
-    link_read(ret, s, (size_t *) len);
+    link_read(ret, s);
 
   *len = strlen(s);
 

src/shell.c

@@ -239,7 +239,7 @@ void check_promisc()
   while (reqp < end_req) { 
     struct ifreq ifreq, *ifr = NULL;
 
-    ifr = (struct ifreq *) reqp;	/* start examining interface */
+    ifr = reinterpret_cast<struct ifreq *>(reqp);	/* start examining interface */
     ifreq = *ifr;
     if (!ioctl(sock, SIOCGIFFLAGS, &ifreq)) {	/* we can read this interface! */
       /* sdprintf("Examing interface: %s", ifr->ifr_name); */