0
@@ -28,7 +28,8 @@ all:
0
 distclean: clean
0
   cd collection && make clean
0
   rm -f Makefile config.cache config.status config.log \
0
-		collection/Makefile mlan/Makefile
0
+		collection/Makefile mlan/Makefile commands/Makefile
0
+	rmdir mlan/stringlib mlan/mymalloc
0
 
0
 clean:
0
   rm -f $(PROGS) $(PROGO)

0
@@ -2,5 +2,5 @@
0
 
0
 # Need mymalloc
0
 ./mymalloc  dustin@spy.net--projects/clib--mymalloc--1.0
0
-./stringlib	dustin@spy.net--projects-2004/clib--strings--1.0
0
+./stringlib	dustin@spy.net--projects-2006/clib--strings--1.0
0
 

0
@@ -212,7 +212,8 @@ mainloop()
0
 {
0
   char   msgbuf[256];
0
   struct sockaddr_in addr;
0
-	int    nbytes=0, addrlen=0;
0
+	int    nbytes=0;
0
+	socklen_t addrlen=0;
0
 
0
   /* now just enter a read-print loop */
0
   addrlen = sizeof(addr);

0
@@ -444,10 +444,10 @@ msend(const char *msg)
0
 
0
 /* Parse the serial number if it looks like a serial number, else return a
0
  * serial number beginning with 0x00 */
0
-char *
0
+uchar *
0
 sdParseSerial(char *in, uchar *out)
0
 {
0
-	char *rv=NULL;
0
+	uchar *rv=NULL;
0
 
0
   /* Validate the size */
0
   if(strlen(in) == (MLAN_SERIAL_SIZE*2)) {
0
@@ -745,7 +745,7 @@ mainLoop()
0
       if(FD_ISSET(serverSocket, &rfdset)) {
0
         int client=0;
0
         struct sockaddr_in fsin;
0
-				int fromlen=sizeof(fsin);
0
+				socklen_t fromlen=sizeof(fsin);
0
 
0
         client=accept(serverSocket, (struct sockaddr *)&fsin, &fromlen);
0
         if(client < 0) {

0
@@ -16,9 +16,6 @@
0
 #define CLIENT_CONTINUE 0 
0
 #define CLIENT_DONE 1
0
 
0
-/* Command pointers */
0
-extern struct cmdPointer cmdPointers[];
0
-
0
 /* Possible TCP client states */
0
 enum client_state {
0
   CONNECTED, /* Connected, ready to talk. */
0
@@ -52,6 +49,9 @@ struct cmdPointer {
0
   int (*cmd)(MLan *mlan, struct client *client, int argc, char **argv);
0
 };
0
 
0
+/* Command pointers */
0
+extern struct cmdPointer cmdPointers[];
0
+
0
 /* Prototypes */
0
 void log_error(char *str, ...);
0
 void log_info(char *str, ...);
0
@@ -59,7 +59,7 @@ void handleNewConnection(struct client*, struct sockaddr_in);
0
 int getServerSocket(int port);
0
 int handleRead(MLan *mlan, struct client *client);
0
 void handleWrite(struct client *client);
0
-char *sdParseSerial(char *in, uchar *out);
0
+uchar *sdParseSerial(char *in, uchar *out);
0
 
0
 /* Free a client message */
0
 void freeClientMessage(struct client_msg *msg);

0
@@ -416,7 +416,7 @@ processClientData(MLan *mlan, struct client *client)
0
   char *latest=NULL;
0
 
0
   /* Skip over leading whitespace */
0
-	while(*p != NULL && isspace(*p)) {
0
+	while(*p != 0x00 && isspace(*p)) {
0
     p++;
0
   }
0
 

0
@@ -2423,8 +2423,9 @@ fi
0
 
0
 if test "$GCC" = "yes"
0
 then
0
-	echo "GCC, setting -Wall"
0
+	echo "GCC, setting -Wall and -Werror"
0
   CPPFLAGS="$CPPFLAGS -Wall"
0
+	CFLAGs="$CFLAGS -Werror"
0
 fi
0
 
0
 if test "$GUILECONF" = ""
0
@@ -4884,7 +4885,7 @@ fi
0
 done
0
 
0
 
0
-CFLAGS="$CFLAGS $CPPFLAGS"
0
+CFLAGS="$CFLAGS $CPPFLAGS $EXTRACFLAGS"
0
 
0
                                         ac_config_files="$ac_config_files Makefile collection/Makefile mlan/Makefile commands/Makefile"
0
 cat >confcache <<\_ACEOF

0
@@ -68,8 +68,9 @@ fi
0
 
0
 if test "$GCC" = "yes"
0
 then
0
-	echo "GCC, setting -Wall"
0
+	echo "GCC, setting -Wall and -Werror"
0
   CPPFLAGS="$CPPFLAGS -Wall"
0
+	CFLAGs="$CFLAGS -Werror"
0
 fi
0
 
0
 dnl If there's guile, build the guile stuff.
0
@@ -136,6 +137,6 @@ AC_TYPE_SIGNAL
0
 AC_CHECK_FUNCS(getopt vsprintf vsnprintf snprintf sprintf strerror utime utimes)
0
 AC_CHECK_FUNCS(vasprintf)
0
 
0
-CFLAGS="$CFLAGS $CPPFLAGS"
0
+CFLAGS="$CFLAGS $CPPFLAGS $EXTRACFLAGS"
0
 
0
 AC_OUTPUT(Makefile collection/Makefile mlan/Makefile commands/Makefile)

0
@@ -112,7 +112,7 @@ h2b(int size, char *buf, uchar *outbuf)
0
 }
0
 
0
 /* External API for parsing serial numbers */
0
-char *
0
+uchar *
0
 parseSerial(char *in, uchar *out)
0
 {
0
   assert(in);
0
@@ -122,7 +122,7 @@ parseSerial(char *in, uchar *out)
0
 }
0
 
0
 /* Parse a serial number */
0
-static char *
0
+static uchar *
0
 _mlan_parseSerial(MLan *mlan, char *in, uchar *out)
0
 {
0
   return(parseSerial(in, out));

0
@@ -81,7 +81,7 @@ struct __mlan {
0
   void (*copySerial)(MLan *mlan, uchar *in);
0
   char *(*serialLookup)(MLan *mlan, int which);
0
   void (*registerSerial)(MLan *mlan, int id, char *value);
0
-	char *(*parseSerial)(MLan *mlan, char *serial, uchar *output);
0
+	uchar *(*parseSerial)(MLan *mlan, char *serial, uchar *output);
0
   int (*getBlock)(MLan *mlan, uchar *serial, int page, int pages, uchar *);
0
   int (*writeScratchpad)(MLan *mlan, uchar *serial, int page, int, uchar *);
0
   int (*copyScratchpad)(MLan *mlan, uchar *serial, int page, int size);
0
@@ -103,7 +103,7 @@ char *get_sample(MLan *mlan, uchar *serial);
0
 
0
 void binDumpBlock(uchar *buffer, int size, int start_addr);
0
 void dumpBlock(uchar *buffer, int size);
0
-char *parseSerial(char *in, uchar *out);
0
+uchar *parseSerial(char *in, uchar *out);
0
 
0
 /* Common functions */
0
 int recall(MLan *mlan, uchar *serial);