X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=test%2Ftest_nmem.c;h=5eaab6058c8ffcba717489c2fe90153039f952b9;hp=1fac28347e66a5d54adc71e7b2a644a15d6d776b;hb=800e0637cfe783fa9966e11712b7e20023ba2245;hpb=474209f883ef0abea418e5fe2e3e2451b2ff3a0e diff --git a/test/test_nmem.c b/test/test_nmem.c index 1fac283..5eaab60 100644 --- a/test/test_nmem.c +++ b/test/test_nmem.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2011 Index Data + * Copyright (C) Index Data * See the file LICENSE for details. */ @@ -36,7 +36,7 @@ void tst_nmem_malloc(void) if ((int) sizeof(double) >= j) *(double*) cp = 12.2; } - + for (j = 2000; j<20000; j+= 2000) { cp = (char *) nmem_malloc(n, j); @@ -57,7 +57,7 @@ void tst_nmem_strsplit(void) nmem_strsplitx(nmem, ",", "", &array, &num, 0); YAZ_CHECK(num == 1); YAZ_CHECK(num > 0 && !strcmp(array[0], "")); - + nmem_strsplit(nmem, ",", ",,", &array, &num); YAZ_CHECK(num == 0); @@ -66,7 +66,7 @@ void tst_nmem_strsplit(void) YAZ_CHECK(num > 0 && !strcmp(array[0], "")); YAZ_CHECK(num > 1 && !strcmp(array[1], "")); YAZ_CHECK(num > 2 && !strcmp(array[2], "")); - + nmem_strsplit(nmem, ",", ",a,b,,cd", &array, &num); YAZ_CHECK(num == 3); YAZ_CHECK(num > 0 && !strcmp(array[0], "a")); @@ -102,11 +102,19 @@ void tst_nmem_strsplit(void) YAZ_CHECK(num > 1 && !strcmp(array[1], "b,")); YAZ_CHECK(num > 2 && !strcmp(array[2], "cd")); - nmem_strsplit_escape(nmem, ",", "\\,a,b\\,\\,c\\\\\\|d", &array, &num, 0, '\\'); + nmem_strsplit_escape2(nmem, ",", "\\,a,b\\,\\,c\\\\\\|d", + &array, &num, 0, '\\', 1); YAZ_CHECK(num == 2); YAZ_CHECK(num > 0 && !strcmp(array[0], ",a")); YAZ_CHECK(num > 1 && !strcmp(array[1], "b,,c\\|d")); + + nmem_strsplit_escape2(nmem, ",", "\\,a,b\\,\\,c\\\\\\|d", + &array, &num, 0, '\\', 0); + YAZ_CHECK(num == 2); + YAZ_CHECK(num > 0 && !strcmp(array[0], "\\,a")); + YAZ_CHECK(num > 1 && !strcmp(array[1], "b\\,\\,c\\\\\\|d")); + nmem_destroy(nmem); }