[beast/devel: 11/35] SFI: provide g_intern_format() (based on Rapicorn::string_format)

[Tim Janik <timj src gnome org>]

commit 8a212ad9c50c8da46f800cfdba6c6533ee57d793
Author: Tim Janik <timj gnu org>
Date:   Sun May 12 19:39:07 2013 +0200

    SFI: provide g_intern_format() (based on Rapicorn::string_format)

 sfi/glib-extra.cc |   19 -------------------
 sfi/glib-extra.hh |    5 +++--
 2 files changed, 3 insertions(+), 21 deletions(-)
---
diff --git a/sfi/glib-extra.cc b/sfi/glib-extra.cc
index 05353e0..a1a8a79 100644
--- a/sfi/glib-extra.cc
+++ b/sfi/glib-extra.cc
@@ -198,25 +198,6 @@ g_intern_strconcat (const gchar *first_string,
   return c;
 }
 
-const gchar*
-g_intern_printf (const gchar   *format,
-                 ...)
-{
-  if (format)
-    {
-      gchar *buffer;
-      va_list args;
-      va_start (args, format);
-      buffer = g_strdup_vprintf (format, args);
-      va_end (args);
-      const gchar *istring = g_intern_string (buffer);
-      g_free (buffer);
-      return istring;
-    }
-  else
-    return NULL;
-}
-
 gchar*
 g_path_concat (const gchar *first_path,
                ...)
diff --git a/sfi/glib-extra.hh b/sfi/glib-extra.hh
index cde17a6..a054965 100644
--- a/sfi/glib-extra.hh
+++ b/sfi/glib-extra.hh
@@ -56,6 +56,9 @@ void g_object_disconnect_any (gpointer object,
                               gpointer function,
                               gpointer data); /* workaorund for g_object_disconnect() */
 
+// == printf variants ==
+#define g_intern_format(...)    g_intern_string (Rapicorn::string_format (__VA_ARGS__).c_str())
+
 /* --- string functions --- */
 const gchar*    g_printf_find_localised_directive (const gchar *format);
 gchar**                g_straddv         (gchar        **str_array,
@@ -68,8 +71,6 @@ gchar*                g_strdup_lstrip   (const gchar   *string);
 
 const gchar*    g_intern_strconcat      (const gchar   *first_string,
                                          ...) G_GNUC_NULL_TERMINATED;
-const gchar*    g_intern_printf         (const gchar   *format,
-                                         ...) G_GNUC_PRINTF (1,2);
 
 gchar*          g_path_concat     (const gchar   *first_path,
                                    ...) G_GNUC_NULL_TERMINATED;