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/03/01 23:35:20 UTC

git commit: TS-1124 Fix some build issues with new plugins

Updated Branches:
  refs/heads/master 1f38e9e3a -> eee291309


TS-1124 Fix some build issues with new plugins


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/eee29130
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/eee29130
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/eee29130

Branch: refs/heads/master
Commit: eee2913090d40fed0d0398fe872b95c95d6b3c23
Parents: 1f38e9e
Author: Leif Hedstrom <le...@ogre.com>
Authored: Thu Mar 1 15:35:05 2012 -0700
Committer: Leif Hedstrom <le...@ogre.com>
Committed: Thu Mar 1 15:35:05 2012 -0700

----------------------------------------------------------------------
 plugins/header_filter/lulu.h       |    1 -
 plugins/header_filter/rules.h      |    2 +-
 plugins/regex_remap/regex_remap.cc |    2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/eee29130/plugins/header_filter/lulu.h
----------------------------------------------------------------------
diff --git a/plugins/header_filter/lulu.h b/plugins/header_filter/lulu.h
index 47b08d0..040c7c9 100644
--- a/plugins/header_filter/lulu.h
+++ b/plugins/header_filter/lulu.h
@@ -75,7 +75,6 @@ static inline int64 ink_atomic_cas64(pvint64 mem, int64 old, int64 new_value) {
 static inline int ink_atomic_cas_ptr(pvvoidp mem, void* old, void* new_value) { return __sync_bool_compare_and_swap(mem, old, new_value); }
 static inline int ink_atomic_increment(pvint32 mem, int value) { return __sync_fetch_and_add(mem, value); }
 static inline int64 ink_atomic_increment64(pvint64 mem, int64 value) { return __sync_fetch_and_add(mem, value); }
-static inline void *ink_atomic_increment_ptr(pvvoidp mem, intptr_t value) { return __sync_fetch_and_add((void**)mem, value); }
 #else
 // TODO: Deal with this case?
 #failure

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/eee29130/plugins/header_filter/rules.h
----------------------------------------------------------------------
diff --git a/plugins/header_filter/rules.h b/plugins/header_filter/rules.h
index 99043ca..556e4c2 100644
--- a/plugins/header_filter/rules.h
+++ b/plugins/header_filter/rules.h
@@ -102,7 +102,7 @@ private:
   DISALLOW_COPY_AND_ASSIGN(RulesEntry);
 
   char* _header;
-  size_t _h_len,;
+  size_t _h_len;
   char* _qualifier;
   size_t _q_len;
   QualifierTypes _q_type;

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/eee29130/plugins/regex_remap/regex_remap.cc
----------------------------------------------------------------------
diff --git a/plugins/regex_remap/regex_remap.cc b/plugins/regex_remap/regex_remap.cc
index 53a9659..9fd8e80 100644
--- a/plugins/regex_remap/regex_remap.cc
+++ b/plugins/regex_remap/regex_remap.cc
@@ -244,7 +244,7 @@ class RemapRegex
     _num_subs = 0;
 
     while (str && *str) {
-      if ((*str == '$')) {
+      if ('$' == *str) {
         int ix = -1;
 
         if (isdigit(*(str+1))) {