[PATCH] Type fixes on top of type fixes for xlC/AIX

["Victor J. Orlikowski" <v....@gte.net>]

A pile of type fixes, to keep AIX happy.
Plus, there was an unnecessary semicolon at the end of a #endif.

Index: src/lib/apr/misc/unix/getuuid.c
===================================================================
RCS file: /cvs/apache/apache-2.0/src/lib/apr/misc/unix/getuuid.c,v
retrieving revision 1.3
diff -u -d -b -r1.3 getuuid.c
--- getuuid.c	2000/10/08 02:13:58	1.3
+++ getuuid.c	2000/10/09 17:53:42
@@ -73,7 +73,7 @@
 #define NODE_LENGTH 6
 
 static int uuid_state_seqnum;
-static char uuid_state_node[NODE_LENGTH] = { 0 };
+static unsigned char uuid_state_node[NODE_LENGTH] = { 0 };
 
 
 static void get_random_info(unsigned char node[NODE_LENGTH])
@@ -114,7 +114,7 @@
    system-dependent call to get IEEE node ID. This is also more secure:
    we aren't passing out our MAC address.
 */
-static void get_pseudo_node_identifier(char *node)
+static void get_pseudo_node_identifier(unsigned char *node)
 {
     get_random_info(node);
     node[0] |= 0x80;                    /* this designates a random node ID */
Index: src/main/http_core.c
===================================================================
RCS file: /cvs/apache/apache-2.0/src/main/http_core.c,v
retrieving revision 1.151
diff -u -d -b -r1.151 http_core.c
--- http_core.c	2000/10/08 19:03:18	1.151
+++ http_core.c	2000/10/09 17:53:43
@@ -2541,7 +2541,7 @@
 #endif
 
 static apr_status_t writev_it_all(apr_socket_t *s, struct iovec *vec, int nvec, 
-                                  apr_size_t len, apr_ssize_t *nbytes)
+                                  apr_size_t len, apr_size_t *nbytes)
 {
     apr_size_t bytes_written = 0;
     apr_status_t rv;
@@ -2636,7 +2636,7 @@
     }
 
     return rv;
-#endif;
+#endif
 
     return APR_SUCCESS;
 }
@@ -3295,8 +3295,7 @@
  */
 #define ASCII_LF '\012'
     char *buff;
-    apr_size_t length = HUGE_STRING_LEN;
-    apr_size_t templen;
+    apr_ssize_t length = HUGE_STRING_LEN, templen;
     apr_socket_t *csock = NULL;
     apr_status_t rv;
     ap_bucket *e;
@@ -3343,7 +3342,7 @@
 {
     apr_status_t rv;
     ap_bucket_brigade *more = NULL;
-    apr_ssize_t bytes_sent = 0, nbytes = 0;
+    apr_size_t bytes_sent = 0, nbytes = 0;
     ap_bucket *e;
     conn_rec *c = f->c;
 
Index: src/main/http_protocol.c
===================================================================
RCS file: /cvs/apache/apache-2.0/src/main/http_protocol.c,v
retrieving revision 1.153
diff -u -d -b -r1.153 http_protocol.c
--- http_protocol.c	2000/10/08 23:22:35	1.153
+++ http_protocol.c	2000/10/09 17:53:43
@@ -866,7 +866,7 @@
 #define ASCII_LF '\012'
     ap_bucket *e;
     char *buff;
-    int length;
+    apr_ssize_t length;
     char *pos;
     int state = 0;
     http_ctx_t *ctx = f->ctx;
@@ -963,7 +963,7 @@
     const char *temp;
     int retval;
     int total = 0;
-    int length;
+    apr_ssize_t length;
     ap_bucket_brigade *b;
     ap_bucket *e;
     
Index: src/modules/standard/mod_cgid.c
===================================================================
RCS file: /cvs/apache/apache-2.0/src/modules/standard/mod_cgid.c,v
retrieving revision 1.43
diff -u -d -b -r1.43 mod_cgid.c
--- mod_cgid.c	2000/10/06 17:52:46	1.43
+++ mod_cgid.c	2000/10/09 17:53:43
@@ -841,7 +841,7 @@
     char **env; 
     struct sockaddr_un unix_addr;
     apr_file_t *tempsock = NULL;
-    int nbytes;
+    apr_ssize_t nbytes;
 
     if (r->method_number == M_OPTIONS) { 
         /* 99 out of 100 cgid scripts, this is all they support */ 

-- 
Victor J. Orlikowski
======================
v.j.orlikowski@gte.net
vjo@raleigh.ibm.com
vjo@us.ibm.com