--- libaitio/example/test.c 2010/09/10 12:39:41 1.4 +++ libaitio/example/test.c 2011/04/20 22:56:32 1.5 @@ -55,7 +55,7 @@ int main(int argc, char **argv) if (argc > 1) { struct tagIOURL URL; int ret = 0; - char **item = NULL; + array_t *item = NULL; char szVal[BUFSIZ]; printf("URL:: Return=%x --- URL=%s\n", (ret = ioURLGet(argv[1], &URL)), argv[1]); @@ -70,7 +70,7 @@ int main(int argc, char **argv) printf("URL:: (%x) args=%s(%d)\n", ret & 64, URL.url_args.value, URL.url_args.vallen); printf("URL:: (%x) +++reserved=%s\n", ret & 128, URL.url_reserved); - printf("URL:: Get sizeofArray=%d\n", io_SizeArray(URL.url_args.value, "&")); + printf("URL:: Get argsNum=%d\n", io_argsNum(URL.url_args.value, "&")); memset(szVal, 0, BUFSIZ); printf("Get_url:: %s Attribute=piuk %d\n", szVal, ioURLGetValue(&URL, "piuk", szVal, BUFSIZ)); @@ -82,17 +82,17 @@ int main(int argc, char **argv) printf("File_url:: File=%s %d\n", szVal, ioURLGetFile(&URL, szVal, BUFSIZ)); - printf("URL:: array args=%d\n", io_MakeArray(URL.url_args.value, "&", &item, 4)); - for (ret = 0; ret < 4 && item; ret++) - printf("array:: item[%d]=%s\n", ret, item[ret]); + printf("URL:: array args=%d\n", io_arrayMake(URL.url_args.value, 4, "&", &item)); + for (ret = 0; ret < 4 && item->arr_data[ret]; ret++) + printf("array:: item[%d]=%s\n", ret, item->arr_data[ret]); if (item) - free(item); + io_arrayDestroy(&item); - printf("URL:: array path=%d\n", io_MakeArray(URL.url_path.value, "/", &item, 2)); - for (ret = 0; ret < 2 && item; ret++) - printf("array:: item[%d]=%s\n", ret, item[ret]); + printf("URL:: array path=%d\n", io_arrayMake(URL.url_path.value, 2, "/", &item)); + for (ret = 0; ret < 2 && item->arr_data[ret]; ret++) + printf("array:: item[%d]=%s\n", ret, item->arr_data[ret]); if (item) - free(item); + io_arrayDestroy(&item); } return 0; }