From 87b34e1ddd22cf575c994ab04c2185f3cab6a9f6 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Mon, 5 Dec 2016 19:01:14 +0000 Subject: Modify some "free" references which were failing to build with clib2 debug mode --- content/fetch.c | 2 +- content/fetchers.h | 2 +- content/fetchers/about.c | 2 +- content/fetchers/curl.c | 2 +- content/fetchers/data.c | 2 +- content/fetchers/file.c | 2 +- content/fetchers/resource.c | 2 +- content/handlers/html/html_css_fetcher.c | 2 +- content/handlers/javascript/fetcher.c | 2 +- utils/http/generics.c | 2 +- utils/http/generics.h | 4 ++-- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/content/fetch.c b/content/fetch.c index 766502941..e6af45a1d 100644 --- a/content/fetch.c +++ b/content/fetch.c @@ -598,7 +598,7 @@ void fetch_free(struct fetch *f) f, f->fetcher_handle); - fetchers[f->fetcherd].ops.free(f->fetcher_handle); + fetchers[f->fetcherd].ops.ffree(f->fetcher_handle); fetch_unref_fetcher(f->fetcherd); diff --git a/content/fetchers.h b/content/fetchers.h index 6392e245e..36d77c1a9 100644 --- a/content/fetchers.h +++ b/content/fetchers.h @@ -83,7 +83,7 @@ struct fetcher_operation_table { /** * free a fetch allocated through the setup method. */ - void (*free)(void *fetch); + void (*ffree)(void *fetch); /** * poll a fetcher to let it make progress. diff --git a/content/fetchers/about.c b/content/fetchers/about.c index 4d14020b0..76985a76e 100644 --- a/content/fetchers/about.c +++ b/content/fetchers/about.c @@ -853,7 +853,7 @@ nserror fetch_about_register(void) .setup = fetch_about_setup, .start = fetch_about_start, .abort = fetch_about_abort, - .free = fetch_about_free, + .ffree = fetch_about_free, .poll = fetch_about_poll, .finalise = fetch_about_finalise }; diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c index c039429a5..e54f8633b 100644 --- a/content/fetchers/curl.c +++ b/content/fetchers/curl.c @@ -1484,7 +1484,7 @@ nserror fetch_curl_register(void) .setup = fetch_curl_setup, .start = fetch_curl_start, .abort = fetch_curl_abort, - .free = fetch_curl_free, + .ffree = fetch_curl_free, .poll = fetch_curl_poll, .fdset = fetch_curl_fdset, .finalise = fetch_curl_finalise diff --git a/content/fetchers/data.c b/content/fetchers/data.c index 8c04bcfea..cb7dbdc32 100644 --- a/content/fetchers/data.c +++ b/content/fetchers/data.c @@ -316,7 +316,7 @@ nserror fetch_data_register(void) .setup = fetch_data_setup, .start = fetch_data_start, .abort = fetch_data_abort, - .free = fetch_data_free, + .ffree = fetch_data_free, .poll = fetch_data_poll, .finalise = fetch_data_finalise }; diff --git a/content/fetchers/file.c b/content/fetchers/file.c index 4fa1a2138..52c026311 100644 --- a/content/fetchers/file.c +++ b/content/fetchers/file.c @@ -827,7 +827,7 @@ nserror fetch_file_register(void) .setup = fetch_file_setup, .start = fetch_file_start, .abort = fetch_file_abort, - .free = fetch_file_free, + .ffree = fetch_file_free, .poll = fetch_file_poll, .finalise = fetch_file_finalise }; diff --git a/content/fetchers/resource.c b/content/fetchers/resource.c index 78757733e..3177e7cfe 100644 --- a/content/fetchers/resource.c +++ b/content/fetchers/resource.c @@ -464,7 +464,7 @@ nserror fetch_resource_register(void) .setup = fetch_resource_setup, .start = fetch_resource_start, .abort = fetch_resource_abort, - .free = fetch_resource_free, + .ffree = fetch_resource_free, .poll = fetch_resource_poll, .finalise = fetch_resource_finalise }; diff --git a/content/handlers/html/html_css_fetcher.c b/content/handlers/html/html_css_fetcher.c index 7987ea094..cf2aa39c9 100644 --- a/content/handlers/html/html_css_fetcher.c +++ b/content/handlers/html/html_css_fetcher.c @@ -291,7 +291,7 @@ nserror html_css_fetcher_register(void) .setup = html_css_fetcher_setup, .start = html_css_fetcher_start, .abort = html_css_fetcher_abort, - .free = html_css_fetcher_free, + .ffree = html_css_fetcher_free, .poll = html_css_fetcher_poll, .finalise = html_css_fetcher_finalise }; diff --git a/content/handlers/javascript/fetcher.c b/content/handlers/javascript/fetcher.c index 839df265a..80a53d809 100644 --- a/content/handlers/javascript/fetcher.c +++ b/content/handlers/javascript/fetcher.c @@ -208,7 +208,7 @@ nserror fetch_javascript_register(void) .setup = fetch_javascript_setup, .start = fetch_javascript_start, .abort = fetch_javascript_abort, - .free = fetch_javascript_free, + .ffree = fetch_javascript_free, .poll = fetch_javascript_poll, .finalise = fetch_javascript_finalise }; diff --git a/utils/http/generics.c b/utils/http/generics.c index e0798f901..054446e4c 100644 --- a/utils/http/generics.c +++ b/utils/http/generics.c @@ -33,7 +33,7 @@ void http___item_list_destroy(http__item *list) list = victim->next; - victim->free(victim); + victim->ffree(victim); } } diff --git a/utils/http/generics.h b/utils/http/generics.h index a5af73458..878627ed4 100644 --- a/utils/http/generics.h +++ b/utils/http/generics.h @@ -29,12 +29,12 @@ typedef struct http__item { struct http__item *next; /**< Next item in list, or NULL */ - void (*free)(struct http__item *self); /**< Item destructor */ + void (*ffree)(struct http__item *self); /**< Item destructor */ } http__item; #define HTTP__ITEM_INIT(item, n, f) \ ((http__item *) (item))->next = (http__item *) (n); \ - ((http__item *) (item))->free = (void (*)(http__item *)) (f) + ((http__item *) (item))->ffree = (void (*)(http__item *)) (f) /** * Type of an item parser -- cgit v1.2.3