]> git.sur5r.net Git - cc65/commitdiff
New strbuf module
authorcuz <cuz@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Sun, 9 Sep 2001 10:24:16 +0000 (10:24 +0000)
committercuz <cuz@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Sun, 9 Sep 2001 10:24:16 +0000 (10:24 +0000)
git-svn-id: svn://svn.cc65.org/cc65/trunk@881 b7a2c559-68d2-44c3-8de9-860c34a00d81

src/common/make/gcc.mak
src/common/make/watcom.mak
src/common/strbuf.c [new file with mode: 0644]
src/common/strbuf.h [new file with mode: 0644]

index 60933e52d50c7fd4e8d2216bdee90c8b2a508470..402c689e053acdd36a46fa72664cb1e325d808de 100644 (file)
@@ -20,6 +20,7 @@ OBJS =        abend.o         \
        fname.o         \
        hashstr.o       \
        print.o         \
+       strbuf.o        \
        strutil.o       \
        target.o        \
        tgttrans.o      \
index d4d9ada28d32eae4a84eaa933778792f70d69d39..6fc3d91ad9c420ff59c75942a3b90b8943715eea 100644 (file)
@@ -76,6 +76,7 @@ OBJS =        abend.obj       \
        fname.obj       \
        hashstr.obj     \
        print.obj       \
+       strbuf.obj      \
        strutil.obj     \
        target.obj      \
        tgttrans.obj    \
@@ -102,7 +103,7 @@ clean:
        @if exist *.obj del *.obj
        @if exist $(LIB) del $(LIB)
 
-
+                        
 
 
 
