rbb 2004/03/16 15:33:32
Modified: docs/coverage apr_pools.c.gcov apr_strnatcmp.c.gcov
index.html rand.c.gcov sockets.c.gcov
Log:
Add coverage information after adding teststrnatcmp.
Revision Changes Path
1.7 +10 -10 apr-site/docs/coverage/apr_pools.c.gcov
Index: apr_pools.c.gcov
===================================================================
RCS file: /home/cvs/apr-site/docs/coverage/apr_pools.c.gcov,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- apr_pools.c.gcov 15 Mar 2004 18:43:28 -0000 1.6
+++ apr_pools.c.gcov 16 Mar 2004 23:33:32 -0000 1.7
@@ -204,9 +204,9 @@
124 max_index = allocator->max_index;
124 ref = &allocator->free[index];
124 i = index;
- 128 while (*ref == NULL && i < max_index) {
- 4 ref++;
- 4 i++;
+ 132 while (*ref == NULL && i < max_index) {
+ 8 ref++;
+ 8 i++;
}
124 if ((node = *ref) != NULL) {
@@ -216,18 +216,18 @@
* available index
*/
124 if ((*ref = node->next) == NULL && i >=
max_index) {
- 53 do {
- 53 ref--;
- 53 max_index--;
- 53 }
+ 54 do {
+ 54 ref--;
+ 54 max_index--;
+ 54 }
while (*ref == NULL && max_index > 0);
- 53 allocator->max_index = max_index;
+ 54 allocator->max_index = max_index;
}
124 allocator->current_free_index += node->index;
124 if (allocator->current_free_index >
allocator->max_free_index)
- 85 allocator->current_free_index =
allocator->max_free_index;
+ 83 allocator->current_free_index =
allocator->max_free_index;
#if APR_HAS_THREADS
124 if (allocator->mutex)
@@ -334,7 +334,7 @@
*/
294 if ((node->next = allocator->free[index]) == NULL
&& index > max_index) {
- 64 max_index = index;
+ 65 max_index = index;
}
294 allocator->free[index] = node;
294 current_free_index -= index;
1.2 +40 -40 apr-site/docs/coverage/apr_strnatcmp.c.gcov
Index: apr_strnatcmp.c.gcov
===================================================================
RCS file: /home/cvs/apr-site/docs/coverage/apr_strnatcmp.c.gcov,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apr_strnatcmp.c.gcov 9 Mar 2004 19:07:38 -0000 1.1
+++ apr_strnatcmp.c.gcov 16 Mar 2004 23:33:32 -0000 1.2
@@ -35,31 +35,31 @@
static int
compare_right(char const *a, char const *b)
- ###### {
- ###### int bias = 0;
+ 1 {
+ 1 int bias = 0;
/* The longest run of digits wins. That aside, the
greatest
value wins, but we can't know that it will until we've
scanned
both numbers to know that they have the same magnitude,
so we
remember it in BIAS. */
- ###### for (;; a++, b++) {
- ###### if (!apr_isdigit(*a) && !apr_isdigit(*b))
+ 3 for (;; a++, b++) {
+ 2 if (!apr_isdigit(*a) && !apr_isdigit(*b))
###### return bias;
- ###### else if (!apr_isdigit(*a))
- ###### return -1;
- ###### else if (!apr_isdigit(*b))
+ 2 else if (!apr_isdigit(*a))
+ 1 return -1;
+ 1 else if (!apr_isdigit(*b))
###### return +1;
- ###### else if (*a < *b) {
+ 1 else if (*a < *b) {
###### if (!bias)
###### bias = -1;
- ###### } else if (*a > *b) {
- ###### if (!bias)
- ###### bias = +1;
+ 1 } else if (*a > *b) {
+ 1 if (!bias)
+ 1 bias = +1;
###### } else if (!*a && !*b)
###### return bias;
}
- ###### return 0;
+ 1 return 0;
}
@@ -86,64 +86,64 @@
static int strnatcmp0(char const *a, char const *b, int
fold_case)
- ###### {
- ###### int ai, bi;
- ###### char ca, cb;
- ###### int fractional, result;
- ###### ai = bi = 0;
- ###### while (1) {
- ###### ca = a[ai]; cb = b[bi];
+ 7 {
+ 7 int ai, bi;
+ 7 char ca, cb;
+ 7 int fractional, result;
+ 7 ai = bi = 0;
+ 10 while (1) {
+ 10 ca = a[ai]; cb = b[bi];
/* skip over leading spaces or zeros */
- ###### while (apr_isspace(ca))
+ 10 while (apr_isspace(ca))
###### ca = a[++ai];
- ###### while (apr_isspace(cb))
+ 10 while (apr_isspace(cb))
###### cb = b[++bi];
/* process run of digits */
- ###### if (apr_isdigit(ca) && apr_isdigit(cb)) {
- ###### fractional = (ca == '0' || cb == '0');
+ 10 if (apr_isdigit(ca) && apr_isdigit(cb)) {
+ 1 fractional = (ca == '0' || cb == '0');
- ###### if (fractional) {
+ 1 if (fractional) {
###### if ((result = compare_left(a+ai, b+bi)) !=
0)
###### return result;
} else {
- ###### if ((result = compare_right(a+ai, b+bi)) !=
0)
- ###### return result;
+ 1 if ((result = compare_right(a+ai, b+bi)) !=
0)
+ 1 return result;
}
}
- ###### if (!ca && !cb) {
+ 9 if (!ca && !cb) {
/* The strings compare the same. Perhaps the
caller
will want to call strcmp to break the tie. */
- ###### return 0;
+ 2 return 0;
}
- ###### if (fold_case) {
- ###### ca = apr_toupper(ca);
- ###### cb = apr_toupper(cb);
+ 7 if (fold_case) {
+ 4 ca = apr_toupper(ca);
+ 4 cb = apr_toupper(cb);
}
- ###### if (ca < cb)
- ###### return -1;
- ###### else if (ca > cb)
- ###### return +1;
+ 7 if (ca < cb)
+ 2 return -1;
+ 5 else if (ca > cb)
+ 2 return +1;
- ###### ++ai; ++bi;
+ 3 ++ai; ++bi;
}
}
APR_DECLARE(int) apr_strnatcmp(char const *a, char const *b)
- ###### {
- ###### return strnatcmp0(a, b, 0);
+ 3 {
+ 3 return strnatcmp0(a, b, 0);
}
/* Compare, recognizing numeric string and ignoring case. */
APR_DECLARE(int) apr_strnatcasecmp(char const *a, char const *b)
- ###### {
- ###### return strnatcmp0(a, b, 1);
+ 4 {
+ 4 return strnatcmp0(a, b, 1);
}
1.12 +3 -3 apr-site/docs/coverage/index.html
Index: index.html
===================================================================
RCS file: /home/cvs/apr-site/docs/coverage/index.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- index.html 15 Mar 2004 18:43:28 -0000 1.11
+++ index.html 16 Mar 2004 23:33:32 -0000 1.12
@@ -101,8 +101,8 @@
<td bgcolor=#ffff77><a href="apr_strings.c.gcov">apr_strings</a><br>
<td bgcolor=#ffff77> 36.59% tested
<tr>
-<td bgcolor=#ffaaaa><a href="apr_strnatcmp.c.gcov">apr_strnatcmp</a><br>
-<td bgcolor=#ffaaaa> 0.00% tested
+<td bgcolor=#ffff77><a href="apr_strnatcmp.c.gcov">apr_strnatcmp</a><br>
+<td bgcolor=#ffff77> 63.49% tested
<tr>
<td bgcolor=#aaffaa><a href="apr_strtok.c.gcov">apr_strtok</a><br>
<td bgcolor=#aaffaa>100.00% tested
@@ -261,7 +261,7 @@
<tr>
<td bgcolor=#aaffaa><a href="waitio.c.gcov">waitio</a><br>
<td bgcolor=#aaffaa> 92.86% tested
-</table><p>Last generated Mon Mar 15 13:26:07 EST 2004</p>
+</table><p>Last generated Tue Mar 16 18:17:48 EST 2004</p>
</td></tr>
</table>
<!-- FOOTER -->
1.2 +1 -1 apr-site/docs/coverage/rand.c.gcov
Index: rand.c.gcov
===================================================================
RCS file: /home/cvs/apr-site/docs/coverage/rand.c.gcov,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rand.c.gcov 9 Mar 2004 19:07:38 -0000 1.1
+++ rand.c.gcov 16 Mar 2004 23:33:32 -0000 1.2
@@ -198,7 +198,7 @@
#undef XSTR
#ifdef OS2
- #include "../os2/randbyte.c"
+ #include "randbyte_os2.inc"
#endif
#endif /* APR_HAS_RANDOM */
1.4 +7 -0 apr-site/docs/coverage/sockets.c.gcov
Index: sockets.c.gcov
===================================================================
RCS file: /home/cvs/apr-site/docs/coverage/sockets.c.gcov,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sockets.c.gcov 15 Mar 2004 03:38:39 -0000 1.3
+++ sockets.c.gcov 16 Mar 2004 23:33:32 -0000 1.4
@@ -167,6 +167,13 @@
3 if ((*new)->socketdes < 0) {
###### return errno;
}
+ #ifdef TPF
+ if ((*new)->socketdes == 0) {
+ /* 0 is an invalid socket for TPF */
+ return APR_EINTR;
+ }
+ #endif
+
3 *(*new)->local_addr = *sock->local_addr;
/* The above assignment just overwrote the pool entry.
Setting the local_addr
