String buffer refactoring, part 1.

Move string buffer handling to lj_buf.*.
Use common buffer resizing function.

1 files changed, 6 insertions, 28 deletions

diff --git a/src/lj_str.c b/src/lj_str.c
index 6548ee4d..623b362d 100644
--- a/src/lj_str.c
+++ b/src/lj_str.c
@@ -1,9 +1,6 @@
 /*
 ** String handling.
 ** Copyright (C) 2005-2013 Mike Pall. See Copyright Notice in luajit.h
-**
-** Portions taken verbatim or adapted from the Lua interpreter.
-** Copyright (C) 1994-2008 Lua.org, PUC-Rio. See Copyright Notice in lua.h
 */
 
 #include <stdio.h>
@@ -14,6 +11,7 @@
 #include "lj_obj.h"
 #include "lj_gc.h"
 #include "lj_err.h"
+#include "lj_buf.h"
 #include "lj_str.h"
 #include "lj_state.h"
 #include "lj_char.h"
@@ -222,33 +220,24 @@ GCstr * LJ_FASTCALL lj_str_fromnumber(lua_State *L, cTValue *o)
 
 static void addstr(lua_State *L, SBuf *sb, const char *str, MSize len)
 {
-  char *p;
   MSize i;
-  if (sb->n + len > sb->sz) {
-    MSize sz = sb->sz * 2;
-    while (sb->n + len > sz) sz = sz * 2;
-    lj_str_resizebuf(L, sb, sz);
-  }
-  p = sb->buf + sb->n;
+  char *p = lj_buf_need(L, sb, sb->n+len) + sb->n;
   sb->n += len;
   for (i = 0; i < len; i++) p[i] = str[i];
 }
 
 static void addchar(lua_State *L, SBuf *sb, int c)
 {
-  if (sb->n + 1 > sb->sz) {
-    MSize sz = sb->sz * 2;
-    lj_str_resizebuf(L, sb, sz);
-  }
-  sb->buf[sb->n++] = (char)c;
+  char *p = lj_buf_need(L, sb, sb->n+1);
+  p[sb->n++] = (char)c;
 }
 
 /* Push formatted message as a string object to Lua stack. va_list variant. */
 const char *lj_str_pushvf(lua_State *L, const char *fmt, va_list argp)
 {
   SBuf *sb = &G(L)->tmpbuf;
-  lj_str_needbuf(L, sb, (MSize)strlen(fmt));
-  lj_str_resetbuf(sb);
+  lj_buf_need(L, sb, (MSize)strlen(fmt));
+  lj_buf_reset(sb);
   for (;;) {
     const char *e = strchr(fmt, '%');
     if (e == NULL) break;
@@ -326,14 +315,3 @@ const char *lj_str_pushf(lua_State *L, const char *fmt, ...)
   return msg;
 }
 
-/* -- Buffer handling ----------------------------------------------------- */
-
-char *lj_str_needbuf(lua_State *L, SBuf *sb, MSize sz)
-{
-  if (sz > sb->sz) {
-    if (sz < LJ_MIN_SBUF) sz = LJ_MIN_SBUF;
-    lj_str_resizebuf(L, sb, sz);
-  }
-  return sb->buf;
-}
-