summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2009-04-15 17:01:32 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2009-04-15 17:01:32 +0000
commit373fbe2dde57b2db0a14329b7bca6ef1f9796035 (patch)
tree0948834142a95889d1553ee138a8d70f163650e1 /test
parent82c9ccd349f10a551ff6df098e9a136982de6e2b (diff)
downloadlibparserutils-373fbe2dde57b2db0a14329b7bca6ef1f9796035.tar.gz
libparserutils-373fbe2dde57b2db0a14329b7bca6ef1f9796035.tar.bz2
c89
svn path=/trunk/libparserutils/; revision=7101
Diffstat (limited to 'test')
-rw-r--r--test/cscodec-8859.c7
-rw-r--r--test/cscodec-ext8.c7
-rw-r--r--test/cscodec-utf16.c17
-rw-r--r--test/cscodec-utf8.c4
4 files changed, 20 insertions, 15 deletions
diff --git a/test/cscodec-8859.c b/test/cscodec-8859.c
index 75ce20e..4d0c8b4 100644
--- a/test/cscodec-8859.c
+++ b/test/cscodec-8859.c
@@ -171,11 +171,12 @@ bool handle_line(const char *data, size_t datalen, void *pw)
} else if (strncasecmp(data+1, "enc", 3) == 0) {
const char *enc = data + 5;
const char *end;
+ char *enc_name;
for (end = enc; !isspace(*end); end++)
;
- char enc_name[end - enc + 1];
+ enc_name = alloca(end - enc + 1);
memcpy(enc_name, enc, end - enc);
enc_name[end - enc] = 0;
@@ -203,7 +204,7 @@ void run_test(line_ctx *ctx)
{
static int testnum;
size_t destlen = ctx->bufused * 4;
- uint8_t dest[destlen];
+ uint8_t *dest = alloca(destlen);
uint8_t *pdest = dest;
const uint8_t *psrc = ctx->buf;
size_t srclen = ctx->bufused;
@@ -219,7 +220,7 @@ void run_test(line_ctx *ctx)
&pdest, &destlen) == ctx->exp_ret);
} else {
size_t templen = ctx->bufused * 4;
- uint8_t temp[templen];
+ uint8_t *temp = alloca(templen);
uint8_t *ptemp = temp;
const uint8_t *ptemp2;
size_t templen2;
diff --git a/test/cscodec-ext8.c b/test/cscodec-ext8.c
index 75ce20e..4d0c8b4 100644
--- a/test/cscodec-ext8.c
+++ b/test/cscodec-ext8.c
@@ -171,11 +171,12 @@ bool handle_line(const char *data, size_t datalen, void *pw)
} else if (strncasecmp(data+1, "enc", 3) == 0) {
const char *enc = data + 5;
const char *end;
+ char *enc_name;
for (end = enc; !isspace(*end); end++)
;
- char enc_name[end - enc + 1];
+ enc_name = alloca(end - enc + 1);
memcpy(enc_name, enc, end - enc);
enc_name[end - enc] = 0;
@@ -203,7 +204,7 @@ void run_test(line_ctx *ctx)
{
static int testnum;
size_t destlen = ctx->bufused * 4;
- uint8_t dest[destlen];
+ uint8_t *dest = alloca(destlen);
uint8_t *pdest = dest;
const uint8_t *psrc = ctx->buf;
size_t srclen = ctx->bufused;
@@ -219,7 +220,7 @@ void run_test(line_ctx *ctx)
&pdest, &destlen) == ctx->exp_ret);
} else {
size_t templen = ctx->bufused * 4;
- uint8_t temp[templen];
+ uint8_t *temp = alloca(templen);
uint8_t *ptemp = temp;
const uint8_t *ptemp2;
size_t templen2;
diff --git a/test/cscodec-utf16.c b/test/cscodec-utf16.c
index d61fd64..e2f3c52 100644
--- a/test/cscodec-utf16.c
+++ b/test/cscodec-utf16.c
@@ -66,13 +66,13 @@ int main(int argc, char **argv)
ctx.buf = malloc(ctx.buflen);
if (ctx.buf == NULL) {
- printf("Failed allocating %zu bytes\n", ctx.buflen);
+ printf("Failed allocating %u bytes\n", (int) ctx.buflen);
return 1;
}
ctx.exp = malloc(ctx.buflen);
if (ctx.exp == NULL) {
- printf("Failed allocating %zu bytes\n", ctx.buflen);
+ printf("Failed allocating %u bytes\n", (int) ctx.buflen);
free(ctx.buf);
return 1;
}
@@ -193,6 +193,8 @@ bool handle_line(const char *data, size_t datalen, void *pw)
if (ctx->indata) {
/* Process "&#xNNNN" as 16-bit code units. */
while (datalen) {
+ uint16_t nCodePoint;
+
if (data[0] == '\n') {
ctx->buf[ctx->bufused++] = *data++;
--datalen;
@@ -205,8 +207,7 @@ bool handle_line(const char *data, size_t datalen, void *pw)
&& isxdigit(data[6]));
/* UTF-16 code is always host endian (different
than UCS-32 !). */
- const uint16_t nCodePoint =
- (hex2digit(data[3]) << 12) |
+ nCodePoint = (hex2digit(data[3]) << 12) |
(hex2digit(data[4]) << 8) |
(hex2digit(data[5]) << 4) |
hex2digit(data[6]);
@@ -220,6 +221,8 @@ bool handle_line(const char *data, size_t datalen, void *pw)
if (ctx->inexp) {
/* Process "&#xXXXXYYYY as 32-bit code units. */
while (datalen) {
+ uint32_t nCodePoint;
+
if (data[0] == '\n') {
ctx->exp[ctx->expused++] = *data++;
--datalen;
@@ -234,7 +237,7 @@ bool handle_line(const char *data, size_t datalen, void *pw)
&& isxdigit(data[10]));
/* UCS-4 code is always big endian, so convert
host endian to big endian. */
- const uint32_t nCodePoint =
+ nCodePoint =
htonl((hex2digit(data[3]) << 28)
| (hex2digit(data[4]) << 24)
| (hex2digit(data[5]) << 20)
@@ -259,7 +262,7 @@ void run_test(line_ctx *ctx)
{
static int testnum;
size_t destlen = ctx->bufused * 4;
- uint8_t dest[destlen];
+ uint8_t *dest = alloca(destlen);
uint8_t *pdest = dest;
const uint8_t *psrc = ctx->buf;
size_t srclen = ctx->bufused;
@@ -275,7 +278,7 @@ void run_test(line_ctx *ctx)
&pdest, &destlen) == ctx->exp_ret);
} else {
size_t templen = ctx->bufused * 4;
- uint8_t temp[templen];
+ uint8_t *temp = alloca(templen);
uint8_t *ptemp = temp;
const uint8_t *ptemp2;
size_t templen2;
diff --git a/test/cscodec-utf8.c b/test/cscodec-utf8.c
index 85d0443..3e18e9e 100644
--- a/test/cscodec-utf8.c
+++ b/test/cscodec-utf8.c
@@ -187,7 +187,7 @@ void run_test(line_ctx *ctx)
{
static int testnum;
size_t destlen = ctx->bufused * 4;
- uint8_t dest[destlen];
+ uint8_t *dest = alloca(destlen);
uint8_t *pdest = dest;
const uint8_t *psrc = ctx->buf;
size_t srclen = ctx->bufused;
@@ -203,7 +203,7 @@ void run_test(line_ctx *ctx)
&pdest, &destlen) == ctx->exp_ret);
} else {
size_t templen = ctx->bufused * 4;
- uint8_t temp[templen];
+ uint8_t *temp = alloca(templen);
uint8_t *ptemp = temp;
const uint8_t *ptemp2;
size_t templen2;