You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ki...@apache.org on 2013/12/04 00:38:35 UTC
[1/2] git commit: Fix build problem on some platforms for ts_lua
plugin
Updated Branches:
refs/heads/master e4a806d1f -> 2b6a5f6bb
Fix build problem on some platforms for ts_lua plugin
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/5dcbbb18
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/5dcbbb18
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/5dcbbb18
Branch: refs/heads/master
Commit: 5dcbbb18775c7615a8696d9b7ff20916a66eb3ec
Parents: 12b687f
Author: Kit Chan <ki...@apache.org>
Authored: Tue Dec 3 23:33:42 2013 +0000
Committer: Kit Chan <ki...@apache.org>
Committed: Tue Dec 3 23:33:42 2013 +0000
----------------------------------------------------------------------
plugins/experimental/ts_lua/ts_lua.c | 4 ++--
plugins/experimental/ts_lua/ts_lua_client_request.c | 2 +-
plugins/experimental/ts_lua/ts_lua_client_response.c | 2 +-
plugins/experimental/ts_lua/ts_lua_common.h | 1 +
plugins/experimental/ts_lua/ts_lua_transform.c | 2 +-
plugins/experimental/ts_lua/ts_lua_util.c | 2 +-
6 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5dcbbb18/plugins/experimental/ts_lua/ts_lua.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua.c b/plugins/experimental/ts_lua/ts_lua.c
index 3a00efe..ca78665 100644
--- a/plugins/experimental/ts_lua/ts_lua.c
+++ b/plugins/experimental/ts_lua/ts_lua.c
@@ -31,7 +31,7 @@ ts_lua_main_ctx *ts_lua_main_ctx_array;
TSReturnCode
-TSRemapInit(TSRemapInterface *api_info, char *errbuf, int errbuf_size)
+TSRemapInit(TSRemapInterface *api_info, char * errbuf ATS_UNUSED , int errbuf_size ATS_UNUSED )
{
int ret;
@@ -53,7 +53,7 @@ TSRemapInit(TSRemapInterface *api_info, char *errbuf, int errbuf_size)
}
TSReturnCode
-TSRemapNewInstance(int argc, char* argv[], void** ih, char* errbuf, int errbuf_size)
+TSRemapNewInstance(int argc, char* argv[], void** ih, char* errbuf ATS_UNUSED , int errbuf_size ATS_UNUSED )
{
int ret = 0;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5dcbbb18/plugins/experimental/ts_lua/ts_lua_client_request.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_client_request.c b/plugins/experimental/ts_lua/ts_lua_client_request.c
index 8e44eaf..2dffed8 100644
--- a/plugins/experimental/ts_lua/ts_lua_client_request.c
+++ b/plugins/experimental/ts_lua/ts_lua_client_request.c
@@ -92,7 +92,7 @@ ts_lua_inject_client_request_client_addr_api(lua_State *L)
}
static void
-ts_lua_inject_client_request_server_addr_api(lua_State *L)
+ts_lua_inject_client_request_server_addr_api(lua_State *L ATS_UNUSED)
{
return;
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5dcbbb18/plugins/experimental/ts_lua/ts_lua_client_response.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_client_response.c b/plugins/experimental/ts_lua/ts_lua_client_response.c
index 7e7351f..453be24 100644
--- a/plugins/experimental/ts_lua/ts_lua_client_response.c
+++ b/plugins/experimental/ts_lua/ts_lua_client_response.c
@@ -161,7 +161,7 @@ ts_lua_client_response_header_set(lua_State *L)
}
static void
-ts_lua_inject_client_response_header_misc_api(lua_State *L)
+ts_lua_inject_client_response_header_misc_api(lua_State *L ATS_UNUSED)
{
return;
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5dcbbb18/plugins/experimental/ts_lua/ts_lua_common.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_common.h b/plugins/experimental/ts_lua/ts_lua_common.h
index 45a120b..66ba35e 100644
--- a/plugins/experimental/ts_lua/ts_lua_common.h
+++ b/plugins/experimental/ts_lua/ts_lua_common.h
@@ -31,6 +31,7 @@
#include <ts/ts.h>
#include <ts/experimental.h>
#include <ts/remap.h>
+#include "ink_defs.h"
#include "ts_lua_atomic.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5dcbbb18/plugins/experimental/ts_lua/ts_lua_transform.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_transform.c b/plugins/experimental/ts_lua/ts_lua_transform.c
index f71269e..8bdb055 100644
--- a/plugins/experimental/ts_lua/ts_lua_transform.c
+++ b/plugins/experimental/ts_lua/ts_lua_transform.c
@@ -24,7 +24,7 @@ static int ts_lua_transform_handler(TSCont contp, ts_lua_transform_ctx *transfor
int
-ts_lua_transform_entry(TSCont contp, TSEvent event, void *edata)
+ts_lua_transform_entry(TSCont contp, TSEvent event, void *edata ATS_UNUSED )
{
TSVIO input_vio;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5dcbbb18/plugins/experimental/ts_lua/ts_lua_util.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_util.c b/plugins/experimental/ts_lua/ts_lua_util.c
index 6cda925..b79b7da 100644
--- a/plugins/experimental/ts_lua/ts_lua_util.c
+++ b/plugins/experimental/ts_lua/ts_lua_util.c
@@ -170,7 +170,7 @@ ts_lua_add_module(ts_lua_instance_conf *conf, ts_lua_main_ctx *arr, int n, int a
static
-void ts_lua_init_registry(lua_State *L)
+void ts_lua_init_registry(lua_State *L ATS_UNUSED)
{
return;
}
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/trafficserver
Posted by ki...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/2b6a5f6b
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/2b6a5f6b
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/2b6a5f6b
Branch: refs/heads/master
Commit: 2b6a5f6bb391109f669b6f51b724da01d09c60a0
Parents: 5dcbbb1 e4a806d
Author: Kit Chan <ki...@apache.org>
Authored: Tue Dec 3 23:36:18 2013 +0000
Committer: Kit Chan <ki...@apache.org>
Committed: Tue Dec 3 23:36:18 2013 +0000
----------------------------------------------------------------------
doc/admin/faqs.en.rst | 2 +-
doc/reference/configuration/records.config.en.rst | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------