gegl r1966 - in trunk: . gegl

[neo svn gnome org]

Author: neo
Date: Tue Feb  5 15:35:58 2008
New Revision: 1966
URL: http://svn.gnome.org/viewvc/gegl?rev=1966&view=rev

Log:
2008-02-05  Sven Neumann  <sven gimp org>

	* gegl/gegl-utils.[ch]: added format function attributes to the log API.
	Declared local functions as static and removed unused code.


Modified:
   trunk/ChangeLog
   trunk/gegl/gegl-utils.c
   trunk/gegl/gegl-utils.h

Modified: trunk/gegl/gegl-utils.c
==============================================================================
--- trunk/gegl/gegl-utils.c	(original)
+++ trunk/gegl/gegl-utils.c	Tue Feb  5 15:35:58 2008
@@ -26,24 +26,15 @@
 #include "gegl-types.h"
 
 
-void gegl_log         (GLogLevelFlags  level,
-                       const gchar    *file,
-                       gint            line,
-                       const gchar    *function,
-                       const gchar    *format,
-                       ...);
-void gegl_logv        (GLogLevelFlags  level,
-                       const gchar    *file,
-                       gint            line,
-                       const gchar    *function,
-                       const gchar    *format,
-                       va_list         args);
-void gegl_direct_log  (GLogLevelFlags  level,
-                       const gchar    *format,
-                       ...);
-void gegl_direct_logv (GLogLevelFlags  level,
-                       const gchar    *format,
-                       va_list         args);
+static void gegl_logv        (GLogLevelFlags  level,
+                              const gchar    *file,
+                              gint            line,
+                              const gchar    *function,
+                              const gchar    *format,
+                              va_list         args);
+static void gegl_direct_logv (GLogLevelFlags  level,
+                              const gchar    *format,
+                              va_list         args);
 
 
 inline gint
@@ -240,22 +231,7 @@
   va_end (args);
 }
 
-void
-gegl_log (GLogLevelFlags  level,
-          const gchar    *file,
-          gint            line,
-          const gchar    *function,
-          const gchar    *format,
-          ...)
-{
-  va_list args;
-
-  va_start (args, format);
-  gegl_logv (level, file, line, function, format, args);
-  va_end (args);
-}
-
-void
+static void
 gegl_logv (GLogLevelFlags  level,
            const gchar    *file,
            gint            line,
@@ -278,19 +254,7 @@
     }
 }
 
-void
-gegl_direct_log (GLogLevelFlags  level,
-                 const gchar    *format,
-                 ...)
-{
-  va_list args;
-
-  va_start (args, format);
-  gegl_direct_logv (level, format, args);
-  va_end (args);
-}
-
-void
+static void
 gegl_direct_logv (GLogLevelFlags  level,
                   const gchar    *format,
                   va_list         args)

Modified: trunk/gegl/gegl-utils.h
==============================================================================
--- trunk/gegl/gegl-utils.h	(original)
+++ trunk/gegl/gegl-utils.h	Tue Feb  5 15:35:58 2008
@@ -50,19 +50,19 @@
                                           gint            line,
                                           const gchar    *function,
                                           const gchar    *format,
-                                          ...);
+                                          ...) G_GNUC_PRINTF (4, 5);
 void        gegl_log_info                (const gchar    *file,
                                           gint            line,
                                           const gchar    *function,
                                           const gchar    *format,
-                                          ...);
+                                          ...) G_GNUC_PRINTF (4, 5);
 void        gegl_log_message             (const gchar    *file,
                                           gint            line,
                                           const gchar    *function,
                                           const gchar    *format,
-                                          ...);
+                                          ...) G_GNUC_PRINTF (4, 5);
 void        gegl_log_direct              (const gchar    *format,
-                                          ...);
+                                          ...) G_GNUC_PRINTF (1, 2);
 
 GType       gegl_rectangle_get_type      (void) G_GNUC_CONST;