You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by bj...@locus.apache.org on 2000/04/08 08:58:44 UTC
cvs commit: apache-2.0/src/lib/apr/threadproc/os2 proc.c signals.c thread.c threadcancel.c threadpriv.c
bjh 00/04/07 23:58:44
Modified: src/lib/apr/dso/os2 dso.c
src/lib/apr/file_io/os2 Makefile.in dir.c filedup.c fileio.h
filestat.c open.c pipe.c readwrite.c seek.c
src/lib/apr/include apr_errno.h
src/lib/apr/locks/os2 locks.c
src/lib/apr/network_io/os2 networkio.h os2calls.c poll.c
sendrecv.c sockets.c sockopt.c
src/lib/apr/shmem/os2 shmem.c
src/lib/apr/threadproc/os2 proc.c signals.c thread.c
threadcancel.c threadpriv.c
Log:
First stage of migrating OS/2 code to new error code mappings, define & use
macro for returning OS/2 error codes.
Revision Changes Path
1.5 +2 -2 apache-2.0/src/lib/apr/dso/os2/dso.c
Index: dso.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/os2/dso.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dso.c 2000/04/04 12:19:32 1.4
+++ dso.c 2000/04/08 06:58:38 1.5
@@ -81,7 +81,7 @@
if ((rc = DosLoadModule(failed_module, sizeof(failed_module), path, &handle)) != 0) {
(*res_handle)->failed_module = ap_pstrdup(ctx, failed_module);
- return os2errno(rc);
+ return APR_OS2_STATUS(rc);
}
(*res_handle)->handle = handle;
@@ -105,7 +105,7 @@
if (rc == 0)
handle->handle = 0;
- return os2errno(rc);
+ return APR_OS2_STATUS(rc);
}
1.7 +1 -2 apache-2.0/src/lib/apr/file_io/os2/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.in 2000/03/16 10:04:53 1.6
+++ Makefile.in 2000/04/08 06:58:39 1.7
@@ -21,8 +21,7 @@
open.o \
pipe.o \
readwrite.o \
- seek.o \
- maperrorcode.o
+ seek.o
.c.o:
$(CC) $(CFLAGS) -c $(INCLUDES) $<
1.10 +5 -5 apache-2.0/src/lib/apr/file_io/os2/dir.c
Index: dir.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/dir.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- dir.c 2000/04/03 19:44:22 1.9
+++ dir.c 2000/04/08 06:58:39 1.10
@@ -102,7 +102,7 @@
}
}
- return os2errno(rv);
+ return APR_OS2_STATUS(rv);
}
@@ -129,7 +129,7 @@
thedir->validentry = FALSE;
if (rv)
- return os2errno(rv);
+ return APR_OS2_STATUS(rv);
return APR_ENOENT;
}
@@ -145,14 +145,14 @@
ap_status_t ap_make_dir(const char *path, ap_fileperms_t perm, ap_context_t *cont)
{
- return os2errno(DosCreateDir(path, NULL));
+ return APR_OS2_STATUS(DosCreateDir(path, NULL));
}
ap_status_t ap_remove_dir(const char *path, ap_context_t *cont)
{
- return os2errno(DosDeleteDir(path));
+ return APR_OS2_STATUS(DosDeleteDir(path));
}
@@ -207,7 +207,7 @@
DosClose( hFile );
}
- return os2errno(rc);
+ return APR_OS2_STATUS(rc);
}
}
1.12 +1 -1 apache-2.0/src/lib/apr/file_io/os2/filedup.c
Index: filedup.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/filedup.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- filedup.c 2000/04/03 19:44:23 1.11
+++ filedup.c 2000/04/08 06:58:39 1.12
@@ -81,7 +81,7 @@
rv = DosDupHandle(old_file->filedes, &dup_file->filedes);
if (rv) {
- return os2errno(rv);
+ return APR_OS2_STATUS(rv);
}
dup_file->fname = ap_pstrdup(dup_file->cntxt, old_file->fname);
1.14 +0 -1 apache-2.0/src/lib/apr/file_io/os2/fileio.h
Index: fileio.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/fileio.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fileio.h 2000/04/03 18:36:57 1.13
+++ fileio.h 2000/04/08 06:58:39 1.14
@@ -92,7 +92,6 @@
ap_status_t apr_file_cleanup(void *);
ap_status_t ap_os2_time_to_ap_time(ap_time_t *result, FDATE os2date, FTIME os2time);
-int os2errno( ULONG oserror );
#endif /* ! FILE_IO_H */
1.8 +3 -3 apache-2.0/src/lib/apr/file_io/os2/filestat.c
Index: filestat.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/filestat.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- filestat.c 2000/04/03 19:44:23 1.7
+++ filestat.c 2000/04/08 06:58:39 1.8
@@ -104,7 +104,7 @@
return APR_SUCCESS;
}
- return os2errno(rc);
+ return APR_OS2_STATUS(rc);
}
@@ -133,7 +133,7 @@
finfo->protection = 0;
finfo->filetype = APR_NOFILE;
- return os2errno(rc);
+ return APR_OS2_STATUS(rc);
}
@@ -157,5 +157,5 @@
return APR_SUCCESS;
}
- return os2errno(rc);
+ return APR_OS2_STATUS(rc);
}
1.20 +4 -4 apache-2.0/src/lib/apr/file_io/os2/open.c
Index: open.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/open.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- open.c 2000/04/03 19:44:24 1.19
+++ open.c 2000/04/08 06:58:39 1.20
@@ -127,7 +127,7 @@
}
if (rv != 0)
- return os2errno(rv);
+ return APR_OS2_STATUS(rv);
dafile->isopen = TRUE;
dafile->fname = ap_pstrdup(cntxt, fname);
@@ -159,10 +159,10 @@
status = APR_SUCCESS;
if (file->flags & APR_DELONCLOSE) {
- status = os2errno(DosDelete(file->fname));
+ status = APR_OS2_STATUS(DosDelete(file->fname));
}
} else {
- return os2errno(rc);
+ return APR_OS2_STATUS(rc);
}
}
@@ -174,7 +174,7 @@
ap_status_t ap_remove_file(char *path, ap_context_t *cntxt)
{
ULONG rc = DosDelete(path);
- return os2errno(rc);
+ return APR_OS2_STATUS(rc);
}
1.13 +1 -1 apache-2.0/src/lib/apr/file_io/os2/pipe.c
Index: pipe.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/pipe.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- pipe.c 2000/04/03 19:44:24 1.12
+++ pipe.c 2000/04/08 06:58:39 1.13
@@ -66,7 +66,7 @@
rc = DosCreatePipe(filedes, filedes+1, 4096);
if (rc) {
- return os2errno(rc);
+ return APR_OS2_STATUS(rc);
}
(*in) = (ap_file_t *)ap_palloc(cont, sizeof(ap_file_t));
1.19 +6 -6 apache-2.0/src/lib/apr/file_io/os2/readwrite.c
Index: readwrite.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/readwrite.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- readwrite.c 2000/04/04 12:24:42 1.18
+++ readwrite.c 2000/04/08 06:58:39 1.19
@@ -105,13 +105,13 @@
*nbytes = rc == 0 ? pos - (char *)buf : 0;
DosExitCritSec();
- return os2errno(rc);
+ return APR_OS2_STATUS(rc);
} else {
rc = DosRead(thefile->filedes, buf, *nbytes, &bytesread);
if (rc) {
*nbytes = 0;
- return os2errno(rc);
+ return APR_OS2_STATUS(rc);
}
*nbytes = bytesread;
@@ -164,13 +164,13 @@
}
DosExitCritSec();
- return os2errno(rc);
+ return APR_OS2_STATUS(rc);
} else {
rc = DosWrite(thefile->filedes, buf, *nbytes, &byteswritten);
if (rc) {
*nbytes = 0;
- return os2errno(rc);
+ return APR_OS2_STATUS(rc);
}
*nbytes = byteswritten;
@@ -210,7 +210,7 @@
rc = DosWrite(thefile->filedes, &ch, 1, &byteswritten);
if (rc) {
- return os2errno(rc);
+ return APR_OS2_STATUS(rc);
}
return APR_SUCCESS;
@@ -276,7 +276,7 @@
thefile->bufpos = 0;
}
- return os2errno(rc);
+ return APR_OS2_STATUS(rc);
} else {
/* There isn't anything to do if we aren't buffering the output
* so just return success.
1.8 +2 -4 apache-2.0/src/lib/apr/file_io/os2/seek.c
Index: seek.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/seek.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- seek.c 2000/04/03 19:44:25 1.7
+++ seek.c 2000/04/08 06:58:39 1.8
@@ -61,10 +61,8 @@
#define INCL_DOS
#include <os2.h>
-int os2errno( ULONG oserror );
-
static ap_status_t setptr(ap_file_t *thefile, unsigned long pos )
{
long newbufpos;
@@ -86,7 +84,7 @@
thefile->bufpos = thefile->dataRead = 0;
}
- return os2errno(rc);
+ return APR_OS2_STATUS(rc);
}
@@ -134,6 +132,6 @@
break;
}
- return os2errno(DosSetFilePtr(thefile->filedes, *offset, where, (ULONG *)&offset));
+ return APR_OS2_STATUS(DosSetFilePtr(thefile->filedes, *offset, where, (ULONG *)&offset));
}
}
1.23 +2 -0 apache-2.0/src/lib/apr/include/apr_errno.h
Index: apr_errno.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_errno.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- apr_errno.h 2000/04/07 14:16:28 1.22
+++ apr_errno.h 2000/04/08 06:58:41 1.23
@@ -80,6 +80,8 @@
int ap_canonical_error(ap_status_t err);
const char *ap_strerror(ap_status_t err);
+#define APR_OS2_STATUS(e) (e == 0 ? APR_SUCCESS : e + APR_OS_START_SYSERR)
+
#define APR_SUCCESS 0
/* APR ERROR VALUES */
1.12 +5 -5 apache-2.0/src/lib/apr/locks/os2/locks.c
Index: locks.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/os2/locks.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- locks.c 2000/04/03 19:44:48 1.11
+++ locks.c 2000/04/08 06:58:41 1.12
@@ -104,7 +104,7 @@
if (!rc)
ap_register_cleanup(cont, new, lock_cleanup, ap_null_cleanup);
- return os2errno(rc);
+ return APR_OS2_STATUS(rc);
}
@@ -127,7 +127,7 @@
if (!rc)
ap_register_cleanup(cont, *lock, lock_cleanup, ap_null_cleanup);
- return os2errno(rc);
+ return APR_OS2_STATUS(rc);
}
@@ -143,7 +143,7 @@
lock->lock_count++;
}
- return os2errno(rc);
+ return APR_OS2_STATUS(rc);
}
@@ -155,7 +155,7 @@
if (lock->owner == CurrentTid && lock->lock_count > 0) {
lock->lock_count--;
rc = DosReleaseMutexSem(lock->hMutex);
- return os2errno(rc);
+ return APR_OS2_STATUS(rc);
}
return APR_SUCCESS;
@@ -184,5 +184,5 @@
if (!rc)
lock->hMutex = 0;
- return os2errno(rc);
+ return APR_OS2_STATUS(rc);
}
1.10 +0 -2 apache-2.0/src/lib/apr/network_io/os2/networkio.h
Index: networkio.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/networkio.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- networkio.h 2000/04/03 18:37:33 1.9
+++ networkio.h 2000/04/08 06:58:41 1.10
@@ -59,8 +59,6 @@
#include "apr_general.h"
#include "os2calls.h"
-int os2errno( unsigned long oserror );
-
struct ap_socket_t {
ap_context_t *cntxt;
int socketdes;
1.4 +2 -2 apache-2.0/src/lib/apr/network_io/os2/os2calls.c
Index: os2calls.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/os2calls.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- os2calls.c 2000/03/31 08:36:12 1.3
+++ os2calls.c 2000/04/08 06:58:41 1.4
@@ -93,7 +93,7 @@
rc = DosLoadModule(errorstr, sizeof(errorstr), "SO32DLL", &hSO32DLL);
if (rc)
- return os2errno(rc);
+ return APR_OS2_STATUS(rc);
rc = DosQueryProcAddr(hSO32DLL, 0, "SOCKET", &apr_os2_socket);
@@ -146,7 +146,7 @@
rc = DosQueryProcAddr(hSO32DLL, 0, "WRITEV", &apr_os2_writev);
if (rc)
- return os2errno(rc);
+ return APR_OS2_STATUS(rc);
}
DosExitCritSec();
1.12 +1 -1 apache-2.0/src/lib/apr/network_io/os2/poll.c
Index: poll.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/poll.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- poll.c 2000/04/03 19:45:07 1.11
+++ poll.c 2000/04/08 06:58:41 1.12
@@ -159,7 +159,7 @@
} while ( rv < 0 && sock_errno() == SOCEINTR );
(*nsds) = rv;
- return rv < 0 ? os2errno(sock_errno()) : APR_SUCCESS;
+ return rv < 0 ? APR_OS2_STATUS(sock_errno()) : APR_SUCCESS;
}
1.12 +6 -6 apache-2.0/src/lib/apr/network_io/os2/sendrecv.c
Index: sendrecv.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/sendrecv.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sendrecv.c 2000/04/03 19:45:07 1.11
+++ sendrecv.c 2000/04/08 06:58:41 1.12
@@ -79,7 +79,7 @@
if (err == SOCEINTR)
continue;
- return os2errno(err);
+ return APR_OS2_STATUS(err);
}
}
@@ -89,7 +89,7 @@
if (err) {
*len = 0;
- return os2errno(err);
+ return APR_OS2_STATUS(err);
}
(*len) = rv;
@@ -118,7 +118,7 @@
if (err == SOCEINTR)
continue;
- return os2errno(err);
+ return APR_OS2_STATUS(err);
}
}
@@ -128,7 +128,7 @@
if (err) {
*len = 0;
- return os2errno(err);
+ return APR_OS2_STATUS(err);
}
(*len) = rv;
@@ -161,7 +161,7 @@
if (err == SOCEINTR)
continue;
- return os2errno(err);
+ return APR_OS2_STATUS(err);
}
}
@@ -171,7 +171,7 @@
if (err) {
*len = 0;
- return os2errno(err);
+ return APR_OS2_STATUS(err);
}
*len = rv;
1.16 +7 -7 apache-2.0/src/lib/apr/network_io/os2/sockets.c
Index: sockets.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/sockets.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sockets.c 2000/04/04 12:29:39 1.15
+++ sockets.c 2000/04/08 06:58:42 1.16
@@ -74,7 +74,7 @@
return APR_SUCCESS;
}
else {
- return os2errno(sock_errno());
+ return APR_OS2_STATUS(sock_errno());
}
}
@@ -103,7 +103,7 @@
(*new)->addr_len = sizeof(*(*new)->local_addr);
if ((*new)->socketdes < 0) {
- return os2errno(sock_errno());
+ return APR_OS2_STATUS(sock_errno());
}
(*new)->timeout = -1;
(*new)->nonblock = FALSE;
@@ -118,7 +118,7 @@
return APR_SUCCESS;
}
else {
- return os2errno(sock_errno());
+ return APR_OS2_STATUS(sock_errno());
}
}
@@ -134,7 +134,7 @@
ap_status_t ap_bind(ap_socket_t *sock)
{
if (bind(sock->socketdes, (struct sockaddr *)sock->local_addr, sock->addr_len) == -1)
- return os2errno(sock_errno());
+ return APR_OS2_STATUS(sock_errno());
else
return APR_SUCCESS;
}
@@ -142,7 +142,7 @@
ap_status_t ap_listen(ap_socket_t *sock, ap_int32_t backlog)
{
if (listen(sock->socketdes, backlog) == -1)
- return os2errno(sock_errno());
+ return APR_OS2_STATUS(sock_errno());
else
return APR_SUCCESS;
}
@@ -162,7 +162,7 @@
&(*new)->addr_len);
if ((*new)->socketdes < 0) {
- return os2errno(sock_errno());
+ return APR_OS2_STATUS(sock_errno());
}
ap_register_cleanup((*new)->cntxt, (void *)(*new),
@@ -193,7 +193,7 @@
if ((connect(sock->socketdes, (struct sockaddr *)sock->remote_addr, sock->addr_len) < 0) &&
(sock_errno() != SOCEINPROGRESS)) {
- return os2errno(sock_errno());
+ return APR_OS2_STATUS(sock_errno());
}
else {
int namelen = sizeof(*sock->local_addr);
1.12 +7 -7 apache-2.0/src/lib/apr/network_io/os2/sockopt.c
Index: sockopt.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/sockopt.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sockopt.c 2000/04/03 19:45:08 1.11
+++ sockopt.c 2000/04/08 06:58:42 1.12
@@ -78,27 +78,27 @@
if (opt & APR_SO_KEEPALIVE) {
if (setsockopt(sock->socketdes, SOL_SOCKET, SO_KEEPALIVE, (void *)&one, sizeof(int)) == -1) {
- return os2errno(sock_errno());
+ return APR_OS2_STATUS(sock_errno());
}
}
if (opt & APR_SO_DEBUG) {
if (setsockopt(sock->socketdes, SOL_SOCKET, SO_DEBUG, (void *)&one, sizeof(int)) == -1) {
- return os2errno(sock_errno());
+ return APR_OS2_STATUS(sock_errno());
}
}
if (opt & APR_SO_REUSEADDR) {
if (setsockopt(sock->socketdes, SOL_SOCKET, SO_REUSEADDR, (void *)&one, sizeof(int)) == -1) {
- return os2errno(sock_errno());
+ return APR_OS2_STATUS(sock_errno());
}
}
if (opt & APR_SO_SNDBUF) {
if (setsockopt(sock->socketdes, SOL_SOCKET, SO_SNDBUF, (void *)&on, sizeof(int)) == -1) {
- return os2errno(sock_errno());
+ return APR_OS2_STATUS(sock_errno());
}
}
if (opt & APR_SO_NONBLOCK) {
if (ioctl(sock->socketdes, FIONBIO, (caddr_t)&one, sizeof(one)) == -1) {
- return os2errno(sock_errno());
+ return APR_OS2_STATUS(sock_errno());
} else {
sock->nonblock = one;
}
@@ -107,7 +107,7 @@
li.l_onoff = on;
li.l_linger = MAX_SECS_TO_LINGER;
if (setsockopt(sock->socketdes, SOL_SOCKET, SO_LINGER, (char *) &li, sizeof(struct linger)) == -1) {
- return os2errno(sock_errno());
+ return APR_OS2_STATUS(sock_errno());
}
}
if (opt & APR_SO_TIMEOUT) {
@@ -121,7 +121,7 @@
ap_status_t ap_gethostname(char *buf, ap_int32_t len, ap_context_t *cont)
{
if (gethostname(buf, len) == -1)
- return os2errno(sock_errno());
+ return APR_OS2_STATUS(sock_errno());
else
return APR_SUCCESS;
}
1.3 +2 -4 apache-2.0/src/lib/apr/shmem/os2/shmem.c
Index: shmem.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/os2/shmem.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- shmem.c 2000/03/31 08:36:18 1.2
+++ shmem.c 2000/04/08 06:58:42 1.3
@@ -61,8 +61,6 @@
#define INCL_DOS
#include <os2.h>
-int os2errno( unsigned long oserror );
-
struct shmem_t {
void *memblock;
Heap_t heap;
@@ -82,7 +80,7 @@
rc = DosAllocSharedMem(&(newm->memblock), name, reqsize, PAG_COMMIT|OBJ_GETTABLE|PAG_READ|PAG_WRITE);
if (rc)
- return os2errno(rc);
+ return APR_OS2_STATUS(rc);
newm->heap = _ucreate(newm->memblock, reqsize, !_BLOCK_CLEAN, _HEAP_REGULAR|_HEAP_SHARED, NULL, NULL);
_uopen(newm->heap);
@@ -145,7 +143,7 @@
rc = DosGetSharedMem(m->memblock, PAG_READ|PAG_WRITE);
if (rc)
- return os2errno(rc);
+ return APR_OS2_STATUS(rc);
_uopen(m->heap);
return APR_SUCCESS;
1.18 +1 -1 apache-2.0/src/lib/apr/threadproc/os2/proc.c
Index: proc.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/proc.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- proc.c 2000/04/03 19:45:21 1.17
+++ proc.c 2000/04/08 06:58:43 1.18
@@ -452,7 +452,7 @@
return APR_CHILD_NOTDONE;
}
- return os2errno(rc);
+ return APR_OS2_STATUS(rc);
}
1.6 +1 -1 apache-2.0/src/lib/apr/threadproc/os2/signals.c
Index: signals.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/signals.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- signals.c 2000/04/03 19:45:22 1.5
+++ signals.c 2000/04/08 06:58:43 1.6
@@ -71,7 +71,7 @@
ap_status_t rc;
if ( signal == SIGTERM ) {
- rc = os2errno(DosSendSignalException(proc->pid, XCPT_SIGNAL_BREAK));
+ rc = APR_OS2_STATUS(DosSendSignalException(proc->pid, XCPT_SIGNAL_BREAK));
} else {
rc = kill(proc->pid, signal) < 0 ? errno : APR_SUCCESS;
}
1.10 +1 -1 apache-2.0/src/lib/apr/threadproc/os2/thread.c
Index: thread.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/thread.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- thread.c 2000/04/03 19:45:22 1.9
+++ thread.c 2000/04/08 06:58:43 1.10
@@ -164,7 +164,7 @@
rc = DosWaitThread(&waittid, DCWW_WAIT);
*retval = (ap_status_t)thd->rv;
- return os2errno(rc);
+ return APR_OS2_STATUS(rc);
}
1.7 +3 -3 apache-2.0/src/lib/apr/threadproc/os2/threadcancel.c
Index: threadcancel.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/threadcancel.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- threadcancel.c 2000/04/03 19:45:22 1.6
+++ threadcancel.c 2000/04/08 06:58:43 1.7
@@ -59,7 +59,7 @@
ap_status_t ap_cancel_thread(ap_thread_t *thd)
{
- return os2errno(DosKillThread(thd->tid));
+ return APR_OS2_STATUS(DosKillThread(thd->tid));
}
@@ -73,7 +73,7 @@
else
rc = DosExitMustComplete(&nesting);
- return os2errno(rc);
+ return APR_OS2_STATUS(rc);
}
@@ -81,5 +81,5 @@
ap_status_t ap_setcancelstate(ap_int32_t type, ap_context_t *cont)
{
/* There's no way to ignore thread kills altogether in OS/2 (that I know of) */
- return -1;
+ return APR_ENOTIMPL;
}
1.8 +2 -2 apache-2.0/src/lib/apr/threadproc/os2/threadpriv.c
Index: threadpriv.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/threadpriv.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- threadpriv.c 2000/04/03 19:45:22 1.7
+++ threadpriv.c 2000/04/08 06:58:43 1.8
@@ -69,7 +69,7 @@
}
(*key)->cntxt = cont;
- return os2errno(DosAllocThreadLocalMemory(1, &((*key)->key)));
+ return APR_OS2_STATUS(DosAllocThreadLocalMemory(1, &((*key)->key)));
}
ap_status_t ap_get_thread_private(void **new, ap_threadkey_t *key)
@@ -86,6 +86,6 @@
ap_status_t ap_delete_thread_private(ap_threadkey_t *key)
{
- return os2errno(DosFreeThreadLocalMemory(key->key));
+ return APR_OS2_STATUS(DosFreeThreadLocalMemory(key->key));
}
Re: cvs commit: apache-2.0/src/lib/apr/threadproc/os2 proc.c signals.c
thread.c threadcancel.c threadpriv.c
Posted by rb...@covalent.net.
On Mon, 10 Apr 2000, Jeff Trawick wrote:
> I'm curious about whether or not there is a better place to define
> APR_OS2_STATUS().
>
> I think that the decree is that APR doesn't expose such a macro but
> that the APR developer is free to use one internally. Given this
> assumption, I would have looked for some OS-specific header file like
> misc/misc.h in which to put this.
>
> Comments?
This is the exact macro you've been asking for. Rename it to
APR_SYS_STATUS and leave it where it is. :-)
Ryan
_______________________________________________________________________________
Ryan Bloom rbb@apache.org
406 29th St.
San Francisco, CA 94131
-------------------------------------------------------------------------------
Re: cvs commit: apache-2.0/src/lib/apr/threadproc/os2 proc.c signals.c
thread.c threadcancel.c threadpriv.c
Posted by rb...@covalent.net.
On Mon, 10 Apr 2000, Jeff Trawick wrote:
> I'm curious about whether or not there is a better place to define
> APR_OS2_STATUS().
>
> I think that the decree is that APR doesn't expose such a macro but
> that the APR developer is free to use one internally. Given this
> assumption, I would have looked for some OS-specific header file like
> misc/misc.h in which to put this.
>
> Comments?
This is the exact macro you've been asking for. Rename it to
APR_SYS_STATUS and leave it where it is. :-)
Ryan
_______________________________________________________________________________
Ryan Bloom rbb@apache.org
406 29th St.
San Francisco, CA 94131
-------------------------------------------------------------------------------
Re: cvs commit: apache-2.0/src/lib/apr/threadproc/os2 proc.c signals.c thread.c threadcancel.c threadpriv.c
Posted by Jeff Trawick <tr...@bellsouth.net>.
I'm curious about whether or not there is a better place to define
APR_OS2_STATUS().
I think that the decree is that APR doesn't expose such a macro but
that the APR developer is free to use one internally. Given this
assumption, I would have looked for some OS-specific header file like
misc/misc.h in which to put this.
Comments?
--
Jeff Trawick | trawick@ibm.net | PGP public key at web site:
http://www.geocities.com/SiliconValley/Park/9289/
Born in Roswell... married an alien...
Re: cvs commit: apache-2.0/src/lib/apr/threadproc/os2 proc.c signals.c thread.c threadcancel.c threadpriv.c
Posted by Jeff Trawick <tr...@bellsouth.net>.
I'm curious about whether or not there is a better place to define
APR_OS2_STATUS().
I think that the decree is that APR doesn't expose such a macro but
that the APR developer is free to use one internally. Given this
assumption, I would have looked for some OS-specific header file like
misc/misc.h in which to put this.
Comments?
--
Jeff Trawick | trawick@ibm.net | PGP public key at web site:
http://www.geocities.com/SiliconValley/Park/9289/
Born in Roswell... married an alien...