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 2012/09/10 02:55:54 UTC
git commit: TS-1452: gzip build failure with Apple/clang-421.0.57
Updated Branches:
refs/heads/master e2bfe1a87 -> d8c5ac91d
TS-1452: gzip build failure with Apple/clang-421.0.57
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/d8c5ac91
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/d8c5ac91
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/d8c5ac91
Branch: refs/heads/master
Commit: d8c5ac91dfea43a99fbb3d90e8eecf9b250200b2
Parents: e2bfe1a
Author: James Peach <jp...@apache.org>
Authored: Sun Sep 9 17:55:34 2012 -0700
Committer: James Peach <jp...@apache.org>
Committed: Sun Sep 9 17:55:34 2012 -0700
----------------------------------------------------------------------
CHANGES | 3 +++
plugins/experimental/gzip/configuration.cc | 6 +++---
plugins/experimental/gzip/misc.cc | 8 ++++----
3 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d8c5ac91/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 2c85f6e..296c0d2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 3.3.0
+
+ *) [TS-1452] gzip build failure with Apple/clang-421.0.57
+
*) [TS-1339] Move fragment offset table from First Doc to Alt header so
that fragment offsets are stored per alternate.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d8c5ac91/plugins/experimental/gzip/configuration.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/gzip/configuration.cc b/plugins/experimental/gzip/configuration.cc
index 02d49d0..7abdd71 100644
--- a/plugins/experimental/gzip/configuration.cc
+++ b/plugins/experimental/gzip/configuration.cc
@@ -41,11 +41,11 @@ namespace Gzip {
}
void rtrim_if(string& s, int (* fp) (int)) {
- for (size_t i = s.size() - 1; i >= 0; i--) {
+ for (ssize_t i = (ssize_t)s.size() - 1; i >= 0; i--) {
if (fp(s[i])) {
- s.erase(i,1);
+ s.erase(i,1);
} else {
- break;
+ break;
}
}
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d8c5ac91/plugins/experimental/gzip/misc.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/gzip/misc.cc b/plugins/experimental/gzip/misc.cc
index 47c4c95..8ada7b3 100644
--- a/plugins/experimental/gzip/misc.cc
+++ b/plugins/experimental/gzip/misc.cc
@@ -21,12 +21,12 @@
limitations under the License.
*/
+#include <ts/ts.h>
#include "misc.h"
#include <string.h>
-#include <ts/ts.h>
+#include <inttypes.h>
#include "debug_macros.h"
-
voidpf
gzip_alloc(voidpf opaque, uInt items, uInt size)
{
@@ -203,8 +203,8 @@ void
gzip_log_ratio(int64_t in, int64_t out)
{
if (in) {
- info("Compressed size %ld (bytes), Original size %ld, ratio: %f", out, in, ((float) (in - out) / in));
+ info("Compressed size %"PRId64" (bytes), Original size %"PRId64", ratio: %f", out, in, ((float) (in - out) / in));
} else {
- debug("Compressed size %ld (bytes), Original size %ld, ratio: %f", out, in, 0.0F);
+ debug("Compressed size %"PRId64" (bytes), Original size %"PRId64", ratio: %f", out, in, 0.0F);
}
}