You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by iv...@apache.org on 2022/11/20 07:14:40 UTC
svn commit: r1905414 [6/8] - in /apr/apr/trunk: atomic/netware/ atomic/os390/ buckets/ build/ crypto/ dbd/ dbd/unsupported/ dbm/ dbm/sdbm/ dso/aix/ dso/beos/ dso/netware/ dso/os2/ dso/os390/ dso/unix/ dso/win32/ encoding/ file_io/netware/ file_io/os2/ ...
Modified: apr/apr/trunk/test/testfile.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testfile.c?rev=1905414&r1=1905413&r2=1905414&view=diff
==============================================================================
--- apr/apr/trunk/test/testfile.c (original)
+++ apr/apr/trunk/test/testfile.c Sun Nov 20 07:14:38 2022
@@ -44,7 +44,7 @@ static void test_open_noreadwrite(abts_c
APR_FPROT_UREAD | APR_FPROT_UWRITE | APR_FPROT_GREAD, p);
ABTS_TRUE(tc, rv != APR_SUCCESS);
ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_EACCES(rv));
- ABTS_PTR_EQUAL(tc, NULL, thefile);
+ ABTS_PTR_EQUAL(tc, NULL, thefile);
}
static void test_open_excl(abts_case *tc, void *data)
@@ -57,7 +57,7 @@ static void test_open_excl(abts_case *tc
APR_FPROT_UREAD | APR_FPROT_UWRITE | APR_FPROT_GREAD, p);
ABTS_TRUE(tc, rv != APR_SUCCESS);
ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_EEXIST(rv));
- ABTS_PTR_EQUAL(tc, NULL, thefile);
+ ABTS_PTR_EQUAL(tc, NULL, thefile);
}
static void test_open_read(abts_case *tc, void *data)
@@ -65,7 +65,7 @@ static void test_open_read(abts_case *tc
apr_status_t rv;
apr_file_t *filetest = NULL;
- rv = apr_file_open(&filetest, FILENAME,
+ rv = apr_file_open(&filetest, FILENAME,
APR_FOPEN_READ,
APR_FPROT_UREAD | APR_FPROT_UWRITE | APR_FPROT_GREAD, p);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
@@ -76,7 +76,7 @@ static void test_open_read(abts_case *tc
static void link_existing(abts_case *tc, void *data)
{
apr_status_t rv;
-
+
rv = apr_file_link("data/file_datafile.txt", "data/file_datafile2.txt");
apr_file_remove("data/file_datafile2.txt", p);
ABTS_ASSERT(tc, "Couldn't create hardlink to file", rv == APR_SUCCESS);
@@ -85,7 +85,7 @@ static void link_existing(abts_case *tc,
static void link_nonexisting(abts_case *tc, void *data)
{
apr_status_t rv;
-
+
rv = apr_file_link("data/does_not_exist.txt", "data/fake.txt");
ABTS_ASSERT(tc, "", rv != APR_SUCCESS);
}
@@ -96,8 +96,8 @@ static void test_read(abts_case *tc, voi
apr_size_t nbytes = 256;
char *str = apr_pcalloc(p, nbytes + 1);
apr_file_t *filetest = NULL;
-
- rv = apr_file_open(&filetest, FILENAME,
+
+ rv = apr_file_open(&filetest, FILENAME,
APR_FOPEN_READ,
APR_FPROT_UREAD | APR_FPROT_UWRITE | APR_FPROT_GREAD, p);
@@ -116,7 +116,7 @@ static void test_readzero(abts_case *tc,
apr_size_t nbytes = 0;
char *str = NULL;
apr_file_t *filetest;
-
+
rv = apr_file_open(&filetest, FILENAME, APR_FOPEN_READ, APR_FPROT_OS_DEFAULT, p);
APR_ASSERT_SUCCESS(tc, "Opening test file " FILENAME, rv);
@@ -132,8 +132,8 @@ static void test_filename(abts_case *tc,
const char *str;
apr_status_t rv;
apr_file_t *filetest = NULL;
-
- rv = apr_file_open(&filetest, FILENAME,
+
+ rv = apr_file_open(&filetest, FILENAME,
APR_FOPEN_READ,
APR_FPROT_UREAD | APR_FPROT_UWRITE | APR_FPROT_GREAD, p);
APR_ASSERT_SUCCESS(tc, "Opening test file " FILENAME, rv);
@@ -144,15 +144,15 @@ static void test_filename(abts_case *tc,
apr_file_close(filetest);
}
-
+
static void test_fileclose(abts_case *tc, void *data)
{
char str;
apr_status_t rv;
apr_size_t one = 1;
apr_file_t *filetest = NULL;
-
- rv = apr_file_open(&filetest, FILENAME,
+
+ rv = apr_file_open(&filetest, FILENAME,
APR_FOPEN_READ,
APR_FPROT_UREAD | APR_FPROT_UWRITE | APR_FPROT_GREAD, p);
APR_ASSERT_SUCCESS(tc, "Opening test file " FILENAME, rv);
@@ -183,7 +183,7 @@ static void test_open_write(abts_case *t
apr_file_t *filetest = NULL;
filetest = NULL;
- rv = apr_file_open(&filetest, FILENAME,
+ rv = apr_file_open(&filetest, FILENAME,
APR_FOPEN_WRITE,
APR_FPROT_UREAD | APR_FPROT_UWRITE | APR_FPROT_GREAD, p);
ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_ENOENT(rv));
@@ -196,7 +196,7 @@ static void test_open_writecreate(abts_c
apr_file_t *filetest = NULL;
filetest = NULL;
- rv = apr_file_open(&filetest, FILENAME,
+ rv = apr_file_open(&filetest, FILENAME,
APR_FOPEN_WRITE | APR_FOPEN_CREATE,
APR_FPROT_UREAD | APR_FPROT_UWRITE | APR_FPROT_GREAD, p);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
@@ -210,7 +210,7 @@ static void test_write(abts_case *tc, vo
apr_size_t bytes = strlen(TESTSTR);
apr_file_t *filetest = NULL;
- rv = apr_file_open(&filetest, FILENAME,
+ rv = apr_file_open(&filetest, FILENAME,
APR_FOPEN_WRITE | APR_FOPEN_CREATE,
APR_FPROT_UREAD | APR_FPROT_UWRITE | APR_FPROT_GREAD, p);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
@@ -227,7 +227,7 @@ static void test_open_readwrite(abts_cas
apr_file_t *filetest = NULL;
filetest = NULL;
- rv = apr_file_open(&filetest, FILENAME,
+ rv = apr_file_open(&filetest, FILENAME,
APR_FOPEN_READ | APR_FOPEN_WRITE,
APR_FPROT_UREAD | APR_FPROT_UWRITE | APR_FPROT_GREAD, p);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
@@ -244,7 +244,7 @@ static void test_seek(abts_case *tc, voi
char *str = apr_pcalloc(p, nbytes + 1);
apr_file_t *filetest = NULL;
- rv = apr_file_open(&filetest, FILENAME,
+ rv = apr_file_open(&filetest, FILENAME,
APR_FOPEN_READ,
APR_FPROT_UREAD | APR_FPROT_UWRITE | APR_FPROT_GREAD, p);
APR_ASSERT_SUCCESS(tc, "Open test file " FILENAME, rv);
@@ -258,7 +258,7 @@ static void test_seek(abts_case *tc, voi
rv = apr_file_seek(filetest, SEEK_SET, &offset);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
-
+
rv = apr_file_read(filetest, str, &nbytes);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
ABTS_SIZE_EQUAL(tc, strlen(TESTSTR) - 5, nbytes);
@@ -286,14 +286,14 @@ static void test_seek(abts_case *tc, voi
ABTS_STR_EQUAL(tc, &TESTSTR[strlen(TESTSTR) - 5], str);
apr_file_close(filetest);
-}
+}
static void test_userdata_set(abts_case *tc, void *data)
{
apr_status_t rv;
apr_file_t *filetest = NULL;
- rv = apr_file_open(&filetest, FILENAME,
+ rv = apr_file_open(&filetest, FILENAME,
APR_FOPEN_WRITE,
APR_FPROT_UREAD | APR_FPROT_UWRITE | APR_FPROT_GREAD, p);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
@@ -311,7 +311,7 @@ static void test_userdata_get(abts_case
char *teststr;
apr_file_t *filetest = NULL;
- rv = apr_file_open(&filetest, FILENAME,
+ rv = apr_file_open(&filetest, FILENAME,
APR_FOPEN_WRITE,
APR_FPROT_UREAD | APR_FPROT_UWRITE | APR_FPROT_GREAD, p);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
@@ -334,7 +334,7 @@ static void test_userdata_getnokey(abts_
void *teststr;
apr_file_t *filetest = NULL;
- rv = apr_file_open(&filetest, FILENAME,
+ rv = apr_file_open(&filetest, FILENAME,
APR_FOPEN_WRITE,
APR_FPROT_UREAD | APR_FPROT_UWRITE | APR_FPROT_GREAD, p);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
@@ -352,27 +352,27 @@ static void test_buffer_set_get(abts_cas
apr_file_t *filetest = NULL;
char * buffer;
- rv = apr_file_open(&filetest, FILENAME,
+ rv = apr_file_open(&filetest, FILENAME,
APR_FOPEN_WRITE | APR_FOPEN_BUFFERED,
APR_FPROT_UREAD | APR_FPROT_UWRITE | APR_FPROT_GREAD, p);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
bufsize = apr_file_buffer_size_get(filetest);
ABTS_SIZE_EQUAL(tc, APR_BUFFERSIZE, bufsize);
-
+
buffer = apr_pcalloc(p, 10240);
rv = apr_file_buffer_set(filetest, buffer, 10240);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
-
+
bufsize = apr_file_buffer_size_get(filetest);
ABTS_SIZE_EQUAL(tc, 10240, bufsize);
-
+
rv = apr_file_buffer_set(filetest, buffer, 12);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
-
+
bufsize = apr_file_buffer_size_get(filetest);
ABTS_SIZE_EQUAL(tc, 12, bufsize);
-
+
apr_file_close(filetest);
}
static void test_getc(abts_case *tc, void *data)
@@ -679,7 +679,7 @@ static void test_bigread(abts_case *tc,
/* Create a test file with known content.
*/
- rv = apr_file_open(&f, "data/created_file",
+ rv = apr_file_open(&f, "data/created_file",
APR_FOPEN_CREATE | APR_FOPEN_WRITE | APR_FOPEN_TRUNCATE,
APR_FPROT_UREAD | APR_FPROT_UWRITE, p);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
@@ -724,7 +724,7 @@ static void test_mod_neg(abts_case *tc,
apr_off_t cur;
const char *fname = "data/modneg.dat";
- rv = apr_file_open(&f, fname,
+ rv = apr_file_open(&f, fname,
APR_FOPEN_CREATE | APR_FOPEN_WRITE,
APR_FPROT_UREAD | APR_FPROT_UWRITE, p);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
@@ -734,7 +734,7 @@ static void test_mod_neg(abts_case *tc,
rv = apr_file_write(f, s, &nbytes);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
ABTS_SIZE_EQUAL(tc, strlen(s), nbytes);
-
+
for (i = 0; i < 7980; i++) {
s = "0";
nbytes = strlen(s);
@@ -742,7 +742,7 @@ static void test_mod_neg(abts_case *tc,
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
ABTS_SIZE_EQUAL(tc, strlen(s), nbytes);
}
-
+
s = "end456789\n";
nbytes = strlen(s);
rv = apr_file_write(f, s, &nbytes);
@@ -756,7 +756,7 @@ static void test_mod_neg(abts_case *tc,
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
ABTS_SIZE_EQUAL(tc, strlen(s), nbytes);
}
-
+
rv = apr_file_close(f);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
@@ -808,7 +808,7 @@ static void file_contents_equal(abts_cas
0, p));
APR_ASSERT_SUCCESS(tc, "read from file",
apr_file_read_full(f, actual, expectlen, NULL));
-
+
ABTS_ASSERT(tc, "matched expected file contents",
memcmp(expect, actual, expectlen) == 0);
@@ -824,15 +824,15 @@ static void test_puts(abts_case *tc, voi
const char *fname = "data/testputs.dat";
APR_ASSERT_SUCCESS(tc, "open file for writing",
- apr_file_open(&f, fname,
+ apr_file_open(&f, fname,
APR_FOPEN_WRITE|APR_FOPEN_CREATE|APR_FOPEN_TRUNCATE,
APR_FPROT_OS_DEFAULT, p));
-
- APR_ASSERT_SUCCESS(tc, "write line to file",
+
+ APR_ASSERT_SUCCESS(tc, "write line to file",
apr_file_puts(LINE1, f));
- APR_ASSERT_SUCCESS(tc, "write second line to file",
+ APR_ASSERT_SUCCESS(tc, "write second line to file",
apr_file_puts(LINE2, f));
-
+
APR_ASSERT_SUCCESS(tc, "close for writing",
apr_file_close(f));
@@ -847,10 +847,10 @@ static void test_writev(abts_case *tc, v
const char *fname = "data/testwritev.dat";
APR_ASSERT_SUCCESS(tc, "open file for writing",
- apr_file_open(&f, fname,
+ apr_file_open(&f, fname,
APR_FOPEN_WRITE|APR_FOPEN_CREATE|APR_FOPEN_TRUNCATE,
APR_FPROT_OS_DEFAULT, p));
-
+
vec[0].iov_base = LINE1;
vec[0].iov_len = strlen(LINE1);
@@ -858,7 +858,7 @@ static void test_writev(abts_case *tc, v
apr_file_writev(f, vec, 1, &nbytes));
file_contents_equal(tc, fname, LINE1, strlen(LINE1));
-
+
vec[0].iov_base = LINE1;
vec[0].iov_len = strlen(LINE1);
vec[1].iov_base = LINE2;
@@ -876,7 +876,7 @@ static void test_writev(abts_case *tc, v
APR_ASSERT_SUCCESS(tc, "close for writing",
apr_file_close(f));
- file_contents_equal(tc, fname, LINE1 LINE1 LINE2 LINE1 LINE1 LINE2,
+ file_contents_equal(tc, fname, LINE1 LINE1 LINE2 LINE1 LINE1 LINE2,
strlen(LINE1)*4 + strlen(LINE2)*2);
}
@@ -889,10 +889,10 @@ static void test_writev_full(abts_case *
const char *fname = "data/testwritev_full.dat";
APR_ASSERT_SUCCESS(tc, "open file for writing",
- apr_file_open(&f, fname,
+ apr_file_open(&f, fname,
APR_FOPEN_WRITE|APR_FOPEN_CREATE|APR_FOPEN_TRUNCATE,
APR_FPROT_OS_DEFAULT, p));
-
+
vec[0].iov_base = LINE1;
vec[0].iov_len = strlen(LINE1);
vec[1].iov_base = LINE2;
@@ -912,7 +912,7 @@ static void test_writev_full(abts_case *
APR_ASSERT_SUCCESS(tc, "close for writing",
apr_file_close(f));
- file_contents_equal(tc, fname, LINE1 LINE2 LINE1 LINE1 LINE2,
+ file_contents_equal(tc, fname, LINE1 LINE2 LINE1 LINE1 LINE2,
strlen(LINE1)*3 + strlen(LINE2)*2);
}
@@ -1002,7 +1002,7 @@ static void test_truncate(abts_case *tc,
APR_FOPEN_CREATE | APR_FOPEN_WRITE,
APR_FPROT_UREAD | APR_FPROT_UWRITE, p);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
-
+
s = "some data";
nbytes = strlen(s);
rv = apr_file_write(f, s, &nbytes);
@@ -1232,7 +1232,7 @@ static void test_bigfprintf(abts_case *t
apr_file_open(&f, fname,
APR_FOPEN_CREATE|APR_FOPEN_WRITE,
APR_FPROT_UREAD|APR_FPROT_UWRITE, p));
-
+
to_write = malloc(HUGE_STRING_LEN + 3);
@@ -1335,7 +1335,7 @@ static void test_xthread(abts_case *tc,
apr_int32_t flags = APR_FOPEN_CREATE|APR_FOPEN_READ|APR_FOPEN_WRITE|APR_FOPEN_APPEND|APR_FOPEN_XTHREAD;
char buf[128] = { 0 };
- /* Test for bug 38438, opening file with append + xthread and seeking to
+ /* Test for bug 38438, opening file with append + xthread and seeking to
the end of the file resulted in writes going to the beginning not the
end. */
@@ -1349,7 +1349,7 @@ static void test_xthread(abts_case *tc,
apr_file_puts("hello", f));
apr_file_close(f);
-
+
APR_ASSERT_SUCCESS(tc, "open test file",
apr_file_open(&f, fname, flags,
APR_FPROT_UREAD|APR_FPROT_UWRITE, p));
@@ -1368,11 +1368,11 @@ static void test_xthread(abts_case *tc,
/* Back to the beginning. */
{
apr_off_t offset = 0;
-
+
rv = apr_file_seek(f, APR_SET, &offset);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
}
-
+
apr_file_read_full(f, buf, sizeof(buf), NULL);
ABTS_STR_EQUAL(tc, "helloworld", buf);
@@ -2258,8 +2258,8 @@ abts_suite *testfile(abts_suite *suite)
abts_run_test(suite, test_open_readwrite, NULL);
abts_run_test(suite, link_existing, NULL);
abts_run_test(suite, link_nonexisting, NULL);
- abts_run_test(suite, test_read, NULL);
- abts_run_test(suite, test_readzero, NULL);
+ abts_run_test(suite, test_read, NULL);
+ abts_run_test(suite, test_readzero, NULL);
abts_run_test(suite, test_seek, NULL);
abts_run_test(suite, test_filename, NULL);
abts_run_test(suite, test_fileclose, NULL);
Modified: apr/apr/trunk/test/testfilecopy.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testfilecopy.c?rev=1905414&r1=1905413&r2=1905414&view=diff
==============================================================================
--- apr/apr/trunk/test/testfilecopy.c (original)
+++ apr/apr/trunk/test/testfilecopy.c Sun Nov 20 07:14:38 2022
@@ -28,9 +28,9 @@ static void copy_helper(abts_case *tc, c
apr_finfo_t copy;
apr_finfo_t orig;
apr_finfo_t dest;
-
+
dest_rv = apr_stat(&dest, to, APR_FINFO_SIZE, p);
-
+
if (!append) {
rv = apr_file_copy(from, to, perms, p);
}
@@ -49,8 +49,8 @@ static void copy_helper(abts_case *tc, c
ABTS_ASSERT(tc, "File size differs", orig.size == copy.size);
}
else {
- ABTS_ASSERT(tc, "File size differs",
- ((dest_rv == APR_SUCCESS)
+ ABTS_ASSERT(tc, "File size differs",
+ ((dest_rv == APR_SUCCESS)
? dest.size : 0) + orig.size == copy.size);
}
}
@@ -61,8 +61,8 @@ static void copy_short_file(abts_case *t
/* make absolutely sure that the dest file doesn't exist. */
apr_file_remove("data/file_copy.txt", p);
-
- copy_helper(tc, "data/file_datafile.txt", "data/file_copy.txt",
+
+ copy_helper(tc, "data/file_datafile.txt", "data/file_copy.txt",
APR_FPROT_FILE_SOURCE_PERMS, 0, p);
rv = apr_file_remove("data/file_copy.txt", p);
APR_ASSERT_SUCCESS(tc, "Couldn't remove copy file", rv);
@@ -71,20 +71,20 @@ static void copy_short_file(abts_case *t
static void copy_over_existing(abts_case *tc, void *data)
{
apr_status_t rv;
-
+
/* make absolutely sure that the dest file doesn't exist. */
apr_file_remove("data/file_copy.txt", p);
-
+
/* This is a cheat. I don't want to create a new file, so I just copy
* one file, then I copy another. If the second copy succeeds, then
* this works.
*/
- copy_helper(tc, "data/file_datafile.txt", "data/file_copy.txt",
+ copy_helper(tc, "data/file_datafile.txt", "data/file_copy.txt",
APR_FPROT_FILE_SOURCE_PERMS, 0, p);
-
- copy_helper(tc, "data/mmap_datafile.txt", "data/file_copy.txt",
+
+ copy_helper(tc, "data/mmap_datafile.txt", "data/file_copy.txt",
APR_FPROT_FILE_SOURCE_PERMS, 0, p);
-
+
rv = apr_file_remove("data/file_copy.txt", p);
APR_ASSERT_SUCCESS(tc, "Couldn't remove copy file", rv);
}
@@ -96,7 +96,7 @@ static void append_nonexist(abts_case *t
/* make absolutely sure that the dest file doesn't exist. */
apr_file_remove("data/file_copy.txt", p);
- copy_helper(tc, "data/file_datafile.txt", "data/file_copy.txt",
+ copy_helper(tc, "data/file_datafile.txt", "data/file_copy.txt",
APR_FPROT_FILE_SOURCE_PERMS, 0, p);
rv = apr_file_remove("data/file_copy.txt", p);
APR_ASSERT_SUCCESS(tc, "Couldn't remove copy file", rv);
@@ -105,20 +105,20 @@ static void append_nonexist(abts_case *t
static void append_exist(abts_case *tc, void *data)
{
apr_status_t rv;
-
+
/* make absolutely sure that the dest file doesn't exist. */
apr_file_remove("data/file_copy.txt", p);
-
+
/* This is a cheat. I don't want to create a new file, so I just copy
* one file, then I copy another. If the second copy succeeds, then
* this works.
*/
- copy_helper(tc, "data/file_datafile.txt", "data/file_copy.txt",
+ copy_helper(tc, "data/file_datafile.txt", "data/file_copy.txt",
APR_FPROT_FILE_SOURCE_PERMS, 0, p);
-
- copy_helper(tc, "data/mmap_datafile.txt", "data/file_copy.txt",
+
+ copy_helper(tc, "data/mmap_datafile.txt", "data/file_copy.txt",
APR_FPROT_FILE_SOURCE_PERMS, 1, p);
-
+
rv = apr_file_remove("data/file_copy.txt", p);
APR_ASSERT_SUCCESS(tc, "Couldn't remove copy file", rv);
}
Modified: apr/apr/trunk/test/testfileinfo.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testfileinfo.c?rev=1905414&r1=1905413&r2=1905414&view=diff
==============================================================================
--- apr/apr/trunk/test/testfileinfo.c (original)
+++ apr/apr/trunk/test/testfileinfo.c Sun Nov 20 07:14:38 2022
@@ -40,13 +40,13 @@ static const struct view_fileinfo
{APR_FINFO_INODE, "INODE"},
{APR_FINFO_NLINK, "NLINK"},
{APR_FINFO_TYPE, "TYPE"},
- {APR_FINFO_USER, "USER"},
- {APR_FINFO_GROUP, "GROUP"},
- {APR_FINFO_UPROT, "UPROT"},
+ {APR_FINFO_USER, "USER"},
+ {APR_FINFO_GROUP, "GROUP"},
+ {APR_FINFO_UPROT, "UPROT"},
{APR_FINFO_GPROT, "GPROT"},
{APR_FINFO_WPROT, "WPROT"},
{0, NULL}
-};
+};
static void finfo_equal(abts_case *tc, apr_finfo_t *f1, apr_finfo_t *f2)
{
@@ -160,7 +160,7 @@ static void test_stat_eq_finfo(abts_case
rv = apr_file_info_get(&finfo, APR_FINFO_NORM, thefile);
/* Opening the file may have toggled the atime member (time last
- * accessed), so fetch our apr_stat() after getting the fileinfo
+ * accessed), so fetch our apr_stat() after getting the fileinfo
* of the open file...
*/
rv = apr_stat(&stat_finfo, FILENAME, APR_FINFO_NORM, p);
Modified: apr/apr/trunk/test/testflock.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testflock.c?rev=1905414&r1=1905413&r2=1905414&view=diff
==============================================================================
--- apr/apr/trunk/test/testflock.c (original)
+++ apr/apr/trunk/test/testflock.c Sun Nov 20 07:14:38 2022
@@ -62,7 +62,7 @@ static void test_withlock(abts_case *tc,
apr_file_t *file;
apr_status_t rv;
int code;
-
+
rv = apr_file_open(&file, TESTFILE, APR_FOPEN_WRITE|APR_FOPEN_CREATE,
APR_FPROT_OS_DEFAULT, p);
APR_ASSERT_SUCCESS(tc, "Could not create file.", rv);
@@ -81,7 +81,7 @@ static void test_withlock(abts_case *tc,
static void test_withoutlock(abts_case *tc, void *data)
{
int code;
-
+
code = launch_reader(tc);
ABTS_INT_EQUAL(tc, SUCCESSFUL_READ, code);
}
@@ -91,7 +91,7 @@ static void remove_lockfile(abts_case *t
APR_ASSERT_SUCCESS(tc, "Couldn't remove lock file.",
apr_file_remove(TESTFILE, p));
}
-
+
abts_suite *testflock(abts_suite *suite)
{
suite = ADD_SUITE(suite)
Modified: apr/apr/trunk/test/testfnmatch.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testfnmatch.c?rev=1905414&r1=1905413&r2=1905414&view=diff
==============================================================================
--- apr/apr/trunk/test/testfnmatch.c (original)
+++ apr/apr/trunk/test/testfnmatch.c Sun Nov 20 07:14:38 2022
@@ -192,7 +192,7 @@ static void test_fnmatch_test(abts_case
for (t = ft_tests; t->pattern != NULL; t++) {
int res = apr_fnmatch_test(t->pattern);
-
+
if (res != t->result) {
char buf[128];
@@ -208,7 +208,7 @@ static void test_glob(abts_case *tc, voi
int i;
char **list;
apr_array_header_t *result;
-
+
APR_ASSERT_SUCCESS(tc, "glob match against data/*.txt",
apr_match_glob("data\\*.txt", &result, p));
@@ -227,7 +227,7 @@ static void test_glob_currdir(abts_case
char **list;
apr_array_header_t *result;
apr_filepath_set("data", p);
-
+
APR_ASSERT_SUCCESS(tc, "glob match against *.txt with data as current",
apr_match_glob("*.txt", &result, p));
Modified: apr/apr/trunk/test/testglobalmutex.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testglobalmutex.c?rev=1905414&r1=1905413&r2=1905414&view=diff
==============================================================================
--- apr/apr/trunk/test/testglobalmutex.c (original)
+++ apr/apr/trunk/test/testglobalmutex.c Sun Nov 20 07:14:38 2022
@@ -82,7 +82,7 @@ static void test_exclusive(abts_case *tc
int x = 0;
abts_log_message("lock mechanism is: ");
abts_log_message(mutexname(mech));
-
+
rv = apr_global_mutex_create(&global_lock, LOCKNAME, mech, p);
if (rv == APR_ENOTIMPL) {
/* MacOS lacks TIMED implementation, so don't fail for ENOTIMPL */
@@ -95,7 +95,7 @@ static void test_exclusive(abts_case *tc
launch_child(tc, mech, &p2, p);
launch_child(tc, mech, &p3, p);
launch_child(tc, mech, &p4, p);
-
+
x += wait_child(tc, &p1);
x += wait_child(tc, &p2);
x += wait_child(tc, &p3);
Modified: apr/apr/trunk/test/testhash.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testhash.c?rev=1905414&r1=1905413&r2=1905414&view=diff
==============================================================================
--- apr/apr/trunk/test/testhash.c (original)
+++ apr/apr/trunk/test/testhash.c Sun Nov 20 07:14:38 2022
@@ -29,7 +29,7 @@ static int comp_string(const void *str1,
return strcmp(str1,str2);
}
-static void dump_hash(apr_pool_t *p, apr_hash_t *h, char str[][MAX_LTH])
+static void dump_hash(apr_pool_t *p, apr_hash_t *h, char str[][MAX_LTH])
{
apr_hash_index_t *hi;
int i = 0;
@@ -58,7 +58,7 @@ static void dump_hash(apr_pool_t *p, apr
);
}
-static void sum_hash(apr_pool_t *p, apr_hash_t *h, int *pcount, int *keySum, int *valSum)
+static void sum_hash(apr_pool_t *p, apr_hash_t *h, int *pcount, int *keySum, int *valSum)
{
apr_hash_index_t *hi;
void *val, *key;
@@ -218,7 +218,7 @@ static void hash_clear(abts_case *tc, vo
}
/* This is kind of a hack, but I am just keeping an existing test. This is
- * really testing apr_hash_first, apr_hash_next, and apr_hash_this which
+ * really testing apr_hash_first, apr_hash_next, and apr_hash_this which
* should be tested in three separate tests, but this will do for now.
*/
static void hash_traverse(abts_case *tc, void *data)
@@ -252,7 +252,7 @@ static void hash_traverse(abts_case *tc,
}
/* This is kind of a hack, but I am just keeping an existing test. This is
- * really testing apr_hash_first, apr_hash_next, and apr_hash_this which
+ * really testing apr_hash_first, apr_hash_next, and apr_hash_this which
* should be tested in three separate tests, but this will do for now.
*/
static void summation_test(abts_case *tc, void *data)
Modified: apr/apr/trunk/test/testhooks.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testhooks.c?rev=1905414&r1=1905413&r2=1905414&view=diff
==============================================================================
--- apr/apr/trunk/test/testhooks.c (original)
+++ apr/apr/trunk/test/testhooks.c Sun Nov 20 07:14:38 2022
@@ -152,7 +152,7 @@ static void test_basic_ordering(abts_cas
probe_buf_pool = p;
test_run_toyhook(buf, sizeof buf);
-
+
ABTS_STR_EQUAL(tc, "12345", buf);
ABTS_STR_EQUAL(tc, "EI1CI2CI3CI4CI5CR", probe_buf);
}
@@ -179,7 +179,7 @@ static void test_pred_ordering(abts_case
probe_buf_pool = p;
test_run_toyhook(buf, sizeof buf);
-
+
/* FAILS ABTS_STR_EQUAL(tc, "1223", buf); */
}
Modified: apr/apr/trunk/test/testipsub.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testipsub.c?rev=1905414&r1=1905413&r2=1905414&view=diff
==============================================================================
--- apr/apr/trunk/test/testipsub.c (original)
+++ apr/apr/trunk/test/testipsub.c Sun Nov 20 07:14:38 2022
@@ -77,7 +77,7 @@ static void test_singleton_subnets(abts_
{
const char *v4addrs[] = {
"127.0.0.1", "129.42.18.99", "63.161.155.20", "207.46.230.229", "64.208.42.36",
- "198.144.203.195", "192.18.97.241", "198.137.240.91", "62.156.179.119",
+ "198.144.203.195", "192.18.97.241", "198.137.240.91", "62.156.179.119",
"204.177.92.181"
};
apr_ipsubnet_t *ipsub;
@@ -201,14 +201,14 @@ static void test_parse_addr_port(abts_ca
/* ,{ "localhost:-1", APR_EINVAL, NULL, NULL, 0 } <- should fail, doesn't */
};
unsigned i;
-
+
for (i = 0; i < (sizeof testcases / sizeof testcases[0]); i++) {
char *addr, *scope_id;
apr_port_t port;
apr_status_t rv;
test = &testcases[i];
-
+
rv = apr_parse_addr_port(&addr, &scope_id, &port, test->input, p);
ABTS_INT_EQUAL(tc, test->rv, rv);
Modified: apr/apr/trunk/test/testlfs.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testlfs.c?rev=1905414&r1=1905413&r2=1905414&view=diff
==============================================================================
--- apr/apr/trunk/test/testlfs.c (original)
+++ apr/apr/trunk/test/testlfs.c Sun Nov 20 07:14:38 2022
@@ -78,7 +78,7 @@ static void test_open(abts_case *tc, voi
ABTS_NOT_IMPL(tc, "Creation of large file (apparently not sparse)");
madefile = 0;
- }
+ }
else {
/* Proceed with our 8GB sparse file now */
rv = apr_file_trunc(f, eightGB);
@@ -91,7 +91,7 @@ static void test_open(abts_case *tc, voi
#endif
) {
ABTS_NOT_IMPL(tc, "Creation of large file (rlimit, quota or fs)");
- }
+ }
else {
APR_ASSERT_SUCCESS(tc, "truncate file to 8gb", rv);
}
@@ -112,14 +112,14 @@ static void test_reopen(abts_case *tc, v
apr_status_t rv;
PRECOND;
-
+
rv = apr_file_open(&fh, TESTFN, APR_FOPEN_SPARSE | APR_FOPEN_READ,
APR_FPROT_OS_DEFAULT, p);
APR_ASSERT_SUCCESS(tc, "re-open 8GB file", rv);
APR_ASSERT_SUCCESS(tc, "file_info_get failed",
apr_file_info_get(&finfo, APR_FINFO_NORM, fh));
-
+
ABTS_ASSERT(tc, "file_info_get gave incorrect size",
finfo.size == eightGB);
@@ -132,9 +132,9 @@ static void test_stat(abts_case *tc, voi
PRECOND;
- APR_ASSERT_SUCCESS(tc, "stat large file",
+ APR_ASSERT_SUCCESS(tc, "stat large file",
apr_stat(&finfo, TESTFN, APR_FINFO_NORM, p));
-
+
ABTS_ASSERT(tc, "stat gave incorrect size", finfo.size == eightGB);
}
@@ -145,25 +145,25 @@ static void test_readdir(abts_case *tc,
PRECOND;
- APR_ASSERT_SUCCESS(tc, "open test directory",
+ APR_ASSERT_SUCCESS(tc, "open test directory",
apr_dir_open(&dh, TESTDIR, p));
do {
apr_finfo_t finfo;
-
+
rv = apr_dir_read(&finfo, APR_FINFO_MIN, dh);
-
+
if (rv == APR_SUCCESS && strcmp(finfo.name, TESTFILE) == 0) {
- ABTS_ASSERT(tc, "apr_dir_read gave incorrect size for large file",
+ ABTS_ASSERT(tc, "apr_dir_read gave incorrect size for large file",
finfo.size == eightGB);
}
} while (rv == APR_SUCCESS);
-
+
if (!APR_STATUS_IS_ENOENT(rv)) {
APR_ASSERT_SUCCESS(tc, "apr_dir_read failed", rv);
}
-
+
APR_ASSERT_SUCCESS(tc, "close test directory",
apr_dir_close(dh));
}
@@ -175,11 +175,11 @@ static void test_append(abts_case *tc, v
apr_file_t *fh;
apr_finfo_t finfo;
apr_status_t rv;
-
+
PRECOND;
- rv = apr_file_open(&fh, TESTFN, APR_FOPEN_SPARSE | APR_FOPEN_WRITE
- | APR_FOPEN_APPEND,
+ rv = apr_file_open(&fh, TESTFN, APR_FOPEN_SPARSE | APR_FOPEN_WRITE
+ | APR_FOPEN_APPEND,
APR_FPROT_OS_DEFAULT, p);
APR_ASSERT_SUCCESS(tc, "open 8GB file for append", rv);
@@ -188,7 +188,7 @@ static void test_append(abts_case *tc, v
APR_ASSERT_SUCCESS(tc, "file_info_get failed",
apr_file_info_get(&finfo, APR_FINFO_NORM, fh));
-
+
ABTS_ASSERT(tc, "file_info_get gave incorrect size",
finfo.size == eightGB + strlen(TESTSTR));
@@ -202,16 +202,16 @@ static void test_seek(abts_case *tc, voi
apr_status_t rv;
PRECOND;
-
+
rv = apr_file_open(&fh, TESTFN, APR_FOPEN_SPARSE | APR_FOPEN_WRITE,
APR_FPROT_OS_DEFAULT, p);
APR_ASSERT_SUCCESS(tc, "open 8GB file for writing", rv);
pos = 0;
- APR_ASSERT_SUCCESS(tc, "relative seek to end",
+ APR_ASSERT_SUCCESS(tc, "relative seek to end",
apr_file_seek(fh, APR_END, &pos));
ABTS_ASSERT(tc, "seek to END gave 8GB", pos == eightGB);
-
+
pos = eightGB;
APR_ASSERT_SUCCESS(tc, "seek to 8GB", apr_file_seek(fh, APR_SET, &pos));
ABTS_ASSERT(tc, "seek gave 8GB offset", pos == eightGB);
@@ -235,7 +235,7 @@ static void test_write(abts_case *tc, vo
APR_FPROT_OS_DEFAULT, p);
APR_ASSERT_SUCCESS(tc, "re-open 8GB file", rv);
- APR_ASSERT_SUCCESS(tc, "seek to 8GB - 4",
+ APR_ASSERT_SUCCESS(tc, "seek to 8GB - 4",
apr_file_seek(fh, APR_SET, &pos));
ABTS_ASSERT(tc, "seek gave 8GB-4 offset", pos == eightGB - 4);
@@ -252,7 +252,7 @@ static void test_mmap(abts_case *tc, voi
apr_mmap_t *map;
apr_file_t *fh;
apr_size_t len = 65536; /* hopefully a multiple of the page size */
- apr_off_t off = eightGB - len;
+ apr_off_t off = eightGB - len;
apr_status_t rv;
void *ptr;
@@ -261,14 +261,14 @@ static void test_mmap(abts_case *tc, voi
rv = apr_file_open(&fh, TESTFN, APR_FOPEN_SPARSE | APR_FOPEN_READ,
APR_FPROT_OS_DEFAULT, p);
APR_ASSERT_SUCCESS(tc, "open 8gb file for mmap", rv);
-
+
APR_ASSERT_SUCCESS(tc, "mmap 8GB file",
apr_mmap_create(&map, fh, off, len, APR_MMAP_READ, p));
APR_ASSERT_SUCCESS(tc, "close file", apr_file_close(fh));
ABTS_ASSERT(tc, "mapped a 64K block", map->size == len);
-
+
APR_ASSERT_SUCCESS(tc, "get pointer into mmaped region",
apr_mmap_offset(&ptr, map, len - 4));
ABTS_ASSERT(tc, "pointer was not NULL", ptr != NULL);
Modified: apr/apr/trunk/test/testlock.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testlock.c?rev=1905414&r1=1905413&r2=1905414&view=diff
==============================================================================
--- apr/apr/trunk/test/testlock.c (original)
+++ apr/apr/trunk/test/testlock.c Sun Nov 20 07:14:38 2022
@@ -81,7 +81,7 @@ static void *APR_THREAD_FUNC thread_rwlo
apr_thread_rwlock_unlock(rwlock);
}
return NULL;
-}
+}
static void *APR_THREAD_FUNC thread_mutex_function(apr_thread_t *thd, void *data)
{
@@ -89,10 +89,10 @@ static void *APR_THREAD_FUNC thread_mute
/* slight delay to allow things to settle */
apr_sleep (1);
-
+
while (1) {
apr_status_t rv;
-
+
if (data) {
rv = apr_thread_mutex_timedlock(thread_mutex, *(apr_interval_time_t *)data);
}
@@ -105,10 +105,10 @@ static void *APR_THREAD_FUNC thread_mute
apr_thread_exit(thd, rv);
break;
}
-
+
if (i == MAX_ITER)
exitLoop = 0;
- else
+ else
{
i++;
x++;
@@ -156,7 +156,7 @@ static void *APR_THREAD_FUNC thread_mute
apr_thread_exit(thd, APR_SUCCESS);
return NULL;
-}
+}
static void *APR_THREAD_FUNC thread_cond_producer(apr_thread_t *thd, void *data)
{
@@ -231,7 +231,7 @@ static void test_thread_mutex(abts_case
JOIN_WITH_SUCCESS(tc, t2);
JOIN_WITH_SUCCESS(tc, t3);
JOIN_WITH_SUCCESS(tc, t4);
-
+
ABTS_INT_EQUAL(tc, MAX_ITER, x);
}
@@ -308,14 +308,14 @@ static void test_cond(abts_case *tc, voi
apr_status_t s0, s1, s2, s3, s4;
int count1, count2, count3, count4;
int sum;
-
+
APR_ASSERT_SUCCESS(tc, "create put mutex",
- apr_thread_mutex_create(&put.mutex,
+ apr_thread_mutex_create(&put.mutex,
APR_THREAD_MUTEX_DEFAULT, p));
ABTS_PTR_NOTNULL(tc, put.mutex);
APR_ASSERT_SUCCESS(tc, "create nready mutex",
- apr_thread_mutex_create(&nready.mutex,
+ apr_thread_mutex_create(&nready.mutex,
APR_THREAD_MUTEX_DEFAULT, p));
ABTS_PTR_NOTNULL(tc, nready.mutex);
@@ -346,7 +346,7 @@ static void test_cond(abts_case *tc, voi
apr_thread_join(&s3, p4);
apr_thread_join(&s4, c1);
- APR_ASSERT_SUCCESS(tc, "destroy condvar",
+ APR_ASSERT_SUCCESS(tc, "destroy condvar",
apr_thread_cond_destroy(nready.cond));
sum = count1 + count2 + count3 + count4;
@@ -381,7 +381,7 @@ static void test_timeoutcond(abts_case *
s = apr_thread_cond_timedwait(timeout_cond, timeout_mutex, timeout);
end = apr_time_now();
apr_thread_mutex_unlock(timeout_mutex);
-
+
if (s != APR_SUCCESS && !APR_STATUS_IS_TIMEUP(s)) {
continue;
}
@@ -419,7 +419,7 @@ static void test_timeoutmutex(abts_case
wait_for_flag(flag, 1); /* the thread will set flag to 1 once the
* timeout_mutex is locked. */
-
+
timeout = apr_time_from_sec(5);
for (i = 0; i < MAX_RETRY; i++) {
Modified: apr/apr/trunk/test/testlockperf.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testlockperf.c?rev=1905414&r1=1905413&r2=1905414&view=diff
==============================================================================
--- apr/apr/trunk/test/testlockperf.c (original)
+++ apr/apr/trunk/test/testlockperf.c Sun Nov 20 07:14:38 2022
@@ -104,7 +104,7 @@ int test_thread_mutex(int num_threads)
apr_thread_mutex_lock(thread_lock);
/* set_concurrency(4)? -aaron */
- printf(" Starting %d threads ", num_threads);
+ printf(" Starting %d threads ", num_threads);
for (i = 0; i < num_threads; ++i) {
s[i] = apr_thread_create(&t[i], NULL, thread_mutex_func, NULL, pool);
if (s[i] != APR_SUCCESS) {
@@ -152,7 +152,7 @@ int test_thread_mutex_nested(int num_thr
apr_thread_mutex_lock(thread_lock);
/* set_concurrency(4)? -aaron */
- printf(" Starting %d threads ", num_threads);
+ printf(" Starting %d threads ", num_threads);
for (i = 0; i < num_threads; ++i) {
s[i] = apr_thread_create(&t[i], NULL, thread_mutex_func, NULL, pool);
if (s[i] != APR_SUCCESS) {
@@ -203,7 +203,7 @@ static int test_thread_mutex_timed(int n
apr_thread_mutex_lock(thread_lock);
/* set_concurrency(4)? -aaron */
- printf(" Starting %d threads ", num_threads);
+ printf(" Starting %d threads ", num_threads);
for (i = 0; i < num_threads; ++i) {
s[i] = apr_thread_create(&t[i], NULL, thread_mutex_func, &timeout, pool);
if (s[i] != APR_SUCCESS) {
@@ -251,7 +251,7 @@ int test_thread_rwlock(int num_threads)
apr_thread_rwlock_wrlock(thread_rwlock);
/* set_concurrency(4)? -aaron */
- printf(" Starting %d threads ", num_threads);
+ printf(" Starting %d threads ", num_threads);
for (i = 0; i < num_threads; ++i) {
s[i] = apr_thread_create(&t[i], NULL, thread_rwlock_func, NULL, pool);
if (s[i] != APR_SUCCESS) {
@@ -288,7 +288,7 @@ int main(int argc, const char * const *a
const char *optarg;
printf("APR Lock Performance Test\n==============\n\n");
-
+
apr_initialize();
atexit(apr_terminate);
@@ -300,7 +300,7 @@ int main(int argc, const char * const *a
rv, apr_strerror(rv, errmsg, sizeof errmsg));
exit(-1);
}
-
+
while ((rv = apr_getopt(opt, "c:v", &optchar, &optarg)) == APR_SUCCESS) {
if (optchar == 'c') {
max_counter = atol(optarg);
Modified: apr/apr/trunk/test/testmd4.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testmd4.c?rev=1905414&r1=1905413&r2=1905414&view=diff
==============================================================================
--- apr/apr/trunk/test/testmd4.c (original)
+++ apr/apr/trunk/test/testmd4.c Sun Nov 20 07:14:38 2022
@@ -42,9 +42,9 @@
static struct {
const char *string;
const char *md4sum;
-} md4sums[] =
+} md4sums[] =
{
-/*
+/*
* Taken from the old md4 test suite.
* MD4 ("") = 31d6cfe0d16ae931b73c59d7e0c089c0
* MD4 ("a") = bde52cb31de33e46245e05fbdbd6fb24
@@ -53,25 +53,25 @@ static struct {
* MD4 ("abcdefghijklmnopqrstuvwxyz") = d79e1c308aa5bbcdeea8ed63df412da9
* MD4 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789")
* MD4 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") = e33b4ddc9c38f2199c3e7b164fcc0536
-*
+*
*/
- {"",
+ {"",
"\x31\xd6\xcf\xe0\xd1\x6a\xe9\x31\xb7\x3c\x59\xd7\xe0\xc0\x89\xc0"},
- {"a",
+ {"a",
"\xbd\xe5\x2c\xb3\x1d\xe3\x3e\x46\x24\x5e\x05\xfb\xdb\xd6\xfb\x24"},
- {"abc",
+ {"abc",
"\xa4\x48\x01\x7a\xaf\x21\xd8\x52\x5f\xc1\x0a\xe8\x7a\xa6\x72\x9d"},
- {"message digest",
+ {"message digest",
"\xd9\x13\x0a\x81\x64\x54\x9f\xe8\x18\x87\x48\x06\xe1\xc7\x01\x4b"},
- {"abcdefghijklmnopqrstuvwxyz",
+ {"abcdefghijklmnopqrstuvwxyz",
"\xd7\x9e\x1c\x30\x8a\xa5\xbb\xcd\xee\xa8\xed\x63\xdf\x41\x2d\xa9"},
- {"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
+ {"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
"\x04\x3f\x85\x82\xf2\x41\xdb\x35\x1c\xe6\x27\xe1\x53\xe7\xf0\xe4"},
- {"12345678901234567890123456789012345678901234567890123456789012345678901234567890",
+ {"12345678901234567890123456789012345678901234567890123456789012345678901234567890",
"\xe3\x3b\x4d\xdc\x9c\x38\xf2\x19\x9c\x3e\x7b\x16\x4f\xcc\x05\x36"}
};
-static int num_sums = sizeof(md4sums) / sizeof(md4sums[0]);
+static int num_sums = sizeof(md4sums) / sizeof(md4sums[0]);
static int count;
#if 0
@@ -98,12 +98,12 @@ static void test_md4sum(abts_case *tc, v
size_t len = strlen(string);
ABTS_ASSERT(tc, "apr_md4_init", (apr_md4_init(&context) == 0));
- ABTS_ASSERT(tc, "apr_md4_update",
- (apr_md4_update(&context,
+ ABTS_ASSERT(tc, "apr_md4_update",
+ (apr_md4_update(&context,
(unsigned char *)string, len) == 0));
-
+
ABTS_ASSERT(tc, "apr_md4_final", (apr_md4_final(digest, &context) ==0));
- ABTS_ASSERT(tc, "check for correct md4 digest",
+ ABTS_ASSERT(tc, "check for correct md4 digest",
(memcmp(digest, sum, APR_MD4_DIGESTSIZE) == 0));
}
Modified: apr/apr/trunk/test/testmd5.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testmd5.c?rev=1905414&r1=1905413&r2=1905414&view=diff
==============================================================================
--- apr/apr/trunk/test/testmd5.c (original)
+++ apr/apr/trunk/test/testmd5.c Sun Nov 20 07:14:38 2022
@@ -28,7 +28,7 @@
static struct {
const char *string;
const char *digest;
-} md5sums[] =
+} md5sums[] =
{
{"Jeff was here!",
"\xa5\x25\x8a\x89\x11\xb2\x9d\x1f\x81\x75\x96\x3b\x60\x94\x49\xc0"},
@@ -58,7 +58,7 @@ static void test_md5sum(abts_case *tc, v
unsigned int len = (unsigned int)strlen(string);
ABTS_ASSERT(tc, "apr_md5_init", (apr_md5_init(&context) == 0));
- ABTS_ASSERT(tc, "apr_md5_update",
+ ABTS_ASSERT(tc, "apr_md5_update",
(apr_md5_update(&context, string, len) == 0));
ABTS_ASSERT(tc, "apr_md5_final", (apr_md5_final(digest, &context)
== 0));
@@ -93,7 +93,7 @@ static void test_md5sum_unaligned(abts_c
abts_suite *testmd5(abts_suite *suite)
{
suite = ADD_SUITE(suite);
-
+
for (count=0; count < num_sums; count++) {
abts_run_test(suite, test_md5sum, NULL);
}
Modified: apr/apr/trunk/test/testmemcache.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testmemcache.c?rev=1905414&r1=1905413&r2=1905414&view=diff
==============================================================================
--- apr/apr/trunk/test/testmemcache.c (original)
+++ apr/apr/trunk/test/testmemcache.c Sun Nov 20 07:14:38 2022
@@ -424,7 +424,7 @@ static void test_memcache_addreplace(abt
ABTS_SKIP(tc, data, "Memcache server not found.");
return;
}
-
+
rv = apr_memcache_create(pool, 1, 0, &memcache);
ABTS_ASSERT(tc, "memcache create failed", rv == APR_SUCCESS);
@@ -488,7 +488,7 @@ static void test_memcache_incrdecr(abts_
ABTS_SKIP(tc, data, "Memcache server not found.");
return;
}
-
+
rv = apr_memcache_create(pool, 1, 0, &memcache);
ABTS_ASSERT(tc, "memcache create failed", rv == APR_SUCCESS);
Modified: apr/apr/trunk/test/testmmap.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testmmap.c?rev=1905414&r1=1905413&r2=1905414&view=diff
==============================================================================
--- apr/apr/trunk/test/testmmap.c (original)
+++ apr/apr/trunk/test/testmmap.c Sun Nov 20 07:14:38 2022
@@ -81,7 +81,7 @@ static void test_file_close(abts_case *t
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
thefile = NULL;
}
-
+
static void test_file_open(abts_case *tc, void *data)
{
apr_status_t rv;
@@ -91,7 +91,7 @@ static void test_file_open(abts_case *tc
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
ABTS_PTR_NOTNULL(tc, thefile);
}
-
+
static void test_get_filesize(abts_case *tc, void *data)
{
apr_status_t rv;
Modified: apr/apr/trunk/test/testmutexscope.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testmutexscope.c?rev=1905414&r1=1905413&r2=1905414&view=diff
==============================================================================
--- apr/apr/trunk/test/testmutexscope.c (original)
+++ apr/apr/trunk/test/testmutexscope.c Sun Nov 20 07:14:38 2022
@@ -121,7 +121,7 @@ static void test_mech_mode(apr_lockmech_
assert(apr_thread_mutex_create(&thread_mutex, 0, p) == APR_SUCCESS);
assert(apr_thread_mutex_lock(thread_mutex) == APR_SUCCESS);
-
+
rv = lock_init(mech, test_mode);
if (rv != APR_SUCCESS) {
char errmsg[256];
@@ -170,7 +170,7 @@ static void test_mech_mode(apr_lockmech_
printf(" no problem encountered...\n");
}
}
-
+
assert(apr_thread_mutex_unlock(thread_mutex) == APR_SUCCESS);
i = 0;
@@ -220,13 +220,13 @@ int main(void)
,{APR_LOCK_DEFAULT_TIMED, "default_timed"}
};
int i;
-
+
assert(apr_initialize() == APR_SUCCESS);
for (i = 0; i < sizeof(lockmechs) / sizeof(lockmechs[0]); i++) {
test_mech(lockmechs[i].mech, lockmechs[i].mech_name);
}
-
+
apr_terminate();
return 0;
}
Modified: apr/apr/trunk/test/testnames.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testnames.c?rev=1905414&r1=1905413&r2=1905414&view=diff
==============================================================================
--- apr/apr/trunk/test/testnames.c (original)
+++ apr/apr/trunk/test/testnames.c Sun Nov 20 07:14:38 2022
@@ -54,7 +54,7 @@ static void merge_belowroot(abts_case *t
apr_status_t rv;
char *dstpath = NULL;
- rv = apr_filepath_merge(&dstpath, ABS_ROOT"foo", ABS_ROOT"foo/bar",
+ rv = apr_filepath_merge(&dstpath, ABS_ROOT"foo", ABS_ROOT"foo/bar",
APR_FILEPATH_NOTABOVEROOT, p);
ABTS_PTR_NOTNULL(tc, dstpath);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
@@ -101,13 +101,13 @@ static void merge_dotdot_dotdot_dotdot(a
apr_status_t rv;
char *dstpath = NULL;
- rv = apr_filepath_merge(&dstpath, "",
+ rv = apr_filepath_merge(&dstpath, "",
"../../..", APR_FILEPATH_TRUENAME, p);
ABTS_PTR_NOTNULL(tc, dstpath);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
ABTS_STR_EQUAL(tc, "../../..", dstpath);
- rv = apr_filepath_merge(&dstpath, "",
+ rv = apr_filepath_merge(&dstpath, "",
"../../../", APR_FILEPATH_TRUENAME, p);
ABTS_PTR_NOTNULL(tc, dstpath);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
@@ -143,7 +143,7 @@ static void merge_notrelfail(abts_case *
char *dstpath = NULL;
char errmsg[256];
- rv = apr_filepath_merge(&dstpath, "foo/bar", "../baz",
+ rv = apr_filepath_merge(&dstpath, "foo/bar", "../baz",
APR_FILEPATH_NOTRELATIVE, p);
apr_strerror(rv, errmsg, sizeof(errmsg));
@@ -158,7 +158,7 @@ static void merge_notabsfail(abts_case *
char *dstpath = NULL;
char errmsg[256];
- rv = apr_filepath_merge(&dstpath, ABS_ROOT"foo/bar", "../baz",
+ rv = apr_filepath_merge(&dstpath, ABS_ROOT"foo/bar", "../baz",
APR_FILEPATH_NOTABSOLUTE, p);
apr_strerror(rv, errmsg, sizeof(errmsg));
@@ -172,7 +172,7 @@ static void merge_notabs(abts_case *tc,
apr_status_t rv;
char *dstpath = NULL;
- rv = apr_filepath_merge(&dstpath, "foo/bar", "../baz",
+ rv = apr_filepath_merge(&dstpath, "foo/bar", "../baz",
APR_FILEPATH_NOTABSOLUTE, p);
ABTS_PTR_NOTNULL(tc, dstpath);
@@ -338,7 +338,7 @@ static void root_from_cwd_and_back(abts_
ABTS_STR_EQUAL(tc, origpath + 1, path);
#endif
- rv = apr_filepath_merge(&testpath, root, path,
+ rv = apr_filepath_merge(&testpath, root, path,
APR_FILEPATH_TRUENAME
| APR_FILEPATH_NOTABOVEROOT
| APR_FILEPATH_NOTRELATIVE, p);
@@ -346,7 +346,7 @@ static void root_from_cwd_and_back(abts_
#if defined(WIN32) || defined(OS2) || defined(NETWARE)
hadfailed = tc->failed;
#endif
- /* The API doesn't promise equality!!!
+ /* The API doesn't promise equality!!!
* apr_filepath_get never promised a canonical filepath.
* We'll emit noise under verbose so the user is aware,
* but translate this back to success.
Modified: apr/apr/trunk/test/testoc.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testoc.c?rev=1905414&r1=1905413&r2=1905414&view=diff
==============================================================================
--- apr/apr/trunk/test/testoc.c (original)
+++ apr/apr/trunk/test/testoc.c Sun Nov 20 07:14:38 2022
@@ -29,19 +29,19 @@ static void ocmaint(int reason, void *da
{
switch (reason) {
case APR_OC_REASON_DEATH:
- apr_cpystrn(reasonstr, "APR_OC_REASON_DEATH",
+ apr_cpystrn(reasonstr, "APR_OC_REASON_DEATH",
strlen("APR_OC_REASON_DEATH") + 1);
break;
case APR_OC_REASON_LOST:
- apr_cpystrn(reasonstr, "APR_OC_REASON_LOST",
+ apr_cpystrn(reasonstr, "APR_OC_REASON_LOST",
strlen("APR_OC_REASON_LOST") + 1);
break;
case APR_OC_REASON_UNWRITABLE:
- apr_cpystrn(reasonstr, "APR_OC_REASON_UNWRITEABLE",
+ apr_cpystrn(reasonstr, "APR_OC_REASON_UNWRITEABLE",
strlen("APR_OC_REASON_UNWRITEABLE") + 1);
break;
case APR_OC_REASON_RESTART:
- apr_cpystrn(reasonstr, "APR_OC_REASON_RESTART",
+ apr_cpystrn(reasonstr, "APR_OC_REASON_RESTART",
strlen("APR_OC_REASON_RESTART") + 1);
break;
}
@@ -69,7 +69,7 @@ static void test_child_kill(abts_case *t
rv = apr_procattr_create(&procattr, p);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
- rv = apr_procattr_io_set(procattr, APR_FULL_BLOCK, APR_NO_PIPE,
+ rv = apr_procattr_io_set(procattr, APR_FULL_BLOCK, APR_NO_PIPE,
APR_NO_PIPE);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
@@ -89,13 +89,13 @@ static void test_child_kill(abts_case *t
apr_sleep(apr_time_from_sec(1));
rv = apr_proc_kill(&newproc, SIGKILL);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
-
+
/* allow time for things to settle... */
apr_sleep(apr_time_from_sec(3));
-
+
apr_proc_other_child_refresh_all(APR_OC_REASON_RUNNING);
ABTS_STR_EQUAL(tc, "APR_OC_REASON_DEATH", reasonstr);
-}
+}
#else
static void oc_not_impl(abts_case *tc, void *data)
@@ -112,7 +112,7 @@ abts_suite *testoc(abts_suite *suite)
abts_run_test(suite, oc_not_impl, NULL);
#else
- abts_run_test(suite, test_child_kill, NULL);
+ abts_run_test(suite, test_child_kill, NULL);
#endif
return suite;
Modified: apr/apr/trunk/test/testpass.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testpass.c?rev=1905414&r1=1905413&r2=1905414&view=diff
==============================================================================
--- apr/apr/trunk/test/testpass.c (original)
+++ apr/apr/trunk/test/testpass.c Sun Nov 20 07:14:38 2022
@@ -48,7 +48,7 @@ static struct {
{
/*
passwords and hashes created with Apache's htpasswd utility like this:
-
+
htpasswd -c -b passwords pass1 pass1
htpasswd -b passwords pass2 pass2
htpasswd -b passwords pass3 pass3
@@ -183,7 +183,7 @@ static void test_bcryptpass(abts_case *t
const char *hash2 = "$2a$08$qipUJiI9fySUN38hcbz.lucXvAmtgowKOWYtB9y3CXyl6lTknruou";
const char *pass3 = "foobar";
- APR_ASSERT_SUCCESS(tc, "bcrypt encode password",
+ APR_ASSERT_SUCCESS(tc, "bcrypt encode password",
apr_bcrypt_encode(pass, 5, salt, sizeof(salt), hash,
sizeof(hash)));
@@ -200,7 +200,7 @@ abts_suite *testpass(abts_suite *suite)
{
suite = ADD_SUITE(suite);
-#if CRYPT_ALGO_SUPPORTED
+#if CRYPT_ALGO_SUPPORTED
abts_run_test(suite, test_crypt, NULL);
#if APR_HAS_THREADS
abts_run_test(suite, test_threadsafe, NULL);
@@ -212,6 +212,6 @@ abts_suite *testpass(abts_suite *suite)
#ifdef GLIBCSHA_ALGO_SUPPORTED
abts_run_test(suite, test_glibc_shapass, NULL);
#endif
-
+
return suite;
}
Modified: apr/apr/trunk/test/testpipe.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testpipe.c?rev=1905414&r1=1905413&r2=1905414&view=diff
==============================================================================
--- apr/apr/trunk/test/testpipe.c (original)
+++ apr/apr/trunk/test/testpipe.c Sun Nov 20 07:14:38 2022
@@ -35,7 +35,7 @@ static void create_pipe(abts_case *tc, v
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
ABTS_PTR_NOTNULL(tc, readp);
ABTS_PTR_NOTNULL(tc, writep);
-}
+}
static void close_pipe(abts_case *tc, void *data)
{
@@ -49,7 +49,7 @@ static void close_pipe(abts_case *tc, vo
rv = apr_file_read(readp, buf, &nbytes);
ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_EBADF(rv));
-}
+}
static void set_timeout(abts_case *tc, void *data)
{
@@ -70,7 +70,7 @@ static void set_timeout(abts_case *tc, v
rv = apr_file_pipe_timeout_get(readp, &timeout);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
- ABTS_ASSERT(tc, "Timeout mismatch, expected 1 second",
+ ABTS_ASSERT(tc, "Timeout mismatch, expected 1 second",
timeout == apr_time_from_sec(1));
}
@@ -79,7 +79,7 @@ static void read_write(abts_case *tc, vo
apr_status_t rv;
char *buf;
apr_size_t nbytes;
-
+
nbytes = strlen("this is a test");
buf = (char *)apr_palloc(p, nbytes + 1);
@@ -104,7 +104,7 @@ static void read_write_notimeout(abts_ca
char *buf = "this is a test";
char *input;
apr_size_t nbytes;
-
+
nbytes = strlen("this is a test");
rv = apr_file_pipe_create(&readp, &writep, p);
@@ -138,7 +138,7 @@ static void test_pipe_writefull(abts_cas
const char *args[2];
apr_status_t rv;
apr_exit_why_e why;
-
+
rv = apr_procattr_create(&procattr, p);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
@@ -173,7 +173,7 @@ static void test_pipe_writefull(abts_cas
rv = apr_file_close(proc.in);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
-
+
nbytes = sizeof(responsebuf);
rv = apr_file_read(proc.out, responsebuf, &nbytes);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
@@ -182,7 +182,7 @@ static void test_pipe_writefull(abts_cas
ABTS_ASSERT(tc, "wait for child process",
apr_proc_wait(&proc, NULL, &why, APR_WAIT) == APR_CHILD_DONE);
-
+
ABTS_ASSERT(tc, "child terminated normally", why == APR_PROC_EXIT);
}
Modified: apr/apr/trunk/test/testpoll.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testpoll.c?rev=1905414&r1=1905413&r2=1905414&view=diff
==============================================================================
--- apr/apr/trunk/test/testpoll.c (original)
+++ apr/apr/trunk/test/testpoll.c Sun Nov 20 07:14:38 2022
@@ -47,7 +47,7 @@ static apr_pollfd_t *pollarray_large;
*/
static int default_pollset_impl = APR_POLLSET_DEFAULT;
-static void make_socket(apr_socket_t **sock, apr_sockaddr_t **sa,
+static void make_socket(apr_socket_t **sock, apr_sockaddr_t **sa,
apr_port_t port, apr_pool_t *p, abts_case *tc)
{
apr_status_t rv;
@@ -63,15 +63,15 @@ static void make_socket(apr_socket_t **s
}
#ifdef OLD_POLL_INTERFACE
-static void check_sockets(const apr_pollfd_t *pollarray,
- apr_socket_t **sockarray, int which, int pollin,
+static void check_sockets(const apr_pollfd_t *pollarray,
+ apr_socket_t **sockarray, int which, int pollin,
abts_case *tc)
{
apr_status_t rv;
apr_int16_t event;
char *str;
- rv = apr_poll_revents_get(&event, sockarray[which],
+ rv = apr_poll_revents_get(&event, sockarray[which],
(apr_pollfd_t *)pollarray);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
if (pollin) {
@@ -99,7 +99,7 @@ static void send_msg(apr_socket_t **sock
ABTS_SIZE_EQUAL(tc, strlen("hello"), len);
}
-static void recv_msg(apr_socket_t **sockarray, int which, apr_pool_t *p,
+static void recv_msg(apr_socket_t **sockarray, int which, apr_pool_t *p,
abts_case *tc)
{
apr_size_t buflen = 5;
@@ -117,7 +117,7 @@ static void recv_msg(apr_socket_t **sock
ABTS_STR_EQUAL(tc, "hello", buffer);
}
-
+
static void create_all_sockets(abts_case *tc, void *data)
{
int i;
@@ -126,7 +126,7 @@ static void create_all_sockets(abts_case
make_socket(&s[i], &sa[i], 7777 + i, p, tc);
}
}
-
+
#ifdef OLD_POLL_INTERFACE
static void setup_small_poll(abts_case *tc, void *data)
{
@@ -135,7 +135,7 @@ static void setup_small_poll(abts_case *
rv = apr_poll_setup(&pollarray, SMALL_NUM_SOCKETS, p);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
-
+
for (i = 0; i < SMALL_NUM_SOCKETS;i++){
ABTS_INT_EQUAL(tc, 0, pollarray[i].reqevents);
ABTS_INT_EQUAL(tc, 0, pollarray[i].rtnevents);
@@ -153,7 +153,7 @@ static void setup_large_poll(abts_case *
rv = apr_poll_setup(&pollarray_large, LARGE_NUM_SOCKETS, p);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
-
+
for (i = 0; i < LARGE_NUM_SOCKETS;i++){
ABTS_INT_EQUAL(tc, 0, pollarray_large[i].reqevents);
ABTS_INT_EQUAL(tc, 0, pollarray_large[i].rtnevents);
@@ -257,7 +257,7 @@ static void send_large_pollarray(abts_ca
send_msg(s, sa, LARGE_NUM_SOCKETS - 1, tc);
- rv = apr_poll(pollarray_large, LARGE_NUM_SOCKETS, &lrv,
+ rv = apr_poll(pollarray_large, LARGE_NUM_SOCKETS, &lrv,
2 * APR_USEC_PER_SEC);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
@@ -279,7 +279,7 @@ static void recv_large_pollarray(abts_ca
recv_msg(s, LARGE_NUM_SOCKETS - 1, p, tc);
- rv = apr_poll(pollarray_large, LARGE_NUM_SOCKETS, &lrv,
+ rv = apr_poll(pollarray_large, LARGE_NUM_SOCKETS, &lrv,
2 * APR_USEC_PER_SEC);
ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_TIMEUP(rv));
@@ -350,7 +350,7 @@ static void multi_event_pollset(abts_cas
rv = apr_pollset_remove(pollset, &socket_pollfd);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
}
-
+
static void add_sockets_pollset(abts_case *tc, void *data)
{
apr_status_t rv;
@@ -416,7 +416,7 @@ static void send_middle_pollset(abts_cas
apr_status_t rv;
const apr_pollfd_t *descs = NULL;
int num;
-
+
send_msg(s, sa, 2, tc);
send_msg(s, sa, 5, tc);
rv = apr_pollset_poll(pollset, -1, &num, &descs);
@@ -454,7 +454,7 @@ static void send_last_pollset(abts_case
apr_status_t rv;
const apr_pollfd_t *descs = NULL;
int num;
-
+
send_msg(s, sa, LARGE_NUM_SOCKETS - 1, tc);
rv = apr_pollset_poll(pollset, -1, &num, &descs);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
@@ -546,7 +546,7 @@ static void pollset_remove(abts_case *tc
ABTS_PTR_EQUAL(tc, s[2], hot_files[1].desc.s);
ABTS_PTR_EQUAL(tc, (void *)4, hot_files[2].client_data);
ABTS_PTR_EQUAL(tc, s[3], hot_files[2].desc.s);
-
+
/* now remove the pollset elements referring to desc s[2] */
pfd.desc.s = s[2];
pfd.client_data = (void *)999; /* not used on this call */
@@ -607,7 +607,7 @@ static void trigger_pollcb(abts_case *tc
apr_status_t rv;
apr_pollfd_t socket_pollfd;
pollcb_baton_t pcb;
-
+
POLLCB_PREREQ;
ABTS_PTR_NOTNULL(tc, s[0]);
@@ -617,7 +617,7 @@ static void trigger_pollcb(abts_case *tc
socket_pollfd.client_data = s[0];
rv = apr_pollcb_add(pollcb, &socket_pollfd);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
-
+
send_msg(s, sa, 0, tc);
pcb.tc = tc;
pcb.count = 0;
@@ -639,7 +639,7 @@ static void timeout_pollcb(abts_case *tc
pcb.count = 0;
pcb.tc = tc;
- rv = apr_pollcb_poll(pollcb, 1, trigger_pollcb_cb, &pcb);
+ rv = apr_pollcb_poll(pollcb, 1, trigger_pollcb_cb, &pcb);
ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_TIMEUP(rv));
ABTS_INT_EQUAL(tc, 0, pcb.count);
}
@@ -653,7 +653,7 @@ static void timeout_pollin_pollcb(abts_c
POLLCB_PREREQ;
recv_msg(s, 0, p, tc);
-
+
ABTS_PTR_NOTNULL(tc, s[0]);
socket_pollfd.desc_type = APR_POLL_SOCKET;
socket_pollfd.reqevents = APR_POLLIN;
@@ -661,11 +661,11 @@ static void timeout_pollin_pollcb(abts_c
socket_pollfd.client_data = s[0];
rv = apr_pollcb_add(pollcb, &socket_pollfd);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
-
+
pcb.count = 0;
pcb.tc = tc;
-
- rv = apr_pollcb_poll(pollcb, 1, trigger_pollcb_cb, &pcb);
+
+ rv = apr_pollcb_poll(pollcb, 1, trigger_pollcb_cb, &pcb);
ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_TIMEUP(rv));
ABTS_INT_EQUAL(tc, 0, pcb.count);
@@ -688,7 +688,7 @@ static void pollset_default(abts_case *t
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv1);
ABTS_PTR_NOTNULL(tc, pollset);
-
+
rv1 = apr_pollset_create_ex(&pollset, 1, p, 0, APR_POLLSET_KQUEUE);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv1);
ABTS_PTR_NOTNULL(tc, pollset);
@@ -705,13 +705,13 @@ static void pollset_default(abts_case *t
if (rv1 == APR_SUCCESS) {
ABTS_PTR_NOTNULL(tc, pollset);
}
-
+
rv2 = apr_pollset_create_ex(&pollset, 1, p, APR_POLLSET_NODEFAULT,
APR_POLLSET_KQUEUE);
if (rv2 == APR_SUCCESS) {
ABTS_PTR_NOTNULL(tc, pollset);
}
-
+
ABTS_ASSERT(tc,
"failure using APR_POLLSET_NODEFAULT with unsupported method",
rv1 != APR_SUCCESS || rv2 != APR_SUCCESS);
@@ -736,7 +736,7 @@ static void pollcb_default(abts_case *tc
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv1);
ABTS_PTR_NOTNULL(tc, pollcb);
-
+
rv1 = apr_pollcb_create_ex(&pollcb, 1, p, 0, APR_POLLSET_KQUEUE);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv1);
ABTS_PTR_NOTNULL(tc, pollcb);
@@ -753,13 +753,13 @@ static void pollcb_default(abts_case *tc
if (rv1 == APR_SUCCESS) {
ABTS_PTR_NOTNULL(tc, pollcb);
}
-
+
rv2 = apr_pollcb_create_ex(&pollcb, 1, p, APR_POLLSET_NODEFAULT,
APR_POLLSET_KQUEUE);
if (rv2 == APR_SUCCESS) {
ABTS_PTR_NOTNULL(tc, pollcb);
}
-
+
ABTS_ASSERT(tc,
"failure using APR_POLLSET_NODEFAULT with unsupported method",
rv1 != APR_SUCCESS || rv2 != APR_SUCCESS);
Modified: apr/apr/trunk/test/testpools.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testpools.c?rev=1905414&r1=1905413&r2=1905414&view=diff
==============================================================================
--- apr/apr/trunk/test/testpools.c (original)
+++ apr/apr/trunk/test/testpools.c Sun Nov 20 07:14:38 2022
@@ -36,7 +36,7 @@ static void alloc_bytes(abts_case *tc, v
{
int i;
char *alloc;
-
+
alloc = apr_palloc(pmain, ALLOC_BYTES);
ABTS_PTR_NOTNULL(tc, alloc);
@@ -54,7 +54,7 @@ static void calloc_bytes(abts_case *tc,
{
int i;
char *alloc;
-
+
alloc = apr_pcalloc(pmain, ALLOC_BYTES);
ABTS_PTR_NOTNULL(tc, alloc);
@@ -109,7 +109,7 @@ static char *another_data = "Hello again
static apr_status_t another_cleanup(void *data)
{
return data == another_data ? APR_SUCCESS : APR_EGENERAL;
-}
+}
/* A few places in httpd modify the cleanup list for a pool while
* cleanups are being run. An example is close_listeners_on_exec ->
@@ -121,7 +121,7 @@ static apr_status_t another_cleanup(void
static apr_status_t dodgy_cleanup(void *data)
{
apr_pool_t *p = data;
-
+
return apr_pool_cleanup_run(p, another_data, another_cleanup);
}
@@ -136,7 +136,7 @@ static void test_cleanups(abts_case *tc,
success_cleanup);
apr_pool_cleanup_register(pchild, checker_data, checker_cleanup,
success_cleanup);
- apr_pool_cleanup_register(pchild, NULL, checker_cleanup,
+ apr_pool_cleanup_register(pchild, NULL, checker_cleanup,
success_cleanup);
apr_pool_cleanup_register(pchild, another_data, another_cleanup,
another_cleanup);
Modified: apr/apr/trunk/test/testproc.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testproc.c?rev=1905414&r1=1905413&r2=1905414&view=diff
==============================================================================
--- apr/apr/trunk/test/testproc.c (original)
+++ apr/apr/trunk/test/testproc.c Sun Nov 20 07:14:38 2022
@@ -41,7 +41,7 @@ static void test_create_proc(abts_case *
rv = apr_procattr_create(&attr, p);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
- rv = apr_procattr_io_set(attr, APR_FULL_BLOCK, APR_FULL_BLOCK,
+ rv = apr_procattr_io_set(attr, APR_FULL_BLOCK, APR_FULL_BLOCK,
APR_NO_PIPE);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
@@ -53,8 +53,8 @@ static void test_create_proc(abts_case *
args[0] = "proc_child" EXTENSION;
args[1] = NULL;
-
- rv = apr_proc_create(&newproc, proc_child, args, NULL,
+
+ rv = apr_proc_create(&newproc, proc_child, args, NULL,
attr, p);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
@@ -130,7 +130,7 @@ static void test_file_redir(abts_case *t
args[0] = "proc_child";
args[1] = NULL;
- rv = apr_proc_create(&newproc, proc_child, args, NULL,
+ rv = apr_proc_create(&newproc, proc_child, args, NULL,
attr, p);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
Modified: apr/apr/trunk/test/testprocmutex.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testprocmutex.c?rev=1905414&r1=1905413&r2=1905414&view=diff
==============================================================================
--- apr/apr/trunk/test/testprocmutex.c (original)
+++ apr/apr/trunk/test/testprocmutex.c Sun Nov 20 07:14:38 2022
@@ -106,7 +106,7 @@ static void make_child(abts_case *tc, in
exit(1);
} while (i < MAX_ITER);
exit(0);
- }
+ }
ABTS_ASSERT(tc, "fork failed", rv == APR_INPARENT);
}
@@ -123,22 +123,22 @@ static void await_child(abts_case *tc, a
rv == APR_CHILD_DONE && why == APR_PROC_EXIT && code == 0);
}
-static void test_exclusive(abts_case *tc, const char *lockname,
+static void test_exclusive(abts_case *tc, const char *lockname,
lockmech_t *mech)
{
apr_proc_t *child[CHILDREN];
apr_status_t rv;
int n;
-
+
rv = apr_proc_mutex_create(&proc_lock, lockname, mech->num, p);
APR_ASSERT_SUCCESS(tc, "create the mutex", rv);
-
+
for (n = 0; n < CHILDREN; n++)
make_child(tc, 0, &child[n], p);
for (n = 0; n < CHILDREN; n++)
await_child(tc, child[n]);
-
+
ABTS_ASSERT(tc, "Locks don't appear to work", *x == MAX_COUNTER);
rv = apr_proc_mutex_trylock(proc_lock);
@@ -174,7 +174,7 @@ static void test_exclusive(abts_case *tc
for (n = 0; n < CHILDREN; n++)
await_child(tc, child[n]);
-
+
ABTS_ASSERT(tc, "Locks don't appear to work with trylock",
*x == MAX_COUNTER);
}
@@ -211,7 +211,7 @@ static void test_exclusive(abts_case *tc
for (n = 0; n < CHILDREN; n++)
await_child(tc, child[n]);
-
+
ABTS_ASSERT(tc, "Locks don't appear to work with timedlock",
*x == MAX_COUNTER);
}
Modified: apr/apr/trunk/test/testredis.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testredis.c?rev=1905414&r1=1905413&r2=1905414&view=diff
==============================================================================
--- apr/apr/trunk/test/testredis.c (original)
+++ apr/apr/trunk/test/testredis.c Sun Nov 20 07:14:38 2022
@@ -61,7 +61,7 @@ static const char txt[] =
* this datatype is for our custom server determination function. this might
* be useful if you don't want to rely on simply hashing keys to determine
* where a key belongs, but instead want to write something fancy, or use some
- * other kind of configuration data, i.e. a hash plus some data about a
+ * other kind of configuration data, i.e. a hash plus some data about a
* namespace, or whatever. see my_server_func, and test_redis_user_funcs
* for the examples.
*/
@@ -71,7 +71,7 @@ typedef struct {
} my_hash_server_baton;
-/* this could do something fancy and return some hash result.
+/* this could do something fancy and return some hash result.
* for simplicity, just return the same value, so we can test it later on.
* if you wanted to use some external hashing library or functions for
* consistent hashing, for example, this would be a good place to do it.
@@ -86,7 +86,7 @@ static apr_uint32_t my_hash_func(void *b
/*
* a fancy function to determine which server to use given some kind of data
* and a hash value. this example actually ignores the hash value itself
- * and pulls some number from the *baton, which is a struct that has some
+ * and pulls some number from the *baton, which is a struct that has some
* kind of meaningful stuff in it.
*/
static apr_redis_server_t *my_server_func(void *baton,
@@ -98,7 +98,7 @@ static apr_redis_server_t *my_server_fun
if(mc->ntotal == 0) {
return NULL;
- }
+ }
if(mc->ntotal < mhsb->which_server) {
return NULL;
@@ -238,40 +238,40 @@ static void test_redis_create(abts_case
rv = apr_redis_create(pool, max_servers, 0, &redis);
ABTS_ASSERT(tc, "redis create failed", rv == APR_SUCCESS);
-
+
for (i = 1; i <= max_servers; i++) {
apr_port_t port;
-
+
port = PORT + i;
rv =
apr_redis_server_create(pool, HOST, PORT + i, 0, 1, 1, 60, 60, &server);
ABTS_ASSERT(tc, "server create failed", rv == APR_SUCCESS);
-
+
rv = apr_redis_add_server(redis, server);
ABTS_ASSERT(tc, "server add failed", rv == APR_SUCCESS);
-
+
s = apr_redis_find_server(redis, HOST, port);
ABTS_PTR_EQUAL(tc, server, s);
-
+
rv = apr_redis_disable_server(redis, s);
ABTS_ASSERT(tc, "server disable failed", rv == APR_SUCCESS);
-
+
rv = apr_redis_enable_server(redis, s);
ABTS_ASSERT(tc, "server enable failed", rv == APR_SUCCESS);
-
+
hash = apr_redis_hash(redis, prefix, strlen(prefix));
ABTS_ASSERT(tc, "hash failed", hash > 0);
-
+
s = apr_redis_find_server_hash(redis, hash);
ABTS_PTR_NOTNULL(tc, s);
}
rv = apr_redis_server_create(pool, HOST, PORT, 0, 1, 1, 60, 60, &server);
ABTS_ASSERT(tc, "server create failed", rv == APR_SUCCESS);
-
+
rv = apr_redis_add_server(redis, server);
ABTS_ASSERT(tc, "server add should have failed", rv != APR_SUCCESS);
-
+
}
/* install our own custom hashing and server selection routines. */
@@ -279,13 +279,13 @@ static void test_redis_create(abts_case
static int create_test_hash(apr_pool_t *p, apr_hash_t *h)
{
int i;
-
+
for (i = 0; i < TDATA_SIZE; i++) {
char *k, *v;
-
+
k = apr_pstrcat(p, prefix, apr_itoa(p, i), NULL);
v = apr_pstrndup(p, txt, randval((apr_uint32_t)strlen(txt)));
-
+
apr_hash_set(h, k, APR_HASH_KEY_STRING, v);
}
@@ -301,7 +301,7 @@ static void test_redis_user_funcs(abts_c
apr_uint32_t max_servers = 10;
apr_uint32_t hres;
apr_uint32_t i;
- my_hash_server_baton *baton =
+ my_hash_server_baton *baton =
apr_pcalloc(pool, sizeof(my_hash_server_baton));
if (!has_redis_server()) {
@@ -312,7 +312,7 @@ static void test_redis_user_funcs(abts_c
rv = apr_redis_create(pool, max_servers, 0, &redis);
ABTS_ASSERT(tc, "redis create failed", rv == APR_SUCCESS);
- /* as noted above, install our custom hash function, and call
+ /* as noted above, install our custom hash function, and call
* apr_redis_hash. the return value should be our predefined number,
* and our function just ignores the other args, for simplicity.
*/
@@ -320,20 +320,20 @@ static void test_redis_user_funcs(abts_c
hres = apr_redis_hash(redis, "whatever", sizeof("whatever") - 1);
ABTS_INT_EQUAL(tc, HASH_FUNC_RESULT, hres);
-
+
/* add some servers */
for(i = 1; i <= 10; i++) {
apr_redis_server_t *ms;
rv = apr_redis_server_create(pool, HOST, i, 0, 1, 1, 60, 60, &ms);
ABTS_ASSERT(tc, "server create failed", rv == APR_SUCCESS);
-
+
rv = apr_redis_add_server(redis, ms);
ABTS_ASSERT(tc, "server add failed", rv == APR_SUCCESS);
}
- /*
- * set 'which_server' in our server_baton to find the third server
+ /*
+ * set 'which_server' in our server_baton to find the third server
* which should have the same port.
*/
baton->which_server = 3;
@@ -373,7 +373,7 @@ static void test_redis_meta(abts_case *
apr_redis_stats(server, p, &stats);
ABTS_PTR_NOTNULL(tc, stats);
- /*
+ /*
* no way to know exactly what will be in most of these, so
* just make sure there is something.
*/
@@ -418,19 +418,19 @@ static void test_redis_incrdecr(abts_cas
ABTS_SKIP(tc, data, "Redis server not found.");
return;
}
-
+
rv = apr_redis_create(pool, 1, 0, &redis);
ABTS_ASSERT(tc, "redis create failed", rv == APR_SUCCESS);
-
+
rv = apr_redis_server_create(pool, HOST, PORT, 0, 1, 1, 60, 60, &server);
ABTS_ASSERT(tc, "server create failed", rv == APR_SUCCESS);
-
+
rv = apr_redis_add_server(redis, server);
ABTS_ASSERT(tc, "server add failed", rv == APR_SUCCESS);
rv = apr_redis_set(redis, prefix, "271", sizeof("271") - 1, 27);
ABTS_ASSERT(tc, "set failed", rv == APR_SUCCESS);
-
+
for( i = 1; i <= TDATA_SIZE; i++) {
apr_uint32_t expect;
Modified: apr/apr/trunk/test/testshm.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testshm.c?rev=1905414&r1=1905413&r2=1905414&view=diff
==============================================================================
--- apr/apr/trunk/test/testshm.c (original)
+++ apr/apr/trunk/test/testshm.c Sun Nov 20 07:14:38 2022
@@ -182,7 +182,7 @@ static void test_named(abts_case *tc, vo
APR_ASSERT_SUCCESS(tc, "Couldn't set copy environment", rv);
args[0] = apr_pstrdup(p, "testshmconsumer" EXTENSION);
- rv = apr_proc_create(&pidconsumer, TESTBINPATH "testshmconsumer" EXTENSION, args,
+ rv = apr_proc_create(&pidconsumer, TESTBINPATH "testshmconsumer" EXTENSION, args,
NULL, attr2, p);
APR_ASSERT_SUCCESS(tc, "Couldn't launch consumer", rv);
@@ -198,9 +198,9 @@ static void test_named(abts_case *tc, vo
* This way, if they didn't succeed, we can just run this test again
* without having to cleanup manually.
*/
- APR_ASSERT_SUCCESS(tc, "Error destroying shared memory",
+ APR_ASSERT_SUCCESS(tc, "Error destroying shared memory",
apr_shm_destroy(shm));
-
+
ABTS_INT_EQUAL(tc, sent, received);
}
@@ -298,9 +298,9 @@ abts_suite *testshm(abts_suite *suite)
#if APR_HAS_FORK
abts_run_test(suite, test_anon, NULL);
#endif
- abts_run_test(suite, test_named, NULL);
- abts_run_test(suite, test_named_remove, NULL);
- abts_run_test(suite, test_named_delete, NULL);
+ abts_run_test(suite, test_named, NULL);
+ abts_run_test(suite, test_named_remove, NULL);
+ abts_run_test(suite, test_named_delete, NULL);
#endif
return suite;
Modified: apr/apr/trunk/test/testshmconsumer.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testshmconsumer.c?rev=1905414&r1=1905413&r2=1905414&view=diff
==============================================================================
--- apr/apr/trunk/test/testshmconsumer.c (original)
+++ apr/apr/trunk/test/testshmconsumer.c Sun Nov 20 07:14:38 2022
@@ -38,7 +38,7 @@ int main(void)
int recvd;
apr_initialize();
-
+
if (apr_pool_create(&pool, NULL) != APR_SUCCESS) {
exit(-1);
}
@@ -66,7 +66,7 @@ int main(void)
int main(void)
{
/* Just return, this program will never be called, so we don't need
- * to print a message
+ * to print a message
*/
return 0;
}
Modified: apr/apr/trunk/test/testshmproducer.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testshmproducer.c?rev=1905414&r1=1905413&r2=1905414&view=diff
==============================================================================
--- apr/apr/trunk/test/testshmproducer.c (original)
+++ apr/apr/trunk/test/testshmproducer.c Sun Nov 20 07:14:38 2022
@@ -39,7 +39,7 @@ int main(void)
int sent = 0;
apr_initialize();
-
+
if (apr_pool_create(&pool, NULL) != APR_SUCCESS) {
exit(-1);
}
Modified: apr/apr/trunk/test/testskiplist.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testskiplist.c?rev=1905414&r1=1905413&r2=1905414&view=diff
==============================================================================
--- apr/apr/trunk/test/testskiplist.c (original)
+++ apr/apr/trunk/test/testskiplist.c Sun Nov 20 07:14:38 2022
@@ -337,7 +337,7 @@ static int ecomp(void *a, void *b)
* Using apr_skiplist_remove_compare(..., scomp, NULL) would not work because
* it will likely remove any duplicate (the first one) encountered on the path,
* hence possibly not the expected one.
- *
+ *
* Using apr_skiplist_remove_compare(..., ecomp, NULL) works provided all the
* duplicates (same a) don't also have the same b (which is the case in the
* test below), hence uniqueness is cooked in the elem itself.
@@ -385,7 +385,7 @@ static void skiplist_test(abts_case *tc,
ABTS_INT_EQUAL(tc, APR_SUCCESS, apr_skiplist_init(&list, ptmp));
apr_skiplist_set_compare(list, comp, comp);
-
+
/* insert 10 objects */
for (i = 0; i < test_elems; ++i){
add_int_to_skiplist(tc, list, i);
@@ -412,7 +412,7 @@ static void skiplist_test(abts_case *tc,
add_int_to_skiplist(tc, list, 42);
val = apr_skiplist_pop(list, NULL);
- ABTS_INT_EQUAL(tc, *val, 42);
+ ABTS_INT_EQUAL(tc, *val, 42);
/* empty */
val = apr_skiplist_pop(list, NULL);
Modified: apr/apr/trunk/test/testsock.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testsock.c?rev=1905414&r1=1905413&r2=1905414&view=diff
==============================================================================
--- apr/apr/trunk/test/testsock.c (original)
+++ apr/apr/trunk/test/testsock.c Sun Nov 20 07:14:38 2022
@@ -59,7 +59,7 @@ static void launch_child(abts_case *tc,
APR_ASSERT_SUCCESS(tc, "Couldn't launch program", rv);
}
-static int wait_child(abts_case *tc, apr_proc_t *proc)
+static int wait_child(abts_case *tc, apr_proc_t *proc)
{
int exitcode;
apr_exit_why_e why;
@@ -181,11 +181,11 @@ static apr_socket_t *setup_socket(abts_c
rv = apr_socket_opt_set(sock, APR_SO_REUSEADDR, 1);
APR_ASSERT_SUCCESS(tc, "Could not set REUSEADDR on socket", rv);
-
+
rv = apr_socket_bind(sock, sa);
APR_ASSERT_SUCCESS(tc, "Problem binding to port", rv);
if (rv) return NULL;
-
+
rv = apr_socket_listen(sock, 5);
APR_ASSERT_SUCCESS(tc, "Problem listening on socket", rv);
@@ -196,9 +196,9 @@ static void test_create_bind_listen(abts
{
apr_status_t rv;
apr_socket_t *sock = setup_socket(tc);
-
+
if (!sock) return;
-
+
rv = apr_socket_close(sock);
APR_ASSERT_SUCCESS(tc, "Problem closing socket", rv);
}
@@ -216,13 +216,13 @@ static void test_send(abts_case *tc, voi
if (!sock) return;
launch_child(tc, &proc, "read", p);
-
+
rv = apr_socket_accept(&sock2, sock, p);
APR_ASSERT_SUCCESS(tc, "Problem with receiving connection", rv);
apr_socket_protocol_get(sock2, &protocol);
ABTS_INT_EQUAL(tc, APR_PROTO_TCP, protocol);
-
+
length = strlen(DATASTR);
apr_socket_send(sock2, DATASTR, &length);
@@ -244,18 +244,18 @@ static void test_recv(abts_case *tc, voi
int protocol;
apr_size_t length = STRLEN;
char datastr[STRLEN];
-
+
sock = setup_socket(tc);
if (!sock) return;
launch_child(tc, &proc, "write", p);
-
+
rv = apr_socket_accept(&sock2, sock, p);
APR_ASSERT_SUCCESS(tc, "Problem with receiving connection", rv);
apr_socket_protocol_get(sock2, &protocol);
ABTS_INT_EQUAL(tc, APR_PROTO_TCP, protocol);
-
+
memset(datastr, 0, STRLEN);
apr_socket_recv(sock2, datastr, &length);
@@ -338,19 +338,19 @@ static void test_timeout(abts_case *tc,
apr_proc_t proc;
int protocol;
int exit;
-
+
sock = setup_socket(tc);
if (!sock) return;
launch_child(tc, &proc, "read", p);
-
+
rv = apr_socket_accept(&sock2, sock, p);
APR_ASSERT_SUCCESS(tc, "Problem with receiving connection", rv);
apr_socket_protocol_get(sock2, &protocol);
ABTS_INT_EQUAL(tc, APR_PROTO_TCP, protocol);
-
- exit = wait_child(tc, &proc);
+
+ exit = wait_child(tc, &proc);
ABTS_INT_EQUAL(tc, SOCKET_TIMEOUT, exit);
/* We didn't write any data, so make sure the child program returns
@@ -389,10 +389,10 @@ static void test_print_addr(abts_case *t
ABTS_INT_NEQUAL(tc, 0, rc);
memset(buf, 'z', sizeof buf);
-
+
APR_ASSERT_SUCCESS(tc, "could not get IP address",
apr_sockaddr_ip_getbuf(buf, 22, sa));
-
+
ABTS_STR_EQUAL(tc, "0.0.0.0", buf);
}
#endif
@@ -443,7 +443,7 @@ static void test_get_addr(abts_case *tc,
APR_ASSERT_SUCCESS(tc, "accept connection",
apr_socket_accept(&sd, ld, subp));
-
+
{
/* wait for writability */
apr_pollfd_t pfd;
@@ -488,7 +488,7 @@ static void test_get_addr(abts_case *tc,
ABTS_PTR_EQUAL(tc, subp, sa->pool);
ABTS_PTR_EQUAL(tc, subp, ca->pool);
-
+
apr_socket_close(cd);
apr_socket_close(sd);
apr_socket_close(ld);
@@ -614,11 +614,11 @@ static void test_freebind(abts_case *tc,
apr_socket_t *sock;
apr_sockaddr_t *sa;
apr_int32_t on;
-
+
/* RFC 5737 address */
rv = apr_sockaddr_info_get(&sa, "192.0.2.1", APR_INET, 8080, 0, p);
APR_ASSERT_SUCCESS(tc, "Problem generating sockaddr", rv);
-
+
rv = apr_socket_create(&sock, sa->family, SOCK_STREAM, APR_PROTO_TCP, p);
APR_ASSERT_SUCCESS(tc, "Problem creating socket", rv);
@@ -627,14 +627,14 @@ static void test_freebind(abts_case *tc,
rv = apr_socket_opt_set(sock, APR_SO_FREEBIND, 1);
APR_ASSERT_SUCCESS(tc, "Could not enable FREEBIND option", rv);
-
+
rv = apr_socket_opt_get(sock, APR_SO_FREEBIND, &on);
APR_ASSERT_SUCCESS(tc, "Could not retrieve FREEBIND option", rv);
ABTS_INT_EQUAL(tc, 1, on);
-
+
rv = apr_socket_bind(sock, sa);
APR_ASSERT_SUCCESS(tc, "Problem binding to port with FREEBIND", rv);
-
+
rv = apr_socket_close(sock);
APR_ASSERT_SUCCESS(tc, "Problem closing socket", rv);
#endif
@@ -648,7 +648,7 @@ static void test_freebind(abts_case *tc,
/* ... fill in other platforms here */
#endif
-#ifdef TEST_ZONE_NAME
+#ifdef TEST_ZONE_NAME
#define TEST_ZONE_FULLADDR TEST_ZONE_ADDR "%" TEST_ZONE_NAME
#endif
@@ -659,7 +659,7 @@ static void test_zone(abts_case *tc, voi
apr_status_t rv;
const char *name = NULL;
apr_uint32_t id = 0;
-
+
rv = apr_sockaddr_info_get(&sa, "127.0.0.1", APR_INET, 8080, 0, p);
APR_ASSERT_SUCCESS(tc, "Problem generating sockaddr", rv);
@@ -668,7 +668,7 @@ static void test_zone(abts_case *tc, voi
apr_sockaddr_zone_set(sa, "1"));
ABTS_INT_EQUAL(tc, APR_EBADIP,
apr_sockaddr_zone_get(sa, &name, &id, p));
-
+
rv = apr_sockaddr_info_get(&sa, "::1", APR_INET6, 8080, 0, p);
APR_ASSERT_SUCCESS(tc, "Problem generating sockaddr", rv);
@@ -684,13 +684,13 @@ static void test_zone(abts_case *tc, voi
{
apr_sockaddr_t *sa2;
char buf[50];
-
+
APR_ASSERT_SUCCESS(tc, "Set zone to " TEST_ZONE_NAME,
apr_sockaddr_zone_set(sa, TEST_ZONE_NAME));
-
+
APR_ASSERT_SUCCESS(tc, "Get zone",
apr_sockaddr_zone_get(sa, NULL, NULL, p));
-
+
APR_ASSERT_SUCCESS(tc, "Get zone",
apr_sockaddr_zone_get(sa, &name, &id, p));
ABTS_STR_EQUAL(tc, TEST_ZONE_NAME, name);
@@ -704,12 +704,12 @@ static void test_zone(abts_case *tc, voi
memset(buf, 'A', sizeof buf);
ABTS_INT_EQUAL(tc, APR_ENOSPC, apr_sockaddr_ip_getbuf(buf, strlen(TEST_ZONE_ADDR), sa));
ABTS_INT_EQUAL(tc, APR_ENOSPC, apr_sockaddr_ip_getbuf(buf, strlen(TEST_ZONE_FULLADDR), sa));
-
+
APR_ASSERT_SUCCESS(tc, "get IP address",
apr_sockaddr_ip_getbuf(buf, strlen(TEST_ZONE_FULLADDR) + 1, sa));
/* Check for overflow. */
ABTS_INT_EQUAL(tc, 'A', buf[strlen(buf) + 1]);
-
+
rv = apr_sockaddr_info_copy(&sa2, sa, p);
APR_ASSERT_SUCCESS(tc, "Problem copying sockaddr", rv);
@@ -733,7 +733,7 @@ static void test_zone(abts_case *tc, voi
#endif /* TEST_ZONE_NAME */
#endif /* APR_HAVE_IPV6 */
}
-
+
abts_suite *testsock(abts_suite *suite)
{
suite = ADD_SUITE(suite)
Modified: apr/apr/trunk/test/testsockets.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testsockets.c?rev=1905414&r1=1905413&r2=1905414&view=diff
==============================================================================
--- apr/apr/trunk/test/testsockets.c (original)
+++ apr/apr/trunk/test/testsockets.c Sun Nov 20 07:14:38 2022
@@ -234,7 +234,7 @@ abts_suite *testsockets(abts_suite *suit
#endif
abts_run_test(suite, socket_userdata, NULL);
-
+
return suite;
}
Modified: apr/apr/trunk/test/testsockopt.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testsockopt.c?rev=1905414&r1=1905413&r2=1905414&view=diff
==============================================================================
--- apr/apr/trunk/test/testsockopt.c (original)
+++ apr/apr/trunk/test/testsockopt.c Sun Nov 20 07:14:38 2022
@@ -48,7 +48,7 @@ static void set_debug(abts_case *tc, voi
{
apr_status_t rv1, rv2;
apr_int32_t ck;
-
+
/* On some platforms APR_SO_DEBUG can only be set as root; just test
* for get/set consistency of this option. */
rv1 = apr_socket_opt_set(sock, APR_SO_DEBUG, 1);
@@ -108,7 +108,7 @@ static void corkable(abts_case *tc, void
rv = apr_socket_opt_set(sock, APR_TCP_NOPUSH, 0);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
-
+
rv = apr_socket_opt_get(sock, APR_TCP_NODELAY, &ck);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
ABTS_INT_EQUAL(tc, 1, ck);