summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68>2000-10-06 17:52:44 +0000
committerwrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68>2000-10-06 17:52:44 +0000
commit868927a150edf3f91fb60f27ce6927271671dffc (patch)
treee01f3b24eb732d94e1808cfb3b2eb2358a59c677
parent6378a281a5e8c002a97bde6208e879e8c921c747 (diff)
downloadlibapr-868927a150edf3f91fb60f27ce6927271671dffc.tar.gz
Completed review for new tests:
APR_STATUS_IS_EACCES(s) APR_STATUS_IS_EEXIST(s) APR_STATUS_IS_ENAMETOOLONG(s) APR_STATUS_IS_ENOENT(s) Where the old EACCES et. al. still exist, we have a problem (not yet using APR at all) More to come... git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@60554 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--shmem/unix/mm/mm_core.c4
-rw-r--r--threadproc/win32/thread.c5
2 files changed, 6 insertions, 3 deletions
diff --git a/shmem/unix/mm/mm_core.c b/shmem/unix/mm/mm_core.c
index 4b9a62bd9..a0535bf06 100644
--- a/shmem/unix/mm/mm_core.c
+++ b/shmem/unix/mm/mm_core.c
@@ -315,14 +315,14 @@ void *mm_core_create(size_t usersize, const char *file)
#if defined(MM_SEMT_IPCSEM)
fdsem = semget(IPC_PRIVATE, 1, IPC_CREAT|IPC_EXCL|S_IRUSR|S_IWUSR);
- if (fdsem == -1 && errno == EEXIST)
+ if (fdsem == -1 && APR_STATUS_IS_EEXIST(errno))
fdsem = semget(IPC_PRIVATE, 1, IPC_EXCL|S_IRUSR|S_IWUSR);
if (fdsem == -1)
FAIL(MM_ERR_CORE|MM_ERR_SYSTEM, "failed to acquire semaphore");
mm_core_semctlarg.val = 0;
semctl(fdsem, 0, SETVAL, mm_core_semctlarg);
fdsem_rd = semget(IPC_PRIVATE, 1, IPC_CREAT|IPC_EXCL|S_IRUSR|S_IWUSR);
- if (fdsem_rd == -1 && errno == EEXIST)
+ if (fdsem_rd == -1 && APR_STATUS_IS_EEXIST(errno))
fdsem_rd = semget(IPC_PRIVATE, 1, IPC_EXCL|S_IRUSR|S_IWUSR);
if (fdsem_rd == -1)
FAIL(MM_ERR_CORE|MM_ERR_SYSTEM, "failed to acquire semaphore");
diff --git a/threadproc/win32/thread.c b/threadproc/win32/thread.c
index 37e7146a1..eb94fec8b 100644
--- a/threadproc/win32/thread.c
+++ b/threadproc/win32/thread.c
@@ -114,7 +114,10 @@ apr_status_t apr_create_thread(apr_thread_t **new, apr_threadattr_t *attr,
if (((*new)->td = (HANDLE *)_beginthreadex(NULL, 0, (unsigned int (APR_THREAD_FUNC *)(void *))func,
data, 0, &temp)) == 0) {
lasterror = apr_get_os_error();
- return APR_EEXIST; /* MSVC++ doc doesn't mention any additional error info */
+ return APR_EEXIST;
+ /* MSVC++ doc doesn't mention any additional error info
+ * XXX: need to check the sources
+ */
}
if (attr && attr->detach) {