You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2012/02/23 22:40:51 UTC
git commit: Fixes for TS-1102 compliance
Updated Branches:
refs/heads/master 116b3a960 -> e2631b243
Fixes for TS-1102 compliance
Project: http://git-wip-us.apache.org/repos/asf/trafficserver-plugins/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver-plugins/commit/e2631b24
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver-plugins/tree/e2631b24
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver-plugins/diff/e2631b24
Branch: refs/heads/master
Commit: e2631b24315c6955691f7bb9c74687a58ee04dbe
Parents: 116b3a9
Author: Leif Hedstrom <zw...@apache.org>
Authored: Thu Feb 23 14:38:48 2012 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Thu Feb 23 14:38:48 2012 -0700
----------------------------------------------------------------------
.gitignore | 10 ++++++++++
cacheurl/cacheurl.c | 5 ++---
geoip_acl/acl.cc | 2 +-
header_filter/rules.cc | 2 +-
4 files changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver-plugins/blob/e2631b24/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6499811
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,10 @@
+*.o
+*.a
+*.so
+*.in
+*~
+*.tar.gz
+*.lo
+*.la
+
+.deps
http://git-wip-us.apache.org/repos/asf/trafficserver-plugins/blob/e2631b24/cacheurl/cacheurl.c
----------------------------------------------------------------------
diff --git a/cacheurl/cacheurl.c b/cacheurl/cacheurl.c
index a35b2d5..0a0be87 100644
--- a/cacheurl/cacheurl.c
+++ b/cacheurl/cacheurl.c
@@ -72,8 +72,7 @@ static int regex_substitute(char **buf, char *str, regex_info *info) {
/* Verify the replacement has the right number of matching groups */
for (i=0; i<info->tokcount; i++) {
if (info->tokens[i] >= matchcount) {
- TSError("[%s] Invalid reference int replacement: $%d\n",
- info->tokens[i]);
+ TSError("[%s] Invalid reference int replacement: $%d\n", PLUGIN_NAME, info->tokens[i]);
return 0;
}
}
@@ -360,7 +359,7 @@ static int check_ts_version() {
/* Generic error message function for errors in plugin initialization */
static void initialization_error(char *msg) {
TSError("[%s] %s\n", PLUGIN_NAME, msg);
- TSError("[%s] Unable to initialize plugin (disabled).\n");
+ TSError("[%s] Unable to initialize plugin (disabled).\n", PLUGIN_NAME);
}
void TSPluginInit(int argc, const char *argv[]) {
http://git-wip-us.apache.org/repos/asf/trafficserver-plugins/blob/e2631b24/geoip_acl/acl.cc
----------------------------------------------------------------------
diff --git a/geoip_acl/acl.cc b/geoip_acl/acl.cc
index de61d9e..e7254f4 100644
--- a/geoip_acl/acl.cc
+++ b/geoip_acl/acl.cc
@@ -213,7 +213,7 @@ CountryAcl::eval(TSRemapRequestInfo *rri, TSHttpTxn txnp) const
switch (addr->sa_family) {
case AF_INET:
{
- unsigned long ip = ntohl(reinterpret_cast<const struct sockaddr_in *>(addr)->sin_addr.s_addr);
+ uint32_t ip = ntohl(reinterpret_cast<const struct sockaddr_in *>(addr)->sin_addr.s_addr);
#if MAXMIND_GEOIP
iso = GeoIP_id_by_ipnum(gGI, ip);
http://git-wip-us.apache.org/repos/asf/trafficserver-plugins/blob/e2631b24/header_filter/rules.cc
----------------------------------------------------------------------
diff --git a/header_filter/rules.cc b/header_filter/rules.cc
index 62a50cf..41b0014 100644
--- a/header_filter/rules.cc
+++ b/header_filter/rules.cc
@@ -142,7 +142,7 @@ RulesEntry::execute(TSMBuffer& reqp, TSMLoc& hdr_loc) const
nuke = !nuke;
if (nuke) {
if (TS_SUCCESS == TSMimeHdrFieldDestroy(reqp, hdr_loc, field))
- TSDebug(PLUGIN_NAME, "\tDeleting header %.*s", _h_len, _header);
+ TSDebug(PLUGIN_NAME, "\tDeleting header %.*s", static_cast<int>(_h_len), _header);
}
TSHandleMLocRelease(reqp, hdr_loc, field);
field = tmp;