From 73cba130c32df2031a3d862ed9daf5ba00d5173b Mon Sep 17 00:00:00 2001
From: zimoch <zimoch>
Date: Thu, 16 May 2013 08:28:34 +0000
Subject: [PATCH] use ssize_t for signed index types. Win has no ssize_t, use
 ptrdiff_t instead. use P instead of S as shortcut for PRINTF_SIZE_T_PREFIX
 because some OK already use S.

---
 src/StreamBuffer.cc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/StreamBuffer.cc b/src/StreamBuffer.cc
index b08e248..3b34de3 100644
--- a/src/StreamBuffer.cc
+++ b/src/StreamBuffer.cc
@@ -30,17 +30,17 @@
 #define vsnprintf epicsVsnprintf
 #endif
 
-#define S PRINTF_SIZE_T_PREFIX
+#define P PRINTF_SIZE_T_PREFIX
 
 void StreamBuffer::
-init(const void* s, size_t minsize)
+init(const void* s, ssize_t minsize)
 {
     len = 0;
     offs = 0;
     buffer = local;
     cap = sizeof(local);
     if (minsize < 0) minsize = 0;
-    if (minsize >= cap)
+    if ((size_t)minsize >= cap)
     {
         // use allocated buffer
         grow(minsize);
@@ -57,7 +57,7 @@ init(const void* s, size_t minsize)
 }
 
 // How the buffer looks like:
-// |----free-----|####used####|-------free-------|
+// |----free-----|####used####|--------00--------|
 ///|<--- offs -->|<-- len --->|<- cap-offs-len ->|
 // 0            offs      offs+len              cap
 //               |<-------------- minsize --------------->
@@ -124,7 +124,7 @@ append(const void* s, ssize_t size)
     if (size <= 0)
     {
         // append negative number of bytes? let's delete some
-        if ((size_t)-size > len) size = -len;
+        if (size < -(ssize_t)len) size = -(ssize_t)len;
         memset (buffer+offs+len+size, 0, -size);
     }
     else
@@ -136,7 +136,7 @@ append(const void* s, ssize_t size)
     return *this;
 }
 
-long int StreamBuffer::
+ssize_t StreamBuffer::
 find(const void* m, size_t size, ssize_t start) const
 {
     if (start < 0)
@@ -314,7 +314,7 @@ dump() const
     StreamBuffer result(256+cap*5);
     result.append("\033[0m");
     size_t i;
-    result.print("%"S"d,%"S"d,%"S"d:\033[37m", offs, len, cap);
+    result.print("%"P"d,%"P"d,%"P"d:\033[37m", offs, len, cap);
     for (i = 0; i < cap; i++)
     {
         if (i == offs) result.append("\033[34m[\033[0m");