aboutsummaryrefslogtreecommitdiffstats
path: root/tests/chardata.c
diff options
context:
space:
mode:
Diffstat (limited to 'tests/chardata.c')
-rw-r--r--tests/chardata.c93
1 files changed, 43 insertions, 50 deletions
diff --git a/tests/chardata.c b/tests/chardata.c
index 53e7333ff172..75a50166ec52 100644
--- a/tests/chardata.c
+++ b/tests/chardata.c
@@ -31,7 +31,7 @@
*/
#ifdef HAVE_EXPAT_CONFIG_H
-# include <expat_config.h>
+# include <expat_config.h>
#endif
#include "minicheck.h"
@@ -41,65 +41,58 @@
#include "chardata.h"
-
static int
-xmlstrlen(const XML_Char *s)
-{
- int len = 0;
- assert(s != NULL);
- while (s[len] != 0)
- ++len;
- return len;
+xmlstrlen(const XML_Char *s) {
+ int len = 0;
+ assert(s != NULL);
+ while (s[len] != 0)
+ ++len;
+ return len;
}
-
void
-CharData_Init(CharData *storage)
-{
- assert(storage != NULL);
- storage->count = -1;
+CharData_Init(CharData *storage) {
+ assert(storage != NULL);
+ storage->count = -1;
}
void
-CharData_AppendXMLChars(CharData *storage, const XML_Char *s, int len)
-{
- int maxchars;
+CharData_AppendXMLChars(CharData *storage, const XML_Char *s, int len) {
+ int maxchars;
- assert(storage != NULL);
- assert(s != NULL);
- maxchars = sizeof(storage->data) / sizeof(storage->data[0]);
- if (storage->count < 0)
- storage->count = 0;
- if (len < 0)
- len = xmlstrlen(s);
- if ((len + storage->count) > maxchars) {
- len = (maxchars - storage->count);
- }
- if (len + storage->count < (int)sizeof(storage->data)) {
- memcpy(storage->data + storage->count, s,
- len * sizeof(storage->data[0]));
- storage->count += len;
- }
+ assert(storage != NULL);
+ assert(s != NULL);
+ maxchars = sizeof(storage->data) / sizeof(storage->data[0]);
+ if (storage->count < 0)
+ storage->count = 0;
+ if (len < 0)
+ len = xmlstrlen(s);
+ if ((len + storage->count) > maxchars) {
+ len = (maxchars - storage->count);
+ }
+ if (len + storage->count < (int)sizeof(storage->data)) {
+ memcpy(storage->data + storage->count, s, len * sizeof(storage->data[0]));
+ storage->count += len;
+ }
}
int
-CharData_CheckXMLChars(CharData *storage, const XML_Char *expected)
-{
- char buffer[1024];
- int len = xmlstrlen(expected);
- int count;
+CharData_CheckXMLChars(CharData *storage, const XML_Char *expected) {
+ char buffer[1024];
+ int len = xmlstrlen(expected);
+ int count;
- assert(storage != NULL);
- count = (storage->count < 0) ? 0 : storage->count;
- if (len != count) {
- sprintf(buffer, "wrong number of data characters: got %d, expected %d",
- count, len);
- fail(buffer);
- return 0;
- }
- if (memcmp(expected, storage->data, len * sizeof(storage->data[0])) != 0) {
- fail("got bad data bytes");
- return 0;
- }
- return 1;
+ assert(storage != NULL);
+ count = (storage->count < 0) ? 0 : storage->count;
+ if (len != count) {
+ sprintf(buffer, "wrong number of data characters: got %d, expected %d",
+ count, len);
+ fail(buffer);
+ return 0;
+ }
+ if (memcmp(expected, storage->data, len * sizeof(storage->data[0])) != 0) {
+ fail("got bad data bytes");
+ return 0;
+ }
+ return 1;
}