refactor: delete buffer_t

Author: cnjhb

CMakeLists.txt

@@ -70,7 +70,6 @@ set(AWE_SRCS
     ${BUILD_DIR}/xrdb.c
     ${BUILD_DIR}/common/atoms.c
     ${BUILD_DIR}/common/backtrace.c
-    ${BUILD_DIR}/common/buffer.c
     ${BUILD_DIR}/common/luaclass.c
     ${BUILD_DIR}/common/lualib.c
     ${BUILD_DIR}/common/luaobject.c

awesome.c

@@ -585,7 +585,7 @@ main(int argc, char **argv)
     globalconf.mousegrabber = LUA_REFNIL;
     globalconf.exit_code = EXIT_SUCCESS;
     globalconf.api_level = awesome_default_api_level();
-    buffer_init(&globalconf.startup_errors);
+    globalconf.startup_errors = g_string_new(NULL);
     string_array_init(&searchpath);
 
     /* save argv */

common/buffer.c

@@ -305,20 +305,18 @@ ewmh_update_net_current_desktop(lua_State *L)
 void
 ewmh_update_net_desktop_names(void)
 {
-    buffer_t buf;
-
-    buffer_inita(&buf, BUFSIZ);
+    GString* buf = g_string_new(NULL);
 
     foreach(tag, globalconf.tags)
     {
-        buffer_adds(&buf, tag_get_name(*tag));
-        buffer_addc(&buf, '\0');
+        g_string_append(buf,tag_get_name(*tag));
+        g_string_append_c(buf, '\0');
     }
 
     xcb_change_property(globalconf.connection, XCB_PROP_MODE_REPLACE,
 			globalconf.screen->root,
-			_NET_DESKTOP_NAMES, UTF8_STRING, 8, buf.len, buf.s);
-    buffer_wipe(&buf);
+			_NET_DESKTOP_NAMES, UTF8_STRING, 8, buf->len, buf->str);
+    g_string_free(buf, TRUE);
 }
 
 static void

common/buffer.h

@@ -41,7 +41,6 @@
 #include "objects/key.h"
 #include "common/xembed.h"
 #include "common/xcursor.h"
-#include "common/buffer.h"
 
 #define ROOT_WINDOW_EVENT_MASK \
     (const uint32_t []) { \
@@ -148,7 +147,7 @@ typedef struct
         lua_State *real_L_dont_use_directly;
     } L;
     /** All errors messages from loading config files */
-    buffer_t startup_errors;
+    GString* startup_errors;
     /** main loop that awesome is running on */
     GMainLoop *loop;
     /** The key grabber function */