From 3db42f84371cf7ae9c1ec6cbf3668424645c7479 Mon Sep 17 00:00:00 2001
From: Robin Haberkorn <robin.haberkorn@googlemail.com>
Date: Tue, 10 Mar 2015 01:43:08 +0100
Subject: optimized Interface::info_update() implementations

 * use g_strconcat() instead of g_strdup_printf()
 * InterfaceGtk::info_update() now longer has an arbitrary
   255 byte limit on the length of the info line.
---
 src/interface-curses.cpp | 10 +++++-----
 src/interface-gtk.cpp    | 22 ++++++++++++----------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/interface-curses.cpp b/src/interface-curses.cpp
index a9bb466..7a242cd 100644
--- a/src/interface-curses.cpp
+++ b/src/interface-curses.cpp
@@ -245,8 +245,8 @@ InterfaceCurses::info_update_impl(const QRegister *reg)
 	gchar *name = String::canonicalize_ctl(reg->name);
 
 	g_free(info_current);
-	info_current = g_strdup_printf("%s - <QRegister> %s",
-	                               PACKAGE_NAME, name);
+	info_current = g_strconcat(PACKAGE_NAME " - <QRegister> ",
+	                           name, NIL);
 	g_free(name);
 
 	draw_info();
@@ -256,9 +256,9 @@ void
 InterfaceCurses::info_update_impl(const Buffer *buffer)
 {
 	g_free(info_current);
-	info_current = g_strdup_printf("%s - <Buffer> %s%s", PACKAGE_NAME,
-				       buffer->filename ? : UNNAMED_FILE,
-				       buffer->dirty ? "*" : "");
+	info_current = g_strconcat(PACKAGE_NAME " - <Buffer> ",
+	                           buffer->filename ? : UNNAMED_FILE,
+	                           buffer->dirty ? "*" : "", NIL);
 
 	draw_info();
 }
diff --git a/src/interface-gtk.cpp b/src/interface-gtk.cpp
index c8c96f5..900208c 100644
--- a/src/interface-gtk.cpp
+++ b/src/interface-gtk.cpp
@@ -24,7 +24,6 @@
 
 #include <glib.h>
 #include <glib/gprintf.h>
-#include <glib/gstdio.h>
 
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
@@ -169,25 +168,28 @@ InterfaceGtk::show_view_impl(ViewGtk *view)
 void
 InterfaceGtk::info_update_impl(const QRegister *reg)
 {
+	gchar *str;
 	gchar *name = String::canonicalize_ctl(reg->name);
-	gchar buf[255];
 
-	g_snprintf(buf, sizeof(buf), "%s - <QRegister> %s",
-		   PACKAGE_NAME, name);
+	str = g_strconcat(PACKAGE_NAME " - <QRegister> ",
+	                  name, NIL);
 	g_free(name);
 
-	gtk_window_set_title(GTK_WINDOW(window), buf);
+	gtk_window_set_title(GTK_WINDOW(window), str);
+	g_free(str);
 }
 
 void
 InterfaceGtk::info_update_impl(const Buffer *buffer)
 {
-	gchar buf[255];
+	gchar *str;
+
+	str = g_strconcat(PACKAGE_NAME " - <Buffer> ",
+	                  buffer->filename ? : UNNAMED_FILE,
+	                  buffer->dirty ? "*" : "", NIL);
 
-	g_snprintf(buf, sizeof(buf), "%s - <Buffer> %s%s", PACKAGE_NAME,
-		   buffer->filename ? : UNNAMED_FILE,
-		   buffer->dirty ? "*" : "");
-	gtk_window_set_title(GTK_WINDOW(window), buf);
+	gtk_window_set_title(GTK_WINDOW(window), str);
+	g_free(str);
 }
 
 void
-- 
cgit v1.2.3