From ad60f660c6fd1999a3e21823128d37aca62e9285 Mon Sep 17 00:00:00 2001
From: Dan Gohman <gohman@apple.com>
Date: Thu, 16 Jul 2009 15:24:40 +0000
Subject: [PATCH] Use size_t.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@76069 91177308-0d34-0410-b5e6-96231b3b80d8
---
include/llvm/Support/FormattedStream.h | 4 ++--
include/llvm/Support/raw_ostream.h | 18 +++++++++---------
lib/Support/FormattedStream.cpp | 2 +-
lib/Support/raw_ostream.cpp | 24 ++++++++++++------------
4 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/include/llvm/Support/FormattedStream.h b/include/llvm/Support/FormattedStream.h
index 7260c3fba39..1c50476a631 100644
--- a/include/llvm/Support/FormattedStream.h
+++ b/include/llvm/Support/FormattedStream.h
@@ -47,7 +47,7 @@ namespace llvm
///
unsigned Column;
- virtual void write_impl(const char *Ptr, unsigned Size) {
+ virtual void write_impl(const char *Ptr, size_t Size) {
ComputeColumn(Ptr, Size);
TheStream->write(Ptr, Size);
}
@@ -63,7 +63,7 @@ namespace llvm
/// ComputeColumn - Examine the current output and figure out
/// which column we end up in after output.
///
- void ComputeColumn(const char *Ptr, unsigned Size);
+ void ComputeColumn(const char *Ptr, size_t Size);
public:
/// formatted_raw_ostream - Open the specified file for
diff --git a/include/llvm/Support/raw_ostream.h b/include/llvm/Support/raw_ostream.h
index 367c35ca120..55cc957b20c 100644
--- a/include/llvm/Support/raw_ostream.h
+++ b/include/llvm/Support/raw_ostream.h
@@ -93,7 +93,7 @@ public:
/// SetBufferSize - Set the internal buffer size to the specified amount
/// instead of the default.
- void SetBufferSize(unsigned Size=4096) {
+ void SetBufferSize(size_t Size=4096) {
assert(Size >= 64 &&
"Buffer size must be somewhat large for invariants to hold");
flush();
@@ -117,7 +117,7 @@ public:
Unbuffered = true;
}
- unsigned GetNumBytesInBuffer() const {
+ size_t GetNumBytesInBuffer() const {
return OutBufCur - OutBufStart;
}
@@ -155,7 +155,7 @@ public:
// Inline fast path, particulary for constant strings where a
// sufficiently smart compiler will simplify strlen.
- unsigned Size = strlen(Str);
+ size_t Size = strlen(Str);
// Make sure we can use the fast path.
if (OutBufCur+Size > OutBufEnd)
@@ -192,7 +192,7 @@ public:
}
raw_ostream &write(unsigned char C);
- raw_ostream &write(const char *Ptr, unsigned Size);
+ raw_ostream &write(const char *Ptr, size_t Size);
// Formatted output, see the format() function in Support/Format.h.
raw_ostream &operator<<(const format_object_base &Fmt);
@@ -221,7 +221,7 @@ private:
/// \arg Ptr to the underlying stream.
///
/// \invariant { Size > 0 }
- virtual void write_impl(const char *Ptr, unsigned Size) = 0;
+ virtual void write_impl(const char *Ptr, size_t Size) = 0;
// An out of line virtual method to provide a home for the class vtable.
virtual void handle();
@@ -257,7 +257,7 @@ class raw_fd_ostream : public raw_ostream {
uint64_t pos;
/// write_impl - See raw_ostream::write_impl.
- virtual void write_impl(const char *Ptr, unsigned Size);
+ virtual void write_impl(const char *Ptr, size_t Size);
/// current_pos - Return the current position within the stream, not
/// counting the bytes currently in the buffer.
@@ -339,7 +339,7 @@ class raw_os_ostream : public raw_ostream {
std::ostream &OS;
/// write_impl - See raw_ostream::write_impl.
- virtual void write_impl(const char *Ptr, unsigned Size);
+ virtual void write_impl(const char *Ptr, size_t Size);
/// current_pos - Return the current position within the stream, not
/// counting the bytes currently in the buffer.
@@ -359,7 +359,7 @@ class raw_string_ostream : public raw_ostream {
std::string &OS;
/// write_impl - See raw_ostream::write_impl.
- virtual void write_impl(const char *Ptr, unsigned Size);
+ virtual void write_impl(const char *Ptr, size_t Size);
/// current_pos - Return the current position within the stream, not
/// counting the bytes currently in the buffer.
@@ -386,7 +386,7 @@ class raw_svector_ostream : public raw_ostream {
SmallVectorImpl<char> &OS;
/// write_impl - See raw_ostream::write_impl.
- virtual void write_impl(const char *Ptr, unsigned Size);
+ virtual void write_impl(const char *Ptr, size_t Size);
/// current_pos - Return the current position within the stream, not
/// counting the bytes currently in the buffer.
diff --git a/lib/Support/FormattedStream.cpp b/lib/Support/FormattedStream.cpp
index a10f71a6bbb..3523e2dee3d 100644
--- a/lib/Support/FormattedStream.cpp
+++ b/lib/Support/FormattedStream.cpp
@@ -17,7 +17,7 @@ using namespace llvm;
/// ComputeColumn - Examine the current output and figure out which
/// column we end up in after output.
///
-void formatted_raw_ostream::ComputeColumn(const char *Ptr, unsigned Size) {
+void formatted_raw_ostream::ComputeColumn(const char *Ptr, size_t Size) {
// Keep track of the current column by scanning the string for
// special characters
diff --git a/lib/Support/raw_ostream.cpp b/lib/Support/raw_ostream.cpp
index 8724801818c..397d2967c22 100644
--- a/lib/Support/raw_ostream.cpp
+++ b/lib/Support/raw_ostream.cpp
@@ -121,7 +121,7 @@ raw_ostream &raw_ostream::operator<<(const void *P) {
char *CurPtr = EndPtr;
while (N) {
- unsigned x = N % 16;
+ uintptr_t x = N % 16;
*--CurPtr = (x < 10 ? '0' + x : 'a' + x - 10);
N /= 16;
}
@@ -153,7 +153,7 @@ raw_ostream &raw_ostream::write(unsigned char C) {
return *this;
}
-raw_ostream &raw_ostream::write(const char *Ptr, unsigned Size) {
+raw_ostream &raw_ostream::write(const char *Ptr, size_t Size) {
// Group exceptional cases into a single branch.
if (BUILTIN_EXPECT(OutBufCur+Size > OutBufEnd, false)) {
if (Unbuffered) {
@@ -203,10 +203,10 @@ raw_ostream &raw_ostream::operator<<(const format_object_base &Fmt) {
// anyway. We should just flush upfront in such cases, and use the
// whole buffer as our scratch pad. Note, however, that this case is
// also necessary for correctness on unbuffered streams.
- unsigned NextBufferSize = 127;
+ size_t NextBufferSize = 127;
if (OutBufEnd-OutBufCur > 3) {
- unsigned BufferBytesLeft = OutBufEnd-OutBufCur;
- unsigned BytesUsed = Fmt.print(OutBufCur, BufferBytesLeft);
+ size_t BufferBytesLeft = OutBufEnd-OutBufCur;
+ size_t BytesUsed = Fmt.print(OutBufCur, BufferBytesLeft);
// Common case is that we have plenty of space.
if (BytesUsed < BufferBytesLeft) {
@@ -228,7 +228,7 @@ raw_ostream &raw_ostream::operator<<(const format_object_base &Fmt) {
V.resize(NextBufferSize);
// Try formatting into the SmallVector.
- unsigned BytesUsed = Fmt.print(&V[0], NextBufferSize);
+ size_t BytesUsed = Fmt.print(&V[0], NextBufferSize);
// If BytesUsed fit into the vector, we win.
if (BytesUsed <= NextBufferSize)
@@ -296,7 +296,7 @@ raw_fd_ostream::~raw_fd_ostream() {
}
}
-void raw_fd_ostream::write_impl(const char *Ptr, unsigned Size) {
+void raw_fd_ostream::write_impl(const char *Ptr, size_t Size) {
assert (FD >= 0 && "File already closed.");
pos += Size;
if (::write(FD, Ptr, Size) != (ssize_t) Size)
@@ -328,7 +328,7 @@ raw_ostream &raw_fd_ostream::changeColor(enum Colors colors, bool bold,
(colors == SAVEDCOLOR) ? sys::Process::OutputBold(bg)
: sys::Process::OutputColor(colors, bold, bg);
if (colorcode) {
- unsigned len = strlen(colorcode);
+ size_t len = strlen(colorcode);
write(colorcode, len);
// don't account colors towards output characters
pos -= len;
@@ -341,7 +341,7 @@ raw_ostream &raw_fd_ostream::resetColor() {
flush();
const char *colorcode = sys::Process::ResetColor();
if (colorcode) {
- unsigned len = strlen(colorcode);
+ size_t len = strlen(colorcode);
write(colorcode, len);
// don't account colors towards output characters
pos -= len;
@@ -383,7 +383,7 @@ raw_os_ostream::~raw_os_ostream() {
flush();
}
-void raw_os_ostream::write_impl(const char *Ptr, unsigned Size) {
+void raw_os_ostream::write_impl(const char *Ptr, size_t Size) {
OS.write(Ptr, Size);
}
@@ -401,7 +401,7 @@ raw_string_ostream::~raw_string_ostream() {
flush();
}
-void raw_string_ostream::write_impl(const char *Ptr, unsigned Size) {
+void raw_string_ostream::write_impl(const char *Ptr, size_t Size) {
OS.append(Ptr, Size);
}
@@ -413,7 +413,7 @@ raw_svector_ostream::~raw_svector_ostream() {
flush();
}
-void raw_svector_ostream::write_impl(const char *Ptr, unsigned Size) {
+void raw_svector_ostream::write_impl(const char *Ptr, size_t Size) {
OS.append(Ptr, Ptr + Size);
}