psyc-mirrors/libpsyc
1
0
Fork 0
mirror of git://git.psyc.eu/libpsyc synced 2024-08-15 03:19:02 +00:00
Code Issues Releases Wiki Activity

refactoring - more renames

Browse source
This commit is contained in:
tg(x) 2011-11-01 12:06:58 +01:00
parent f25e768482
commit 344cdb7996
21 changed files with 215 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

16
test/test_list.c
View file

@ -48,9 +48,9 @@ int main (int argc, char **argv) {
case PSYC_PARSE_LIST_END:
ret = 0;
case PSYC_PARSE_LIST_ELEM:
if (verbose) printf("|%d: %.*s... (%ld)\n", i, 10, elem.ptr, elem.length);
if (verbose) printf("|%d: %.*s... (%ld)\n", i, 10, elem.data, elem.length);
//elems[i] = malloc(elem.length);
//memcpy(&elems[i++], elem.ptr, elem.length);
//memcpy(&elems[i++], elem.data, elem.length);
break;
default:
printf("# Error while parsing list: %i\n", ret);
@ -76,10 +76,10 @@ int main (int argc, char **argv) {
case PSYC_PARSE_LIST_END:
ret = 0;
case PSYC_PARSE_LIST_ELEM:
//if (verbose) printf("|%.*s\n", (int)elem.length, elem.ptr);
if (verbose) printf("|%d: %.*s... (%ld)\n", i, 10, elem.ptr, elem.length);
//if (verbose) printf("|%.*s\n", (int)elem.length, elem.data);
if (verbose) printf("|%d: %.*s... (%ld)\n", i, 10, elem.data, elem.length);
elems[i] = malloc(elem.length);
memcpy(elems[i++], elem.ptr, elem.length);
memcpy(elems[i++], elem.data, elem.length);
break;
default:
printf("# Error while parsing list: %i\n", ret);
@ -111,7 +111,7 @@ int main (int argc, char **argv) {
elems2 = malloc((i+1) * sizeof(char*));
elems2[i] = malloc(elem.length);
memcpy(elems2[i++], elem.ptr, elem.length);
memcpy(elems2[i++], elem.data, elem.length);
break;
default:
printf("# Error while parsing list: %i\n", ret);
@ -145,7 +145,7 @@ int main (int argc, char **argv) {
*/
elems2 = malloc(sizeof(char*));
elems2[i] = malloc(elem.length);
memcpy(elems2[i], elem.ptr, elem.length);
memcpy(elems2[i], elem.data, elem.length);
break;
default:
printf("# Error while parsing list: %i\n", ret);
@ -191,7 +191,7 @@ int main (int argc, char **argv) {
ret = 0;
case PSYC_PARSE_LIST_ELEM:
elems2[i] = malloc(elem.length);
memcpy(elems2[i++], elem.ptr, elem.length);
memcpy(elems2[i++], elem.data, elem.length);
break;
default:
printf("# Error while parsing list: %i\n", ret);

6
test/test_parser.c
View file

@ -53,8 +53,8 @@ int main (int argc, char **argv)
// printf("the string is '%.*s'\n", name);
if (verbose)
printf("%.*s = %.*s\n",
(int)name.length, name.ptr,
(int)value.length, value.ptr);
(int)name.length, name.data,
(int)value.length, value.data);
if (psyc_var_is_list(PSYC_S2ARG(name)))
{
@ -71,7 +71,7 @@ int main (int argc, char **argv)
case PSYC_PARSE_LIST_END:
case PSYC_PARSE_LIST_ELEM:
if (verbose)
printf("|%.*s\n", (int)elem.length, elem.ptr);
printf("|%.*s\n", (int)elem.length, elem.data);
break;
default:
printf("Error while parsing list: %i\n", ret);

24
test/test_psyc.c
View file

@ -82,7 +82,7 @@ int test_input (int i, char *recvbuf, size_t nbytes) {
do {
if (verbose >= 3)
printf("\n# buffer = [%.*s]\n# part = %d\n", (int)parser->buffer.length, parser->buffer.ptr, parser->part);
printf("\n# buffer = [%.*s]\n# part = %d\n", (int)parser->buffer.length, parser->buffer.data, parser->part);
// Parse the next part of the packet (a routing/entity modifier or the body)
ret = exit_code = psyc_parse(parser, &oper, &name, &value);
if (verbose >= 2)
@ -222,15 +222,15 @@ int test_input (int i, char *recvbuf, size_t nbytes) {
}
if (name.length) {
pname->ptr = malloc(name.length);
pname->data = malloc(name.length);
pname->length = name.length;
assert(pname->ptr != NULL);
memcpy((void*)pname->ptr, name.ptr, name.length);
assert(pname->data != NULL);
memcpy((void*)pname->data, name.data, name.length);
name.length = 0;
if (verbose >= 2)
printf("%.*s = ", (int)pname->length, pname->ptr);
printf("%.*s = ", (int)pname->length, pname->data);
}
if (value.length) {
@ -239,15 +239,15 @@ int test_input (int i, char *recvbuf, size_t nbytes) {
len = psyc_parse_value_length(parser);
else
len = value.length;
pvalue->ptr = malloc(len);
pvalue->data = malloc(len);
}
assert(pvalue->ptr != NULL);
memcpy((void*)pvalue->ptr + pvalue->length, value.ptr, value.length);
assert(pvalue->data != NULL);
memcpy((void*)pvalue->data + pvalue->length, value.data, value.length);
pvalue->length += value.length;
value.length = 0;
if (verbose >= 2) {
printf("[%.*s]", (int)pvalue->length, pvalue->ptr);
printf("[%.*s]", (int)pvalue->length, pvalue->data);
if (parser->valueLength > pvalue->length)
printf("...");
printf("\n");
@ -284,7 +284,7 @@ int test_input (int i, char *recvbuf, size_t nbytes) {
retl = 0;
case PSYC_PARSE_LIST_ELEM:
if (verbose >= 2) {
printf("|%.*s\n", (int)elem.length, elem.ptr);
printf("|%.*s\n", (int)elem.length, elem.data);
if (ret == PSYC_PARSE_LIST_END)
printf("## LIST END");
}
@ -311,9 +311,9 @@ static inline
void resetString (PsycString *s, uint8_t freeptr)
{
if (freeptr && s->length)
free((void*)s->ptr);
free((void*)s->data);
s->ptr = NULL;
s->data = NULL;
s->length = 0;
}

12
test/test_text.c
View file

@ -11,7 +11,7 @@ PsycTextValueRC getValueFooBar (const char *name, size_t len, PsycString *value,
{
if (verbose)
printf("> getValue: %.*s\n", (int)len, name);
value->ptr = "Foo Bar";
value->data = "Foo Bar";
value->length = 7;
return PSYC_TEXT_VALUE_FOUND;
}
@ -20,7 +20,7 @@ PsycTextValueRC getValueEmpty (const char *name, size_t len, PsycString *value,
{
if (verbose)
printf("> getValue: %.*s\n", (int)len, name);
value->ptr = "";
value->data = "";
value->length = 0;
return PSYC_TEXT_VALUE_FOUND;
}
@ -54,7 +54,7 @@ int testText (char *template, size_t tmplen, char *buffer, size_t buflen, PsycSt
if (verbose)
printf("%.*s\n", (int)length, buffer);
result->length = length;
result->ptr = buffer;
result->data = buffer;
return ret;
case PSYC_TEXT_NO_SUBST:
if (verbose)
@ -78,11 +78,11 @@ int main(int argc, char **argv)
int i;
testText(str, len, buffer, BUFSIZE, &result, &getValueFooBar);
if (memcmp(result.ptr, PSYC_C2ARG("Hello Foo Bar & Foo Bar!")))
if (memcmp(result.data, PSYC_C2ARG("Hello Foo Bar & Foo Bar!")))
return 1;
testText(str, len, buffer, BUFSIZE, &result, &getValueEmpty);
if (memcmp(result.ptr, PSYC_C2ARG("Hello & !")))
if (memcmp(result.data, PSYC_C2ARG("Hello & !")))
return 2;
if (testText(str, len, buffer, BUFSIZE, &result, &getValueNotFound) != PSYC_TEXT_NO_SUBST)
@ -91,7 +91,7 @@ int main(int argc, char **argv)
for (i = 1; i < 22; i++)
{
testText(str, len, buffer, i, &result, &getValueFooBar);
if (memcmp(result.ptr, PSYC_C2ARG("Hello Foo Bar & Foo Bar!")))
if (memcmp(result.data, PSYC_C2ARG("Hello Foo Bar & Foo Bar!")))
return 10 + i;
}