You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by dr...@locus.apache.org on 2000/06/17 13:11:41 UTC
cvs commit: apache-2.0/src/lib/apr/threadproc/beos proc.c thread.c threadpriv.c threadproc.h
dreid 00/06/17 04:11:41
Modified: src/lib/apr/threadproc/beos proc.c thread.c threadpriv.c
threadproc.h
Log:
Tidy up some warnings in the threadproc directory.
Revision Changes Path
1.27 +1 -3 apache-2.0/src/lib/apr/threadproc/beos/proc.c
Index: proc.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/proc.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- proc.c 2000/06/12 13:00:05 1.26
+++ proc.c 2000/06/17 11:11:40 1.27
@@ -195,8 +195,6 @@
int i=0,nargs=0;
char **newargs = NULL;
thread_id newproc, sender;
- char * buffer = NULL;
- size_t bufsize = 0;
struct send_pipe *sp;
char * dir = NULL;
@@ -234,7 +232,7 @@
}
newargs[nargs] = NULL;
- newproc = load_image(nargs, newargs, env);
+ newproc = load_image(nargs, (const char**)newargs, (const char**)env);
/* load_image copies the data so now we can free it... */
while (--nargs >= 0)
1.11 +1 -2 apache-2.0/src/lib/apr/threadproc/beos/thread.c
Index: thread.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/thread.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- thread.c 2000/04/14 15:58:47 1.10
+++ thread.c 2000/06/17 11:11:40 1.11
@@ -56,8 +56,6 @@
ap_status_t ap_create_threadattr(ap_threadattr_t **new, ap_pool_t *cont)
{
- ap_status_t stat;
-
(*new) = (ap_threadattr_t *)ap_palloc(cont,
sizeof(ap_threadattr_t));
(*new)->attr = (int32)ap_palloc(cont,
@@ -135,6 +133,7 @@
{
ap_destroy_pool(thd->cntxt);
exit_thread ((status_t)retval);
+ return APR_SUCCESS;
}
ap_status_t ap_thread_join(ap_status_t *retval, ap_thread_t *thd)
1.10 +1 -1 apache-2.0/src/lib/apr/threadproc/beos/threadpriv.c
Index: threadpriv.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/threadpriv.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- threadpriv.c 2000/04/14 15:58:47 1.9
+++ threadpriv.c 2000/06/17 11:11:40 1.10
@@ -122,7 +122,7 @@
tid = find_thread(NULL);
for (i=0; i < BEOS_MAX_DATAKEYS; i++){
if (beos_data[i]->data){
- if (beos_data[i]->td = tid){index = i;}
+ if (beos_data[i]->td == tid){index = i;}
}
}
if (index==0){
1.12 +2 -1 apache-2.0/src/lib/apr/threadproc/beos/threadproc.h
Index: threadproc.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/threadproc.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- threadproc.h 2000/06/01 18:45:11 1.11
+++ threadproc.h 2000/06/17 11:11:40 1.12
@@ -59,10 +59,11 @@
#include "apr_file_io.h"
#include "apr_general.h"
#include "apr_portable.h"
-#include <kernel/OS.h>
+#include <kernel/OS.h>
#include <signal.h>
#include <string.h>
#include <sys/wait.h>
+#include <image.h>
#ifndef THREAD_PROC_H
#define THREAD_PROC_H