summaryrefslogtreecommitdiffstats
path: root/net/tools/flip_server
diff options
context:
space:
mode:
authormbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-04 15:42:34 +0000
committermbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-04 15:42:34 +0000
commit265800c721c4f9ec7db66ba16e87d4fb074c45a4 (patch)
treeb47e344e65f1720e1734d3c151ecdf9a3dcdea8d /net/tools/flip_server
parent988e6f5fc5ea38f8869ad7146fa0958d1f5a1332 (diff)
downloadchromium_src-265800c721c4f9ec7db66ba16e87d4fb074c45a4.zip
chromium_src-265800c721c4f9ec7db66ba16e87d4fb074c45a4.tar.gz
chromium_src-265800c721c4f9ec7db66ba16e87d4fb074c45a4.tar.bz2
Fix a couple of warnings.
This patch on behalf of Jon Leighton (leighton@cis.udel.edu) BUG=none TEST=none Review URL: http://codereview.chromium.org/3550005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61376 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools/flip_server')
-rw-r--r--net/tools/flip_server/balsa_headers.cc4
-rw-r--r--net/tools/flip_server/flip_in_mem_edsm_server.cc2
2 files changed, 3 insertions, 3 deletions
diff --git a/net/tools/flip_server/balsa_headers.cc b/net/tools/flip_server/balsa_headers.cc
index dbe4d6b..dfdbb61 100644
--- a/net/tools/flip_server/balsa_headers.cc
+++ b/net/tools/flip_server/balsa_headers.cc
@@ -615,7 +615,7 @@ void BalsaHeaders::SetContentLength(size_t length) {
content_length_ = length;
// FastUInt64ToBuffer is supposed to use a maximum of kFastToBufferSize bytes.
char buffer[kFastToBufferSize];
- int len_converted = snprintf(buffer, sizeof(buffer), "%ld", length);
+ int len_converted = snprintf(buffer, sizeof(buffer), "%d", length);
CHECK_GT(len_converted, 0);
const base::StringPiece length_str(buffer, len_converted);
AppendHeader(content_length, length_str);
@@ -724,7 +724,7 @@ void BalsaHeaders::SetParsedResponseCodeAndUpdateFirstline(
size_t parsed_response_code) {
char buffer[kFastToBufferSize];
int len_converted = snprintf(buffer, sizeof(buffer),
- "%ld", parsed_response_code);
+ "%d", parsed_response_code);
CHECK_GT(len_converted, 0);
SetResponseCode(base::StringPiece(buffer, len_converted));
}
diff --git a/net/tools/flip_server/flip_in_mem_edsm_server.cc b/net/tools/flip_server/flip_in_mem_edsm_server.cc
index 19f464d..13658184 100644
--- a/net/tools/flip_server/flip_in_mem_edsm_server.cc
+++ b/net/tools/flip_server/flip_in_mem_edsm_server.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include <dirent.h>
-#include <linux/tcp.h> // For TCP_NODELAY
+#include <netinet/tcp.h> // For TCP_NODELAY
#include <sys/socket.h>
#include <sys/types.h>
#include <unistd.h>