You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by rb...@apache.org on 2002/10/22 15:52:16 UTC
cvs commit: apr/test testud.c
rbb 2002/10/22 06:52:16
Modified: include apr_errno.h
memory/unix apr_pools.c
test testud.c
Log:
Revert the apr_pool_userdata_get change from last night.
Revision Changes Path
1.100 +0 -2 apr/include/apr_errno.h
Index: apr_errno.h
===================================================================
RCS file: /home/cvs/apr/include/apr_errno.h,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- apr_errno.h 22 Oct 2002 02:23:20 -0000 1.99
+++ apr_errno.h 22 Oct 2002 13:52:15 -0000 1.100
@@ -421,8 +421,6 @@
#define APR_EMISMATCH (APR_OS_START_STATUS + 24)
/** @see APR_STATUS_IS_EBUSY */
#define APR_EBUSY (APR_OS_START_STATUS + 25)
-/**@see APR_STATUS_IS_KEYNOTFOUND */
-#define APR_KEYNOTFOUND (APR_OS_START_STATUS + 26)
/**
* @defgroup aprerr_status Status Value Tests
1.188 +0 -4 apr/memory/unix/apr_pools.c
Index: apr_pools.c
===================================================================
RCS file: /home/cvs/apr/memory/unix/apr_pools.c,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- apr_pools.c 22 Oct 2002 02:23:20 -0000 1.187
+++ apr_pools.c 22 Oct 2002 13:52:16 -0000 1.188
@@ -1867,10 +1867,6 @@
*data = apr_hash_get(pool->user_data, key, APR_HASH_KEY_STRING);
}
- if (*data == NULL) {
- return APR_KEYNOTFOUND;
- }
-
return APR_SUCCESS;
}
1.6 +2 -4 apr/test/testud.c
Index: testud.c
===================================================================
RCS file: /home/cvs/apr/test/testud.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- testud.c 22 Oct 2002 02:24:59 -0000 1.5
+++ testud.c 22 Oct 2002 13:52:16 -0000 1.6
@@ -95,9 +95,8 @@
char *retdata;
rv = apr_pool_userdata_get((void **)&retdata, "DOESNTEXIST", pool);
- CuAssertTrue(tc, rv != APR_SUCCESS);
+ CuAssertIntEquals(tc, rv, APR_SUCCESS);
CuAssertPtrEquals(tc, retdata, NULL);
- CuAssertIntEquals(tc, rv, APR_KEYNOTFOUND);
}
static void post_pool_clear(CuTest *tc)
@@ -106,9 +105,8 @@
char *retdata;
rv = apr_pool_userdata_get((void **)&retdata, "DOESNTEXIST", pool);
- CuAssertTrue(tc, rv != APR_SUCCESS);
+ CuAssertIntEquals(tc, rv, APR_SUCCESS);
CuAssertPtrEquals(tc, retdata, NULL);
- CuAssertIntEquals(tc, rv, APR_KEYNOTFOUND);
}
CuSuite *testud(void)