You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2015/02/12 01:45:03 UTC
trafficserver git commit: TS-3387: convert ink_args to accept an
array of constant strings
Repository: trafficserver
Updated Branches:
refs/heads/master 3f8fb9279 -> 453e3047b
TS-3387: convert ink_args to accept an array of constant strings
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/453e3047
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/453e3047
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/453e3047
Branch: refs/heads/master
Commit: 453e3047b0174ef2f0c90335d0ad18f64678cd25
Parents: 3f8fb92
Author: James Peach <jp...@apache.org>
Authored: Tue Feb 3 12:33:15 2015 -0800
Committer: James Peach <jp...@apache.org>
Committed: Wed Feb 11 16:34:08 2015 -0800
----------------------------------------------------------------------
CHANGES | 2 ++
cmd/traffic_cop/traffic_cop.cc | 2 +-
cmd/traffic_crashlog/traffic_crashlog.cc | 2 +-
cmd/traffic_layout/traffic_layout.cc | 2 +-
cmd/traffic_line/traffic_line.cc | 2 +-
cmd/traffic_via/traffic_via.cc | 2 +-
lib/ts/ink_args.cc | 6 +++---
lib/ts/ink_args.h | 2 +-
proxy/IPAllow.h | 1 -
proxy/Main.cc | 2 +-
proxy/logcat.cc | 2 +-
proxy/logstats.cc | 6 +++---
proxy/sac.cc | 2 +-
tools/jtest/jtest.cc | 2 +-
14 files changed, 18 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/453e3047/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index ec6818c..9143b94 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 5.3.0
+ *) [TS-3387] Convert ink_args to accept an array of constant strings.
+
*) [TS-3385] show script loading error when using lua plugin as remap plugin.
*) [TS-3346] support TS Stat api in lua plugin.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/453e3047/cmd/traffic_cop/traffic_cop.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_cop/traffic_cop.cc b/cmd/traffic_cop/traffic_cop.cc
index ccbc976..6fde7aa 100644
--- a/cmd/traffic_cop/traffic_cop.cc
+++ b/cmd/traffic_cop/traffic_cop.cc
@@ -1829,7 +1829,7 @@ static const ArgumentDescription argument_descriptions[] = {
};
int
-main(int /* argc */, char *argv[])
+main(int /* argc */, const char *argv[])
{
int fd;
appVersionInfo.setup(PACKAGE_NAME,"traffic_cop", PACKAGE_VERSION, __DATE__, __TIME__, BUILD_MACHINE, BUILD_PERSON, "");
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/453e3047/cmd/traffic_crashlog/traffic_crashlog.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_crashlog/traffic_crashlog.cc b/cmd/traffic_crashlog/traffic_crashlog.cc
index 39f0ec1..c459549 100644
--- a/cmd/traffic_crashlog/traffic_crashlog.cc
+++ b/cmd/traffic_crashlog/traffic_crashlog.cc
@@ -83,7 +83,7 @@ crashlog_open(const char * path)
}
int
-main(int /* argc ATS_UNUSED */, char **argv)
+main(int /* argc ATS_UNUSED */, const char **argv)
{
FILE * fp;
char * logname;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/453e3047/cmd/traffic_layout/traffic_layout.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_layout/traffic_layout.cc b/cmd/traffic_layout/traffic_layout.cc
index b410f34..58174e2 100644
--- a/cmd/traffic_layout/traffic_layout.cc
+++ b/cmd/traffic_layout/traffic_layout.cc
@@ -41,7 +41,7 @@ printvar(const char * name, char * val)
}
int
-main(int /* argc ATS_UNUSED */, char **argv)
+main(int /* argc ATS_UNUSED */, const char **argv)
{
AppVersionInfo appVersionInfo;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/453e3047/cmd/traffic_line/traffic_line.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_line/traffic_line.cc b/cmd/traffic_line/traffic_line.cc
index 3826829..0872113 100644
--- a/cmd/traffic_line/traffic_line.cc
+++ b/cmd/traffic_line/traffic_line.cc
@@ -303,7 +303,7 @@ handleArgInvocation()
}
int
-main(int /* argc ATS_UNUSED */, char **argv)
+main(int /* argc ATS_UNUSED */, const char **argv)
{
AppVersionInfo appVersionInfo;
TSMgmtError status;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/453e3047/cmd/traffic_via/traffic_via.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_via/traffic_via.cc b/cmd/traffic_via/traffic_via.cc
index 89eb0a8..46b0fc7 100644
--- a/cmd/traffic_via/traffic_via.cc
+++ b/cmd/traffic_via/traffic_via.cc
@@ -318,7 +318,7 @@ filterViaHeader()
}
int
-main(int /* argc ATS_UNUSED */, char **argv)
+main(int /* argc ATS_UNUSED */, const char **argv)
{
TSMgmtError status;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/453e3047/lib/ts/ink_args.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_args.cc b/lib/ts/ink_args.cc
index 87bd114..9a30b12 100644
--- a/lib/ts/ink_args.cc
+++ b/lib/ts/ink_args.cc
@@ -74,9 +74,9 @@ append_file_argument(const char * arg)
static void
process_arg(const AppVersionInfo * appinfo, const ArgumentDescription * argument_descriptions,
- unsigned n_argument_descriptions, int i, char ***argv, const char *usage_string)
+ unsigned n_argument_descriptions, int i, const char ***argv, const char *usage_string)
{
- char *arg = NULL;
+ const char *arg = NULL;
if (arg_is_version_flag(&argument_descriptions[i])) {
ink_fputln(stdout, appinfo->FullVersionInfoStr);
@@ -158,7 +158,7 @@ show_argument_configuration(const ArgumentDescription * argument_descriptions, u
}
void
-process_args(const AppVersionInfo * appinfo, const ArgumentDescription * argument_descriptions, unsigned n_argument_descriptions, char **argv, const char *usage_string)
+process_args(const AppVersionInfo * appinfo, const ArgumentDescription * argument_descriptions, unsigned n_argument_descriptions, const char **argv, const char *usage_string)
{
unsigned i = 0;
//
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/453e3047/lib/ts/ink_args.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_args.h b/lib/ts/ink_args.h
index d74ef5f..aedd0f8 100644
--- a/lib/ts/ink_args.h
+++ b/lib/ts/ink_args.h
@@ -78,6 +78,6 @@ void usage(const ArgumentDescription * argument_descriptions, unsigned n_argumen
/* Process all arguments
*/
void process_args(const AppVersionInfo * appinfo, const ArgumentDescription * argument_descriptions,
- unsigned n_argument_descriptions, char **argv, const char *usage_string = 0);
+ unsigned n_argument_descriptions, const char **argv, const char *usage_string = 0);
#endif /*_INK_ARGS_H*/
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/453e3047/proxy/IPAllow.h
----------------------------------------------------------------------
diff --git a/proxy/IPAllow.h b/proxy/IPAllow.h
index 4e07c1a..74536f7 100644
--- a/proxy/IPAllow.h
+++ b/proxy/IPAllow.h
@@ -95,7 +95,6 @@ struct AclRecord {
*/
class IpAllow : public ConfigInfo
{
- friend int main(int, char**);
friend struct IpAllowUpdate;
public:
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/453e3047/proxy/Main.cc
----------------------------------------------------------------------
diff --git a/proxy/Main.cc b/proxy/Main.cc
index 393f329..c87d0a7 100644
--- a/proxy/Main.cc
+++ b/proxy/Main.cc
@@ -1396,7 +1396,7 @@ change_uid_gid(const char * user)
//
int
-main(int /* argc ATS_UNUSED */, char **argv)
+main(int /* argc ATS_UNUSED */, const char **argv)
{
#if TS_HAS_PROFILER
ProfilerStart("/tmp/ts.prof");
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/453e3047/proxy/logcat.cc
----------------------------------------------------------------------
diff --git a/proxy/logcat.cc b/proxy/logcat.cc
index 6c6b83e..038976d 100644
--- a/proxy/logcat.cc
+++ b/proxy/logcat.cc
@@ -206,7 +206,7 @@ open_output_file(char *output_file)
-------------------------------------------------------------------------*/
int
-main(int /* argc ATS_UNUSED */, char *argv[])
+main(int /* argc ATS_UNUSED */, const char *argv[])
{
enum
{
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/453e3047/proxy/logstats.cc
----------------------------------------------------------------------
diff --git a/proxy/logstats.cc b/proxy/logstats.cc
index e8bb871..583218a 100644
--- a/proxy/logstats.cc
+++ b/proxy/logstats.cc
@@ -648,7 +648,7 @@ struct CommandLineArgs
state_tag[0] = '\0';
}
- void parse_arguments(char** argv);
+ void parse_arguments(const char** argv);
};
static CommandLineArgs cl;
@@ -679,7 +679,7 @@ static const char *USAGE_LINE =
"Usage: " PROGRAM_NAME " [-f logfile] [-o origin[,...]] [-O originfile] [-m minhits] [-inshv]";
void
-CommandLineArgs::parse_arguments(char** argv)
+CommandLineArgs::parse_arguments(const char** argv)
{
// process command-line arguments
process_args(&appVersionInfo, argument_descriptions, countof(argument_descriptions), argv, USAGE_LINE);
@@ -2269,7 +2269,7 @@ open_main_log(ExitStatus& status)
///////////////////////////////////////////////////////////////////////////////
// main
int
-main(int /* argc ATS_UNUSED */, char *argv[])
+main(int /* argc ATS_UNUSED */, const char *argv[])
{
ExitStatus exit_status;
int res, cnt;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/453e3047/proxy/sac.cc
----------------------------------------------------------------------
diff --git a/proxy/sac.cc b/proxy/sac.cc
index d98fa23..8ca8a8a 100644
--- a/proxy/sac.cc
+++ b/proxy/sac.cc
@@ -77,7 +77,7 @@ sac_signal_handler(int signo, siginfo_t * info, void *)
}
int
-main(int /* argc ATS_UNUSED */, char *argv[])
+main(int /* argc ATS_UNUSED */, const char *argv[])
{
// build the application information structure
//
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/453e3047/tools/jtest/jtest.cc
----------------------------------------------------------------------
diff --git a/tools/jtest/jtest.cc b/tools/jtest/jtest.cc
index 187994e..91cb7da 100644
--- a/tools/jtest/jtest.cc
+++ b/tools/jtest/jtest.cc
@@ -2864,7 +2864,7 @@ static FILE * get_defered_urls(FILE * fp) {
return fp;
}
-int main(int argc __attribute__((unused)), char *argv[])
+int main(int argc __attribute__((unused)), const char *argv[])
{
appVersionInfo.setup(PACKAGE_NAME, "jtest", PACKAGE_VERSION, __DATE__, __TIME__, BUILD_MACHINE, BUILD_PERSON, "");