diff --git a/src/common/strbuf.c b/src/common/strbuf.c
new file mode 100644 (file)
index 0000000..c763dbb
--- /dev/null
@@ -0,0 +1,193 @@
+/*****************************************************************************/
+/*                                                                           */
+/*                                strbuf.c                                  */
+/*                                                                           */
+/*                      Variable sized string buffers                       */
+/*                                                                           */
+/*                                                                           */
+/*                                                                           */
+/* (C) 2001             Ullrich von Bassewitz                                       */
+/*               Wacholderweg 14                                             */
+/*               D-70597 Stuttgart                                           */
+/* EMail:        uz@musoftware.de                                            */
+/*                                                                           */
+/*                                                                           */
+/* This software is provided 'as-is', without any expressed or implied       */
+/* warranty.  In no event will the authors be held liable for any damages    */
+/* arising from the use of this software.                                    */
+/*                                                                           */
+/* Permission is granted to anyone to use this software for any purpose,     */
+/* including commercial applications, and to alter it and redistribute it    */
+/* freely, subject to the following restrictions:                            */
+/*                                                                           */
+/* 1. The origin of this software must not be misrepresented; you must not   */
+/*    claim that you wrote the original software. If you use this software   */
+/*    in a product, an acknowledgment in the product documentation would be  */
+/*    appreciated but is not required.                                       */
+/* 2. Altered source versions must be plainly marked as such, and must not   */
+/*    be misrepresented as being the original software.                      */
+/* 3. This notice may not be removed or altered from any source              */
+/*    distribution.                                                          */
+/*                                                                           */
+/*****************************************************************************/
+
+
+
+#include <string.h>
+
+/* common */
+#include "xmalloc.h"
+#include "strbuf.h"
+
+
+
+/*****************************************************************************/
+/*                                 Helpers                                  */
+/*****************************************************************************/
+
+
+
+static void SB_Realloc (StrBuf* B, unsigned NewSize)
+/* Reallocate the string buffer space, make sure at least NewSize bytes are
+ * available.
+ */
+{
+    /* Get the current size, use a minimum of 8 bytes */
+    unsigned NewAllocated = B->Allocated;
+    if (NewAllocated == 0) {
+       NewAllocated = 8;
+    }
+
+    /* Round up to the next power of two */
+    while (NewAllocated < NewSize) {
+       NewAllocated *= 2;
+    }
+
+    /* Reallocate the buffer */
+    B->Buf       = xrealloc (B->Buf, NewAllocated);
+    B->Allocated = NewAllocated;
+}
+
+
+
+/*****************************************************************************/
+/*                                  Code                                    */
+/*****************************************************************************/
+
+
+
+StrBuf* InitStrBuf (StrBuf* B)
+/* Initialize a string buffer */
+{
+    B->Allocated = 0;
+    B->Len       = 0;
+    B->Buf       = 0;
+    return B;
+}
+
+
+
+void DoneStrBuf (StrBuf* B)
+/* Free the data of a string buffer (but not the struct itself) */
+{
+    xfree (B->Buf);
+    B->Allocated = 0;
+    B->Len       = 0;
+    B->Buf       = 0;
+}
+
+
+
+StrBuf* NewStrBuf (void)
+/* Allocate, initialize and return a new StrBuf */
+{
+    /* Allocate a new string buffer */
+    StrBuf* B = xmalloc (sizeof (StrBuf));
+
+    /* Initialize the struct... */
+    InitStrBuf (B);
+
+    /* ...and return it */
+    return B;
+}
+
+
+
+void FreeStrBuf (StrBuf* B)
+/* Free a string buffer */
+{
+    /* Don't use Done here, since we won't use the struct later */
+    xfree (B->Buf);
+    xfree (B);
+}
+
+
+
+void SB_Terminate (StrBuf* B)
+/* Zero terminate the given string buffer. NOTE: The terminating zero is not
+ * accounted for in B->Len, if you want that, you have to use AppendChar!
+ */
+{
+    unsigned NewLen = B->Len + 1;
+    if (NewLen > B->Allocated) {
+       SB_Realloc (B, NewLen);
+    }
+    B->Buf[B->Len] = '\0';
+}
+
+
+
+void SB_AppendChar (StrBuf* B, char C)
+/* Append a character to a string buffer */
+{
+    unsigned NewLen = B->Len + 1;
+    if (NewLen > B->Allocated) {
+       SB_Realloc (B, NewLen);
+    }
+    B->Buf[B->Len] = C;
+    B->Len = NewLen;
+}
+
+
+
+void SB_AppendStr (StrBuf* B, const char* S)
+/* Append a string to the end of the string buffer */
+{
+    SB_AppendBuf (B, S, strlen (S));
+}
+
+
+
+void SB_AppendBuf (StrBuf* B, const char* S, unsigned Size)
+/* Append a character buffer to the end of the string buffer */
+{
+    unsigned NewLen = B->Len + Size;
+    if (NewLen > B->Allocated) {
+       SB_Realloc (B, NewLen);
+    }
+    memcpy (B->Buf + B->Len, S, Size);
+    B->Len = NewLen;
+}
+
+
+
+void SB_Copy (StrBuf* Target, const StrBuf* Source)
+/* Copy Source to Target, discarding the old contents of Target */
+{
+    if (Target->Allocated < Source->Allocated) {
+       SB_Realloc (Target, Source->Allocated);
+    }
+    memcpy (Target->Buf, Source->Buf, Source->Len);
+    Target->Len = Source->Len;
+}
+
+
+
+void SB_Append (StrBuf* Target, const StrBuf* Source)
+/* Append the contents of Source to Target */
+{
+    SB_AppendBuf (Target, Source->Buf, Source->Len);
+}
+
+
+
diff --git a/src/common/strbuf.h b/src/common/strbuf.h
new file mode 100644 (file)
index 0000000..9dc1b0e
--- /dev/null
@@ -0,0 +1,101 @@
+/*****************************************************************************/
+/*                                                                           */
+/*                                strbuf.h                                  */
+/*                                                                           */
+/*                      Variable sized string buffers                       */
+/*                                                                           */
+/*                                                                           */
+/*                                                                           */
+/* (C) 2001             Ullrich von Bassewitz                                       */
+/*               Wacholderweg 14                                             */
+/*               D-70597 Stuttgart                                           */
+/* EMail:        uz@musoftware.de                                            */
+/*                                                                           */
+/*                                                                           */
+/* This software is provided 'as-is', without any expressed or implied       */
+/* warranty.  In no event will the authors be held liable for any damages    */
+/* arising from the use of this software.                                    */
+/*                                                                           */
+/* Permission is granted to anyone to use this software for any purpose,     */
+/* including commercial applications, and to alter it and redistribute it    */
+/* freely, subject to the following restrictions:                            */
+/*                                                                           */
+/* 1. The origin of this software must not be misrepresented; you must not   */
+/*    claim that you wrote the original software. If you use this software   */
+/*    in a product, an acknowledgment in the product documentation would be  */
+/*    appreciated but is not required.                                       */
+/* 2. Altered source versions must be plainly marked as such, and must not   */
+/*    be misrepresented as being the original software.                      */
+/* 3. This notice may not be removed or altered from any source              */
+/*    distribution.                                                          */
+/*                                                                           */
+/*****************************************************************************/
+
+
+
+#ifndef STRBUF_H
+#define STRBUF_H
+
+
+
+/*****************************************************************************/
+/*                                  Data                                    */
+/*****************************************************************************/
+
+
+
+typedef struct StrBuf StrBuf;
+struct StrBuf {
+    unsigned    Allocated;
+    unsigned    Len;
+    char*       Buf;
+};
+
+
+
+/*****************************************************************************/
+/*                                  Code                                    */
+/*****************************************************************************/
+
+
+
+StrBuf* InitStrBuf (StrBuf* B);
+/* Initialize a string buffer */
+
+void DoneStrBuf (StrBuf* B);
+/* Free the data of a string buffer (but not the struct itself) */
+
+StrBuf* NewStrBuf (void);
+/* Allocate, initialize and return a new StrBuf */
+
+void FreeStrBuf (StrBuf* B);
+/* Free a string buffer */
+
+void SB_Terminate (StrBuf* B);
+/* Zero terminate the given string buffer. NOTE: The terminating zero is not
+ * accounted for in B->Len, if you want that, you have to use AppendChar!
+ */
+
+void SB_AppendChar (StrBuf* B, char C);
+/* Append a character to a string buffer */
+
+void SB_AppendStr (StrBuf* B, const char* S);
+/* Append a string to the end of the string buffer */
+
+void SB_AppendBuf (StrBuf* B, const char* S, unsigned Size);
+/* Append a character buffer to the end of the string buffer */
+
+void SB_Copy (StrBuf* Target, const StrBuf* Source);
+/* Copy Source to Target, discarding the old contents of Target */
+
+void SB_Append (StrBuf* Target, const StrBuf* Source);
+/* Append the contents of Source to Target */
+
+
+
+/* End of strbuf.h */
+
+#endif
+
+
+