git commit: TS-1991 clang complaint: logical not is only applied to the left hand side of this comparison.

[zw...@apache.org]

Updated Branches:
  refs/heads/master 82fbf07a8 -> d0333c576


TS-1991 clang complaint: logical not is only applied to the left hand
side of this comparison.


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

Branch: refs/heads/master
Commit: d0333c576fb8070967da1df2da31ec833e622e5e
Parents: 82fbf07
Author: Leif Hedstrom <zw...@apache.org>
Authored: Wed Jul 3 19:15:14 2013 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Wed Jul 3 19:15:14 2013 -0600

----------------------------------------------------------------------
 CHANGES             | 17 ++++++++++-------
 lib/ts/IpMapConf.cc |  4 ++--
 2 files changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d0333c57/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index c55f555..6249fe7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,10 @@
                                                          -*- coding: utf-8 -*-
-  Changes with Apache Traffic Server 3.3.5
+Changes with Apache Traffic Server 3.3.5
 
 
+  *) [TS-1991] clang complaint: logical not is only applied to the left hand
+   side of this comparison.
+
   *) [TS-1958] Web UI can crash doing a regex lookup.
 
   *) [TS-1994] Increase default RAM cache size by a magnitude.
@@ -26,8 +29,8 @@
   *) [TS-1959] traffic_manager not honoring some records.config settings
    necessary for e.g. logging.
 
-  *) [TS-745] support interim caching in storage
-   to eanble, use '--enable-interim-cache' configure option.
+  *) [TS-745] support interim caching in storage to enable, use
+   '--enable-interim-cache' configure option. 
 
   *) [TS-1968] Promote header_rewrite plugin from experimental
 
@@ -47,8 +50,8 @@
    allocation.  Have seen a doubling in performance depending on the benchmark.
    Details in the ticket.
 
-  Changes with Apache Traffic Server 3.3.4
 
+Changes with Apache Traffic Server 3.3.4
 
   *) [TS-1940] HostDB gets reinitialized on startup.
 
@@ -57,8 +60,8 @@
   *) [TS-1938] Remove unnecessary thread_id() wrapper in reclaimable freelist.
     Author: Yunkai Zhang <qi...@taobao.com>
 
-  Changes with Apache Traffic Server 3.3.3 (never released)
 
+Changes with Apache Traffic Server 3.3.3 (never released)
 
   *) [TS-1936] Make traffic_logstats honor the log-directory as intended.
 
@@ -250,7 +253,7 @@
   *) [TS-1826] Remove DumpStats/http_dump dead code.
 
 
-  Changes with Apache Traffic Server 3.3.2
+Changes with Apache Traffic Server 3.3.2
 
   *) [TS-621] Allow caching of empty docs (currently only if a header
    Content-Length: 0 is in the response). New config option is named
@@ -359,7 +362,7 @@
   *) [TS-1356] Ability to set thread affinity with multiple modes.
 
 
-  Changes with Apache Traffic Server 3.3.1
+Changes with Apache Traffic Server 3.3.1
 
   *) [TS-1743] Implement our own hash mechanism for traffic_logstats, since
    C++11 does not provide a sensical hash<const char*>.

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d0333c57/lib/ts/IpMapConf.cc
----------------------------------------------------------------------
diff --git a/lib/ts/IpMapConf.cc b/lib/ts/IpMapConf.cc
index 428482e..97878b4 100644
--- a/lib/ts/IpMapConf.cc
+++ b/lib/ts/IpMapConf.cc
@@ -46,7 +46,7 @@ read_addr(char *line, int n, int *i, sockaddr* addr, char* err)
 
   // Allow enclosing brackets to be more consistent but
   // don't bother passing it to @c ntop.
-  if (*i < n && '[' == *src) {
+  if ((*i < n) && ('[' == *src)) {
     ++*i, ++src, bracketed_p = true;
   }
 
@@ -54,7 +54,7 @@ read_addr(char *line, int n, int *i, sockaddr* addr, char* err)
     dst[k] = *src;
   }
 
-  if (bracketed_p && (! *i < n || ']' != *src)) {
+  if (bracketed_p && (! (*i < n) || (']' != *src))) {
     snprintf(err, ERR_STRING_LEN, "Unclosed brackets");
     return EINVAL;
   }