X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=libcitadel%2Flib%2Fstringbuf.c;h=12fd259e4582ef93d9da48158582d4a0ca0bca40;hb=5b729848bea9433b5473a31cbf3b53aa373fa0a2;hp=134ff47794a32e8790522a25d75a3e80b1bff960;hpb=18fbb7fd6c46411584245b1b30bbb9077bdd16c9;p=citadel.git

diff --git a/libcitadel/lib/stringbuf.c b/libcitadel/lib/stringbuf.c
index 134ff4779..12fd259e4 100644
--- a/libcitadel/lib/stringbuf.c
+++ b/libcitadel/lib/stringbuf.c
@@ -256,7 +256,7 @@ void dbg_Init(StrBuf *Buf)
  * @param A First one
  * @param B second one
  */
-static inline void SwapBuffers(StrBuf *A, StrBuf *B)
+static inline void iSwapBuffers(StrBuf *A, StrBuf *B)
 {
 	StrBuf C;
 
@@ -266,6 +266,12 @@ static inline void SwapBuffers(StrBuf *A, StrBuf *B)
 
 }
 
+void SwapBuffers(StrBuf *A, StrBuf *B)
+{
+	iSwapBuffers(A, B);
+}
+
+
 /** 
  * @ingroup StrBuf_Cast
  * @brief Cast operator to Plain String 
@@ -510,7 +516,7 @@ void NewStrBufDupAppendFlush(StrBuf **CreateRelpaceMe, StrBuf *CopyFlushMe, cons
 		}
 		else 
 			NewBuf = *CreateRelpaceMe;
-		SwapBuffers (NewBuf, CopyFlushMe);
+		iSwapBuffers (NewBuf, CopyFlushMe);
 	}
 	if (!KeepOriginal)
 		FlushStrBuf(CopyFlushMe);
@@ -2827,7 +2833,7 @@ int StrBufDecodeBase64To(const StrBuf *BufIn, StrBuf *BufOut)
 		return -1;
 
 	if (BufOut->BufSize < BufIn->BufUsed)
-		IncreaseBuf(BufOut, BufIn->BufUsed, 0);
+		IncreaseBuf(BufOut, 0, BufIn->BufUsed);
 
 	BufOut->BufUsed = CtdlDecodeBase64(BufOut->buf,
 					   BufIn->buf,
@@ -3047,7 +3053,7 @@ int StrBufStreamTranscode(eStreamType type, IOBuffer *Target, IOBuffer *In, cons
 		     (stream->OutBuf.BufUsed != org_outbuf_len)
 			    ))
 		{
-			SwapBuffers(Target->Buf, &stream->OutBuf);
+			iSwapBuffers(Target->Buf, &stream->OutBuf);
 		}
 
 		if (stream->zstream.avail_in == 0)
@@ -3118,7 +3124,7 @@ int StrBufStreamTranscode(eStreamType type, IOBuffer *Target, IOBuffer *In, cons
 
 		stream->OutBuf.BufUsed += stream->zstream.total_out + org_outbuf_len;
 
-		if (Target) SwapBuffers(Target->Buf, &stream->OutBuf);
+		if (Target) iSwapBuffers(Target->Buf, &stream->OutBuf);
 
 		if (stream->zstream.avail_in == 0)
 		{
@@ -3767,7 +3773,7 @@ TRYAGAIN:
 		TmpBuf->buf[TmpBuf->BufUsed] = '\0';
 		
 		/* little card game: wheres the red lady? */
-		SwapBuffers(ConvertBuf, TmpBuf);
+		iSwapBuffers(ConvertBuf, TmpBuf);
 		FlushStrBuf(TmpBuf);
 	}
 #endif
@@ -4136,11 +4142,11 @@ long StrBuf_Utf8StrCut(StrBuf *Buf, int maxlen)
 			n++;
 			aptr++;
 		}
-		if (n > maxlen) {
+		if (n >= maxlen) {
 			*aptr = '\0';
 			Buf->BufUsed = aptr - Buf->buf;
 			return Buf->BufUsed;
-		}			
+		}
 	}
 	return Buf->BufUsed;