X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=test%2Furls%2Fparse-url.c;h=6637867c50497b5ff668a60194a02033080d0703;hp=cfa67628a96b63ccc564c85adc81d1b9283240bd;hb=9239994cdedfc5dd70e3c5d27ea92754674aaa1f;hpb=6276a57e76cf22aac639236d4782b56e2e5b9d5e diff --git a/test/urls/parse-url.c b/test/urls/parse-url.c index cfa6762..6637867 100644 --- a/test/urls/parse-url.c +++ b/test/urls/parse-url.c @@ -2,24 +2,23 @@ #include #include +#include #include #include int main(int argc, char **argv) { struct pb_url *url; - FILE *null; + void *ctx; if (argc != 2 && argc != 3) { fprintf(stderr, "Usage: %s [update]\n", argv[0]); return EXIT_FAILURE; } - /* discard log output */ - null = fopen("/dev/null", "w"); - pb_log_set_stream(null); + ctx = talloc_new(NULL); - url = pb_url_parse(NULL, argv[1]); + url = pb_url_parse(ctx, argv[1]); if (!url) return EXIT_FAILURE; @@ -27,8 +26,11 @@ int main(int argc, char **argv) printf("%s\n", argv[1]); } else { + struct pb_url *new_url; printf("%s %s\n", argv[1], argv[2]); - url = pb_url_join(NULL, url, argv[2]); + new_url = pb_url_join(ctx, url, argv[2]); + talloc_free(url); + url = new_url; } printf("scheme\t%s\n", pb_url_scheme_name(url->scheme)); @@ -38,5 +40,7 @@ int main(int argc, char **argv) printf("dir\t%s\n", url->dir); printf("file\t%s\n", url->file); + talloc_free(ctx); + return EXIT_SUCCESS; }