Revert "Add clang and CyaSSL to the build matrix"

Author: acv

.travis.yml

@@ -1,22 +1,7 @@
-# Use newer, container based infrastructure
-# Does not allow use of apt-get, but enables
-# caching support
-sudo: false
 language: c
 compiler:
   - gcc
-  - clang
 install:
   - ./autogen.sh
 script:
-  - ./.travis_configure_wrapper.sh && make
-env:
-  global:
-    - CFLAGS="-Werror"
-  matrix: 
-    - BUILD_TYPE=normal
-    - CYASSL="3.3.2" BUILD_TYPE=cyassl
-cache:
-  directories:
-    - dependencies-src
-    - dependencies-installed
+  - ./configure && make

.travis_configure_wrapper.sh

@@ -122,8 +122,7 @@ char *cidr;
 int action;
 {
     httpAcl *cur;
-    unsigned int addr;
-    unsigned int len;
+    int addr, len;
 
     /*
      ** Check the ACL info is reasonable
@@ -166,9 +165,7 @@ int
 httpdCheckAcl(httpd * server, request * r, httpAcl * acl)
 {
     httpAcl *cur;
-    unsigned int addr;
-    unsigned int len;
-    int res, action;
+    int addr, len, res, action;
 
     action = HTTP_ACL_DENY;
     res = scanCidr(r->clientAddr, &addr, &len); /* Returns -1 on conversion failure. */

libhttpd/ip_acl.c

@@ -256,7 +256,8 @@ int outbufsize;
 }
 
 char
-_httpd_from_hex(char c)
+_httpd_from_hex(c)
+char c;
 {
     return c >= '0' && c <= '9' ? c - '0' : c >= 'A' && c <= 'F' ? c - 'A' + 10 : c - 'a' + 10; /* accept small letters just in case */
 }

libhttpd/protocol.c

@@ -875,14 +875,11 @@ void parse_trusted_mac_list(const char *ptr) {
 					config.trustedmaclist->next = NULL;
 				} else {
 				/* Advance to the last entry */
-				p = config.trustedmaclist;
-				while (p->next != NULL) {
-					p = p->next;
-				}
-				p->next = safe_malloc(sizeof(t_trusted_mac));
-				p = p->next;
-				p->mac = safe_strdup(mac);
-				p->next = NULL;
+				for (p = config.trustedmaclist; p->next != NULL; p = p->next);
+                    p->next = safe_malloc(sizeof(t_trusted_mac));
+                    p = p->next;
+                    p->mac = safe_strdup(mac);
+                    p->next = NULL;
 				}
 			}
 		}