- Fix build with clang 4.0

PR:		216641
Approved by:	portmgr blanket

5 files changed, 64 insertions, 0 deletions

diff --git a/www/trafficserver/files/patch-cmd_traffic__manager_MgmtHandlers.cc b/www/trafficserver/files/patch-cmd_traffic__manager_MgmtHandlers.cc
new file mode 100644
index 0000000..f590897
--- /dev/null
+++ b/www/trafficserver/files/patch-cmd_traffic__manager_MgmtHandlers.cc
@@ -0,0 +1,11 @@
+--- cmd/traffic_manager/MgmtHandlers.cc.orig	2016-07-11 23:03:32 UTC
++++ cmd/traffic_manager/MgmtHandlers.cc
+@@ -268,7 +268,7 @@ mgmt_synthetic_main(void *)
+     } else {
+       ink_thread thrId = ink_thread_create(synthetic_thread, (void *)&clientFD, 1);
+ 
+-      if (thrId <= 0) {
++      if (thrId == 0) {
+         mgmt_log(stderr, "[SyntheticHealthServer] Failed to create worker thread");
+       }
+     }
diff --git a/www/trafficserver/files/patch-iocore_cluster_ClusterCache.cc b/www/trafficserver/files/patch-iocore_cluster_ClusterCache.cc
new file mode 100644
index 0000000..3f6ab36
--- /dev/null
+++ b/www/trafficserver/files/patch-iocore_cluster_ClusterCache.cc
@@ -0,0 +1,20 @@
+--- iocore/cluster/ClusterCache.cc.orig	2016-07-11 23:03:32 UTC
++++ iocore/cluster/ClusterCache.cc
+@@ -437,7 +437,7 @@ CacheContinuation::do_op(Continuation *c
+   }
+   case CACHE_OPEN_WRITE:
+   case CACHE_OPEN_READ: {
+-    ink_release_assert(c > 0);
++    ink_release_assert(c);
+     //////////////////////
+     // Use short format //
+     //////////////////////
+@@ -500,7 +500,7 @@ CacheContinuation::do_op(Continuation *c
+ 
+   case CACHE_OPEN_READ_LONG:
+   case CACHE_OPEN_WRITE_LONG: {
+-    ink_release_assert(c > 0);
++    ink_release_assert(c);
+     //////////////////////
+     // Use long format  //
+     //////////////////////
diff --git a/www/trafficserver/files/patch-mgmt_utils_MgmtSocket.cc b/www/trafficserver/files/patch-mgmt_utils_MgmtSocket.cc
new file mode 100644
index 0000000..14cf013
--- /dev/null
+++ b/www/trafficserver/files/patch-mgmt_utils_MgmtSocket.cc
@@ -0,0 +1,11 @@
+--- mgmt/utils/MgmtSocket.cc.orig	2016-07-11 23:03:32 UTC
++++ mgmt/utils/MgmtSocket.cc
+@@ -89,7 +89,7 @@ mgmt_fopen(const char *filename, const c
+     // no leak here as f will be returned if it is > 0
+     // coverity[overwrite_var]
+     f = ::fopen(filename, mode);
+-    if (f > 0)
++    if (f)
+       return f;
+     if (!mgmt_transient_error())
+       break;
diff --git a/www/trafficserver/files/patch-proxy_Main.cc b/www/trafficserver/files/patch-proxy_Main.cc
new file mode 100644
index 0000000..d0f1c26
--- /dev/null
+++ b/www/trafficserver/files/patch-proxy_Main.cc
@@ -0,0 +1,11 @@
+--- proxy/Main.cc.orig	2016-07-11 23:03:32 UTC
++++ proxy/Main.cc
+@@ -539,7 +539,7 @@ cmd_list(char * /* cmd ATS_UNUSED */)
+ 
+   Note("Cache Storage:");
+   Store tStore;
+-  if (tStore.read_config() < 0) {
++  if (tStore.read_config() != NULL) {
+     Note("config read failure");
+     return CMD_FAILED;
+   } else {
diff --git a/www/trafficserver/files/patch-proxy_http_remap_RemapPluginInfo.cc b/www/trafficserver/files/patch-proxy_http_remap_RemapPluginInfo.cc
new file mode 100644
index 0000000..493cded
--- /dev/null
+++ b/www/trafficserver/files/patch-proxy_http_remap_RemapPluginInfo.cc
@@ -0,0 +1,11 @@
+--- proxy/http/remap/RemapPluginInfo.cc.orig	2016-07-11 23:03:32 UTC
++++ proxy/http/remap/RemapPluginInfo.cc
+@@ -39,7 +39,7 @@ remap_plugin_info::remap_plugin_info(cha
+ {
+   // coverity did not see ats_free
+   // coverity[ctor_dtor_leak]
+-  if (_path && likely((path = ats_strdup(_path)) > 0))
++  if (_path && likely((path = ats_strdup(_path)) != NULL))
+     path_size = strlen(path);
+ }
+