You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2001/06/08 06:49:58 UTC
cvs commit: apr/test client.c sendfile.c server.c testargs.c testcontext.c testdso.c testfile.c testflock.c testipsub.c testmd5.c testmmap.c testpipe.c testpoll.c testproc.c testsock.c testsockopt.c teststr.c
wrowe 01/06/07 21:49:57
Modified: test client.c sendfile.c server.c testargs.c
testcontext.c testdso.c testfile.c testflock.c
testipsub.c testmd5.c testmmap.c testpipe.c
testpoll.c testproc.c testsock.c testsockopt.c
teststr.c
Log:
These are (thankfully) now irrelevant stubs. apr_terminate is defined
as _always_ compatible with atexit. A nice mindless exercise for my
very sleep-deprived brain.
Revision Changes Path
1.29 +1 -6 apr/test/client.c
Index: client.c
===================================================================
RCS file: /home/cvs/apr/test/client.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- client.c 2001/05/02 02:32:49 1.28
+++ client.c 2001/06/08 04:49:43 1.29
@@ -60,11 +60,6 @@
#define STRLEN 15
-static void closeapr(void)
-{
- apr_terminate();
-}
-
int main(int argc, char *argv[])
{
apr_pool_t *context;
@@ -95,7 +90,7 @@
exit(-1);
}
fprintf(stdout, "OK\n");
- atexit(closeapr);
+ atexit(apr_terminate);
fprintf(stdout, "Creating context.......");
if (apr_pool_create(&context, NULL) != APR_SUCCESS) {
1.14 +1 -6 apr/test/sendfile.c
Index: sendfile.c
===================================================================
RCS file: /home/cvs/apr/test/sendfile.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sendfile.c 2001/05/03 22:37:58 1.13
+++ sendfile.c 2001/06/08 04:49:44 1.14
@@ -90,11 +90,6 @@
typedef enum {BLK, NONBLK, TIMEOUT} client_socket_mode_t;
-static void closeapr(void)
-{
- apr_terminate();
-}
-
static void apr_setup(apr_pool_t **p, apr_socket_t **sock, int *family)
{
char buf[120];
@@ -108,7 +103,7 @@
exit(1);
}
- atexit(closeapr);
+ atexit(apr_terminate);
rv = apr_pool_create(p, NULL);
if (rv != APR_SUCCESS) {
1.28 +1 -6 apr/test/server.c
Index: server.c
===================================================================
RCS file: /home/cvs/apr/test/server.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- server.c 2001/02/16 04:16:09 1.27
+++ server.c 2001/06/08 04:49:44 1.28
@@ -60,11 +60,6 @@
#define STRLEN 15
-static void closeapr(void)
-{
- apr_terminate();
-}
-
int main(int argc, const char * const argv[])
{
apr_pool_t *context;
@@ -92,7 +87,7 @@
exit(-1);
}
fprintf(stdout, "OK\n");
- atexit(closeapr);
+ atexit(apr_terminate);
fprintf(stdout, "Creating context.......");
if (apr_pool_create(&context, NULL) != APR_SUCCESS) {
1.22 +1 -6 apr/test/testargs.c
Index: testargs.c
===================================================================
RCS file: /home/cvs/apr/test/testargs.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- testargs.c 2001/02/16 04:16:09 1.21
+++ testargs.c 2001/06/08 04:49:45 1.22
@@ -73,11 +73,6 @@
}
}
-static void closeapr(void)
-{
- apr_terminate();
-}
-
int main(int argc, const char * const argv[])
{
apr_pool_t *context;
@@ -86,7 +81,7 @@
const char *optarg;
apr_initialize();
- atexit(closeapr);
+ atexit(apr_terminate);
apr_pool_create(&context, NULL);
if (apr_getopt_init(&opt, context, argc, argv))
1.16 +1 -6 apr/test/testcontext.c
Index: testcontext.c
===================================================================
RCS file: /home/cvs/apr/test/testcontext.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- testcontext.c 2001/02/16 04:16:09 1.15
+++ testcontext.c 2001/06/08 04:49:46 1.16
@@ -68,11 +68,6 @@
return APR_SUCCESS;
}
-static void closeapr(void)
-{
- apr_terminate();
-}
-
int main(void)
{
apr_pool_t *context;
@@ -83,7 +78,7 @@
fprintf(stderr, "Couldn't initialize.");
exit(-1);
}
- atexit(closeapr);
+ atexit(apr_terminate);
if (apr_pool_create(&context, NULL) != APR_SUCCESS) {
fprintf(stderr, "Couldn't allocate context.");
1.15 +1 -6 apr/test/testdso.c
Index: testdso.c
===================================================================
RCS file: /home/cvs/apr/test/testdso.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- testdso.c 2001/02/08 07:45:05 1.14
+++ testdso.c 2001/06/08 04:49:46 1.15
@@ -11,11 +11,6 @@
#define LIB_NAME "mod_test.so"
-static void closeapr(void)
-{
- apr_terminate();
-}
-
int main (int argc, char ** argv)
{
apr_dso_handle_t *h = NULL;
@@ -33,7 +28,7 @@
strcat(filename, LIB_NAME);
apr_initialize();
- atexit(closeapr);
+ atexit(apr_terminate);
if (apr_pool_create(&cont, NULL) != APR_SUCCESS) {
fprintf(stderr, "Couldn't allocate context.");
1.36 +1 -6 apr/test/testfile.c
Index: testfile.c
===================================================================
RCS file: /home/cvs/apr/test/testfile.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- testfile.c 2001/05/14 22:52:46 1.35
+++ testfile.c 2001/06/08 04:49:46 1.36
@@ -89,11 +89,6 @@
void testdirs(apr_pool_t *);
static void test_read(apr_pool_t *);
-static void closeapr(void)
-{
- apr_terminate();
-}
-
int main(void)
{
apr_pool_t *pool;
@@ -118,7 +113,7 @@
printf("APR File Functions Test\n=======================\n\n");
STD_TEST_NEQ("Initializing APR", apr_initialize())
- atexit(closeapr);
+ atexit(apr_terminate);
STD_TEST_NEQ("Creating the main pool we'll use",
apr_pool_create(&pool, NULL))
STD_TEST_NEQ("Creating the second pool we'll use",
1.7 +1 -6 apr/test/testflock.c
Index: testflock.c
===================================================================
RCS file: /home/cvs/apr/test/testflock.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- testflock.c 2001/03/31 22:38:28 1.6
+++ testflock.c 2001/06/08 04:49:47 1.7
@@ -154,11 +154,6 @@
printf(" done.\nExiting.\n");
}
-static void closeapr(void)
-{
- apr_terminate();
-}
-
int main(int argc, const char * const *argv)
{
int reader = 0;
@@ -169,7 +164,7 @@
if (apr_initialize() != APR_SUCCESS)
errmsg("Could not initialize APR.\n");
- atexit(closeapr);
+ atexit(apr_terminate);
if (apr_pool_create(&pool, NULL) != APR_SUCCESS)
errmsg("Could not create global pool.\n");
1.3 +1 -6 apr/test/testipsub.c
Index: testipsub.c
===================================================================
RCS file: /home/cvs/apr/test/testipsub.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- testipsub.c 2001/03/15 19:43:52 1.2
+++ testipsub.c 2001/06/08 04:49:47 1.3
@@ -59,11 +59,6 @@
#include "apr_network_io.h"
#include "apr_errno.h"
-static void closeapr(void)
-{
- apr_terminate();
-}
-
static void test_bad_input(apr_pool_t *p)
{
struct {
@@ -202,7 +197,7 @@
exit(1);
}
- atexit(closeapr);
+ atexit(apr_terminate);
rv = apr_pool_create(&p, NULL);
if (rv != APR_SUCCESS) {
1.12 +1 -6 apr/test/testmd5.c
Index: testmd5.c
===================================================================
RCS file: /home/cvs/apr/test/testmd5.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- testmd5.c 2001/05/14 15:12:35 1.11
+++ testmd5.c 2001/06/08 04:49:47 1.12
@@ -86,11 +86,6 @@
"\xd1\xa1\xc0\x97\x8a\x60\xbb\xfb\x2a\x25\x46\x9d\xa5\xae\xd0\xb0"}
};
-static void closeapr(void)
-{
- apr_terminate();
-}
-
static void try(const void *buf, size_t bufLen, apr_xlate_t *xlate,
const void *digest)
{
@@ -159,7 +154,7 @@
rv = apr_initialize();
assert(!rv);
- atexit(closeapr);
+ atexit(apr_terminate);
printf("APR MD5 Test\n============\n\n");
STD_TEST_NEQ("Creating pool", apr_pool_create(&pool, NULL))
1.27 +1 -6 apr/test/testmmap.c
Index: testmmap.c
===================================================================
RCS file: /home/cvs/apr/test/testmmap.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- testmmap.c 2001/02/16 04:16:10 1.26
+++ testmmap.c 2001/06/08 04:49:48 1.27
@@ -69,11 +69,6 @@
*/
#define PATH_LEN 255
-static void closeapr(void)
-{
- apr_terminate();
-}
-
int main(void)
{
#if APR_HAS_MMAP
@@ -94,7 +89,7 @@
exit(-1);
}
fprintf(stdout,"OK\n");
- atexit(closeapr);
+ atexit(apr_terminate);
fprintf(stdout,"Creating context....................");
if (apr_pool_create(&context, NULL) != APR_SUCCESS) {
1.16 +1 -6 apr/test/testpipe.c
Index: testpipe.c
===================================================================
RCS file: /home/cvs/apr/test/testpipe.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- testpipe.c 2001/02/16 04:16:10 1.15
+++ testpipe.c 2001/06/08 04:49:48 1.16
@@ -62,11 +62,6 @@
#include <unistd.h>
#endif
-static void closeapr(void)
-{
- apr_terminate();
-}
-
int main(void)
{
apr_pool_t *context;
@@ -81,7 +76,7 @@
fprintf(stderr, "Couldn't initialize.");
exit(-1);
}
- atexit(closeapr);
+ atexit(apr_terminate);
if (apr_pool_create(&context, NULL) != APR_SUCCESS) {
fprintf(stderr, "Couldn't allocate context.");
exit(-1);
1.3 +1 -6 apr/test/testpoll.c
Index: testpoll.c
===================================================================
RCS file: /home/cvs/apr/test/testpoll.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- testpoll.c 2001/03/31 22:35:04 1.2
+++ testpoll.c 2001/06/08 04:49:48 1.3
@@ -64,11 +64,6 @@
#include <stdlib.h>
#include <string.h>
-static void closeapr(void)
-{
- apr_terminate();
-}
-
static int make_socket(apr_socket_t **sock, apr_sockaddr_t **sa, apr_port_t port,
apr_pool_t *p)
{
@@ -160,7 +155,7 @@
exit(-1);
}
printf("OK\n");
- atexit(closeapr);
+ atexit(apr_terminate);
printf("Creating context...............................");
if (apr_pool_create(&context, NULL) != APR_SUCCESS) {
1.29 +1 -6 apr/test/testproc.c
Index: testproc.c
===================================================================
RCS file: /home/cvs/apr/test/testproc.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- testproc.c 2001/05/13 15:34:17 1.28
+++ testproc.c 2001/06/08 04:49:49 1.29
@@ -70,11 +70,6 @@
int test_filedel(void);
int testdirs(void);
-static void closeapr(void)
-{
- apr_terminate();
-}
-
int main(int argc, char *argv[])
{
apr_pool_t *pool;
@@ -90,7 +85,7 @@
printf("Failed to initialize APR\n");
exit(-1);
}
- atexit(closeapr);
+ atexit(apr_terminate);
apr_pool_create(&pool, NULL);
if (argc > 1) {
1.22 +1 -6 apr/test/testsock.c
Index: testsock.c
===================================================================
RCS file: /home/cvs/apr/test/testsock.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- testsock.c 2001/04/01 08:43:11 1.21
+++ testsock.c 2001/06/08 04:49:49 1.22
@@ -181,11 +181,6 @@
return 1;
}
-static void closeapr(void)
-{
- apr_terminate();
-}
-
int main(int argc, char *argv[])
{
apr_pool_t *context = NULL;
@@ -196,7 +191,7 @@
exit(-1);
}
fprintf(stdout, "OK\n");
- atexit(closeapr);
+ atexit(apr_terminate);
fprintf(stdout, "Creating context.......");
if (apr_pool_create(&context, NULL) != APR_SUCCESS) {
1.6 +1 -6 apr/test/testsockopt.c
Index: testsockopt.c
===================================================================
RCS file: /home/cvs/apr/test/testsockopt.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- testsockopt.c 2001/04/19 21:21:37 1.5
+++ testsockopt.c 2001/06/08 04:49:50 1.6
@@ -78,11 +78,6 @@
exit(-1);
}
-static void closeapr(void)
-{
- apr_terminate();
-}
-
int main(void)
{
apr_pool_t *context;
@@ -95,7 +90,7 @@
fprintf(stderr, "Couldn't initialize.");
exit(-1);
}
- atexit(closeapr);
+ atexit(apr_terminate);
if (apr_pool_create(&context, NULL) != APR_SUCCESS) {
fprintf(stderr, "Couldn't allocate context.");
exit(-1);
1.2 +1 -6 apr/test/teststr.c
Index: teststr.c
===================================================================
RCS file: /home/cvs/apr/test/teststr.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- teststr.c 2001/05/23 14:15:53 1.1
+++ teststr.c 2001/06/08 04:49:50 1.2
@@ -59,11 +59,6 @@
#include "apr_general.h"
#include "apr_strings.h"
-static void closeapr(void)
-{
- apr_terminate();
-}
-
static void test_strtok(apr_pool_t *p)
{
struct {
@@ -129,7 +124,7 @@
apr_pool_t *p;
apr_initialize();
- atexit(closeapr);
+ atexit(apr_terminate);
apr_pool_create(&p, NULL);
test_strtok(p);