summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2016-12-05 19:01:14 (GMT)
committer Chris Young <chris@unsatisfactorysoftware.co.uk>2016-12-05 19:01:14 (GMT)
commit6f7dc59aecce1b8bc619bd99c04a2be7e5eaa3c9 (patch)
tree2d6774fac97c8a4c9223a7e15063ffc795959bbb
parent06c85e1df894a99b77a9539decdaf8ba862c7883 (diff)
downloadnetsurf-6f7dc59aecce1b8bc619bd99c04a2be7e5eaa3c9.tar.gz
netsurf-6f7dc59aecce1b8bc619bd99c04a2be7e5eaa3c9.tar.bz2
Modify some "free" references which were failing to build with clib2 debug modechris/debug
-rw-r--r--content/fetch.c2
-rw-r--r--content/fetchers.h2
-rw-r--r--content/fetchers/about.c2
-rw-r--r--content/fetchers/curl.c2
-rw-r--r--content/fetchers/data.c2
-rw-r--r--content/fetchers/file.c2
-rw-r--r--content/fetchers/resource.c2
-rw-r--r--content/handlers/javascript/fetcher.c2
-rw-r--r--render/html_css_fetcher.c2
-rw-r--r--utils/http/generics.c2
-rw-r--r--utils/http/generics.h4
11 files changed, 12 insertions, 12 deletions
diff --git a/content/fetch.c b/content/fetch.c
index 93c7de2..110ed08 100644
--- a/content/fetch.c
+++ b/content/fetch.c
@@ -595,7 +595,7 @@ void fetch_free(struct fetch *f)
{
FETCH_LOG("Freeing fetch %p, fetcher %p", 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 6392e24..36d77c1 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 4d14020..76985a7 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 7d0e40c..2975f36 100644
--- a/content/fetchers/curl.c
+++ b/content/fetchers/curl.c
@@ -1421,7 +1421,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 139d09a..0d92ad2 100644
--- a/content/fetchers/data.c
+++ b/content/fetchers/data.c
@@ -326,7 +326,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 6ffa638..292b4d5 100644
--- a/content/fetchers/file.c
+++ b/content/fetchers/file.c
@@ -826,7 +826,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 21ad8c7..8626942 100644
--- a/content/fetchers/resource.c
+++ b/content/fetchers/resource.c
@@ -461,7 +461,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/javascript/fetcher.c b/content/handlers/javascript/fetcher.c
index 839df26..80a53d8 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/render/html_css_fetcher.c b/render/html_css_fetcher.c
index 05aef02..ac312a7 100644
--- a/render/html_css_fetcher.c
+++ b/render/html_css_fetcher.c
@@ -283,7 +283,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/utils/http/generics.c b/utils/http/generics.c
index e0798f9..054446e 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 8c391c4..42e0983 100644
--- a/utils/http/generics.h
+++ b/utils/http/generics.h
@@ -27,12 +27,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