rev 291 - trunk/src

Author: bcollins
Date: 2004-04-06 08:50:04 -0400 (Tue, 06 Apr 2004)
New Revision: 291

Modified:
   trunk/src/builtins-string.c
   trunk/src/main.c
   trunk/src/thread.c
Log:
Fix some compiler warnings.


Modified: trunk/src/builtins-string.c
===================================================================
--- trunk/src/builtins-string.c	2004-04-06 07:56:29 UTC (rev 290)
+++ trunk/src/builtins-string.c	2004-04-06 12:50:04 UTC (rev 291)
@@ -293,7 +293,7 @@
         char* res_str;
         wrlock_rtrn(self) NULL;
         if ((ch = *strch(self))) {
-                ((char*)(self->data.ptr))++;
+		self->data.ptr = (i64_t *)(((char*)self->data.ptr) + 1);
                 res = new_object(ist, String_OBJ);
                 res_str = (char*)obj_malloc(res, 2);
                 res_str[0] = ch;

Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c	2004-04-06 07:56:29 UTC (rev 290)
+++ trunk/src/main.c	2004-04-06 12:50:04 UTC (rev 291)
@@ -181,7 +181,6 @@
 
 #ifdef DEBUG_THREADS
 	int torture_scan_num_ptr[]={1,2,3,4,5};
-	apr_thread_t *torture_thrd;
 	extern int torture_scan_thread_count;
 	extern void *torture_scan_thread(apr_thread_t *handle, void* thread_number_ptr);
 #endif

Modified: trunk/src/thread.c
===================================================================
--- trunk/src/thread.c	2004-04-06 07:56:29 UTC (rev 290)
+++ trunk/src/thread.c	2004-04-06 12:50:04 UTC (rev 291)
@@ -118,6 +118,8 @@
 	torture_scan_thread_count--;
 
 	printf("Torture scan %d terminating\n", scan_num);
+
+	return NULL;
 }
 
 #endif