From 6dbaaf5430852adcffc2b896ad40ec6a144fe251 Mon Sep 17 00:00:00 2001 From: Thomas Porzelt Date: Tue, 18 Nov 2008 21:43:02 +0100 Subject: [PATCH] fix warnings about shadowed declarations of 'free' and 'value' in headers --- include/lighttpd/actions.h | 2 +- include/lighttpd/http_headers.h | 8 ++++---- include/lighttpd/plugin.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/lighttpd/actions.h b/include/lighttpd/actions.h index 6754176..df84a88 100644 --- a/include/lighttpd/actions.h +++ b/include/lighttpd/actions.h @@ -60,7 +60,7 @@ LI_API void action_release(server *srv, action *a); LI_API void action_acquire(action *a); /* create new action */ LI_API action *action_new_setting(option_set setting); -LI_API action *action_new_function(ActionFunc func, ActionFree free, gpointer param); +LI_API action *action_new_function(ActionFunc func, ActionFree ffree, gpointer param); LI_API action *action_new_list(); LI_API action *action_new_condition(condition *cond, action *target, action *target_else); diff --git a/include/lighttpd/http_headers.h b/include/lighttpd/http_headers.h index 6e0f7fb..8504838 100644 --- a/include/lighttpd/http_headers.h +++ b/include/lighttpd/http_headers.h @@ -27,11 +27,11 @@ LI_API void http_headers_reset(http_headers* headers); LI_API void http_headers_free(http_headers* headers); /** If header does not exist, just insert normal header. If it exists, append (", %s", value) */ -LI_API void http_header_append(http_headers *headers, const gchar *key, size_t keylen, const gchar *value, size_t valuelen); +LI_API void http_header_append(http_headers *headers, const gchar *key, size_t keylen, const gchar *val, size_t valuelen); /** If header does not exist, just insert normal header. If it exists, append ("\r\n%s: %s", key, value) */ -LI_API void http_header_insert(http_headers *headers, const gchar *key, size_t keylen, const gchar *value, size_t valuelen); +LI_API void http_header_insert(http_headers *headers, const gchar *key, size_t keylen, const gchar *val, size_t valuelen); /** If header does not exist, just insert normal header. If it exists, overwrite the value */ -LI_API void http_header_overwrite(http_headers *headers, const gchar *key, size_t keylen, const gchar *value, size_t valuelen); +LI_API void http_header_overwrite(http_headers *headers, const gchar *key, size_t keylen, const gchar *val, size_t valuelen); LI_API gboolean http_header_remove(http_headers *headers, const gchar *key, size_t keylen); LI_API void http_header_remove_link(http_headers *headers, GList *l); @@ -42,7 +42,7 @@ LI_API GList* http_header_find_next(GList *l, const gchar *key, size_t keylen); LI_API GList* http_header_find_last(http_headers *headers, const gchar *key, size_t keylen); /** Use lowercase keys! values are compared case-insensitive */ -LI_API gboolean http_header_is(http_headers *headers, const gchar *key, size_t keylen, const gchar *value, size_t valuelen); +LI_API gboolean http_header_is(http_headers *headers, const gchar *key, size_t keylen, const gchar *val, size_t valuelen); /** concats all headers with key with ', ' - empty if no header exists - use lowercase key*/ LI_API void http_header_get_fast(GString *dest, http_headers *headers, const gchar *key, size_t keylen); diff --git a/include/lighttpd/plugin.h b/include/lighttpd/plugin.h index 62155f5..77b2452 100644 --- a/include/lighttpd/plugin.h +++ b/include/lighttpd/plugin.h @@ -126,11 +126,11 @@ LI_API void plugins_handle_close(connection *con); /* Needed for config frontends */ /** For parsing 'somemod.option = "somevalue"', free value after call */ -LI_API action* option_action(server *srv, const gchar *name, value *value); +LI_API action* option_action(server *srv, const gchar *name, value *val); /** For parsing 'somemod.action value', e.g. 'rewrite "/url" => "/destination"' * free value after call */ -LI_API action* create_action(server *srv, const gchar *name, value *value); +LI_API action* create_action(server *srv, const gchar *name, value *val); /** For setup function, e.g. 'listen "127.0.0.1:8080"'; free value after call */ LI_API gboolean call_setup(server *srv, const char *name, value *val);