[beast/devel: 20/35] BSE: use Rapicorn::string_format() for bse_storage_printf()

[Tim Janik <timj src gnome org>]

commit b2a9b49ce19fd55d254533483181c6a3053e383d
Author: Tim Janik <timj gnu org>
Date:   Mon May 13 01:15:01 2013 +0200

    BSE: use Rapicorn::string_format() for bse_storage_printf()

 bse/bsestorage.cc |   20 --------------------
 bse/bsestorage.hh |    5 +----
 2 files changed, 1 insertions(+), 24 deletions(-)
---
diff --git a/bse/bsestorage.cc b/bse/bsestorage.cc
index 7e1dacc..80aa2b0 100644
--- a/bse/bsestorage.cc
+++ b/bse/bsestorage.cc
@@ -1169,26 +1169,6 @@ bse_storage_putr (BseStorage     *self,
 }
 
 void
-bse_storage_printf (BseStorage  *self,
-                    const gchar *format,
-                    ...)
-{
-  gchar *buffer;
-  va_list args;
-  g_return_if_fail (BSE_IS_STORAGE (self));
-  g_return_if_fail (self->wstore);
-  g_return_if_fail (format != NULL);
-  const gchar *ldir = g_printf_find_localised_directive (format);
-  if (ldir)
-    g_warning ("%s: encountered localised directive \"%s\" in format string: \"%s\"", G_STRFUNC, ldir, 
format);
-  va_start (args, format);
-  buffer = g_strdup_vprintf (format, args);
-  va_end (args);
-  bse_storage_puts (self, buffer);
-  g_free (buffer);
-}
-
-void
 bse_storage_put_xinfos (BseStorage *self,
                         gchar     **xinfos)
 {
diff --git a/bse/bsestorage.hh b/bse/bsestorage.hh
index c73bcc5..1a2ec95 100644
--- a/bse/bsestorage.hh
+++ b/bse/bsestorage.hh
@@ -109,9 +109,6 @@ void         bse_storage_putd                   (BseStorage             *self,
 void         bse_storage_putr                   (BseStorage             *self,
                                                  SfiReal                 vreal,
                                                  const gchar            *hints);
-void         bse_storage_printf                 (BseStorage             *self,
-                                                 const gchar            *format,
-                                                 ...) G_GNUC_PRINTF (2, 3);
 void         bse_storage_put_param              (BseStorage             *self,
                                                  const GValue           *value,
                                                  GParamSpec             *pspec);
@@ -176,7 +173,7 @@ gboolean     bse_storage_check_parse_negate     (BseStorage             *self);
 #define bse_storage_break(s)            sfi_wstore_break ((s)->wstore)
 #define bse_storage_putc(s,c)           sfi_wstore_putc ((s)->wstore, c)
 #define bse_storage_puts(s,b)           sfi_wstore_puts ((s)->wstore, b)
-
+#define bse_storage_printf(s, ...)      bse_storage_puts (s, Rapicorn::string_format (__VA_ARGS__).c_str())
 
 G_END_DECLS