[librsvg] Align the function arguments in the public headers

[Federico Mena Quintero <federico src gnome org>]

commit acc93069154556ad6f881873ad89b41c9363d7d8
Author: Federico Mena Quintero <federico gnome org>
Date:   Fri Jan 25 15:36:58 2019 -0600

    Align the function arguments in the public headers
    
    And make the argument names consistent between the header and the
    source file; this makes gtk-doc happy.

 librsvg/rsvg-cairo.h  |  4 +--
 librsvg/rsvg-handle.c | 46 +++++++++++++++------------
 librsvg/rsvg-pixbuf.c | 17 +++++++---
 librsvg/rsvg.h        | 87 +++++++++++++++++++++++++++++++--------------------
 4 files changed, 94 insertions(+), 60 deletions(-)
---
diff --git a/librsvg/rsvg-cairo.h b/librsvg/rsvg-cairo.h
index 048ee104..34649431 100644
--- a/librsvg/rsvg-cairo.h
+++ b/librsvg/rsvg-cairo.h
@@ -34,8 +34,8 @@
 
 G_BEGIN_DECLS 
 
-gboolean    rsvg_handle_render_cairo     (RsvgHandle * handle, cairo_t * cr);
-gboolean    rsvg_handle_render_cairo_sub (RsvgHandle * handle, cairo_t * cr, const char *id);
+gboolean    rsvg_handle_render_cairo     (RsvgHandle *handle, cairo_t *cr);
+gboolean    rsvg_handle_render_cairo_sub (RsvgHandle *handle, cairo_t *cr, const char *id);
 
 G_END_DECLS
 
diff --git a/librsvg/rsvg-handle.c b/librsvg/rsvg-handle.c
index 5028a9bf..c6c6d8eb 100644
--- a/librsvg/rsvg-handle.c
+++ b/librsvg/rsvg-handle.c
@@ -347,7 +347,7 @@ rsvg_handle_get_type (void)
  * Deprecated: Use g_object_unref() instead.
  **/
 void
-rsvg_handle_free (RsvgHandle * handle)
+rsvg_handle_free (RsvgHandle *handle)
 {
     g_object_unref (handle);
 }
@@ -493,9 +493,9 @@ rsvg_handle_new_from_gfile_sync (GFile          *file,
  * Since: 2.32
  */
 RsvgHandle *
-rsvg_handle_new_from_stream_sync (GInputStream   *input_stream,
-                                  GFile          *base_file,
-                                  RsvgHandleFlags flags,
+rsvg_handle_new_from_stream_sync (GInputStream    *input_stream,
+                                  GFile           *base_file,
+                                  RsvgHandleFlags  flags,
                                   GCancellable    *cancellable,
                                   GError         **error)
 {
@@ -610,7 +610,7 @@ rsvg_handle_read_stream_sync (RsvgHandle   *handle,
  * Since: 2.9
  */
 void
-rsvg_handle_set_base_uri (RsvgHandle * handle, const char *base_uri)
+rsvg_handle_set_base_uri (RsvgHandle *handle, const char *base_uri)
 {
     g_return_if_fail (RSVG_IS_HANDLE (handle));
     g_return_if_fail (base_uri != NULL);
@@ -687,7 +687,7 @@ rsvg_handle_get_metadata (RsvgHandle * handle)
  * this function always returns #NULL.
  */
 const char *
-rsvg_handle_get_title (RsvgHandle * handle)
+rsvg_handle_get_title (RsvgHandle *handle)
 {
     g_return_val_if_fail (handle, NULL);
 
@@ -706,7 +706,7 @@ rsvg_handle_get_title (RsvgHandle * handle)
  * this function always returns #NULL.
  */
 const char *
-rsvg_handle_get_desc (RsvgHandle * handle)
+rsvg_handle_get_desc (RsvgHandle *handle)
 {
     g_return_val_if_fail (handle, NULL);
 
@@ -730,7 +730,7 @@ rsvg_handle_get_desc (RsvgHandle * handle)
  * Since: 2.14
  */
 gboolean
-rsvg_handle_render_cairo_sub (RsvgHandle * handle, cairo_t * cr, const char *id)
+rsvg_handle_render_cairo_sub (RsvgHandle *handle, cairo_t *cr, const char *id)
 {
     g_return_val_if_fail (RSVG_IS_HANDLE (handle), FALSE);
     g_return_val_if_fail (cr != NULL, FALSE);
@@ -752,7 +752,7 @@ rsvg_handle_render_cairo_sub (RsvgHandle * handle, cairo_t * cr, const char *id)
  * Since: 2.14
  */
 gboolean
-rsvg_handle_render_cairo (RsvgHandle * handle, cairo_t * cr)
+rsvg_handle_render_cairo (RsvgHandle *handle, cairo_t *cr)
 {
     return rsvg_handle_render_cairo_sub (handle, cr, NULL);
 }
@@ -767,7 +767,7 @@ rsvg_handle_render_cairo (RsvgHandle * handle, cairo_t * cr)
  * Since: 2.14
  */
 void
-rsvg_handle_get_dimensions (RsvgHandle * handle, RsvgDimensionData * dimension_data)
+rsvg_handle_get_dimensions (RsvgHandle *handle, RsvgDimensionData *dimension_data)
 {
     g_return_if_fail (RSVG_IS_HANDLE (handle));
     g_return_if_fail (dimension_data != NULL);
@@ -790,7 +790,9 @@ rsvg_handle_get_dimensions (RsvgHandle * handle, RsvgDimensionData * dimension_d
  * Since: 2.22
  */
 gboolean
-rsvg_handle_get_dimensions_sub (RsvgHandle * handle, RsvgDimensionData * dimension_data, const char *id)
+rsvg_handle_get_dimensions_sub (RsvgHandle *handle,
+                                RsvgDimensionData *dimension_data,
+                                const char *id)
 {
     g_return_val_if_fail (RSVG_IS_HANDLE (handle), FALSE);
     g_return_val_if_fail (dimension_data, FALSE);
@@ -814,7 +816,10 @@ rsvg_handle_get_dimensions_sub (RsvgHandle * handle, RsvgDimensionData * dimensi
  * Since: 2.46
  */
 gboolean
-rsvg_handle_get_geometry_sub (RsvgHandle * handle, RsvgRectangle * ink_rect, RsvgRectangle * logical_rect, 
const char *id)
+rsvg_handle_get_geometry_sub (RsvgHandle *handle,
+                              RsvgRectangle *ink_rect,
+                              RsvgRectangle *logical_rect,
+                              const char *id)
 {
     g_return_val_if_fail (RSVG_IS_HANDLE (handle), FALSE);
 
@@ -836,7 +841,9 @@ rsvg_handle_get_geometry_sub (RsvgHandle * handle, RsvgRectangle * ink_rect, Rsv
  * Since: 2.22
  */
 gboolean
-rsvg_handle_get_position_sub (RsvgHandle * handle, RsvgPositionData * position_data, const char *id)
+rsvg_handle_get_position_sub (RsvgHandle *handle,
+                              RsvgPositionData *position_data,
+                              const char *id)
 {
     g_return_val_if_fail (RSVG_IS_HANDLE (handle), FALSE);
     g_return_val_if_fail (position_data != NULL, FALSE);
@@ -856,8 +863,7 @@ rsvg_handle_get_position_sub (RsvgHandle * handle, RsvgPositionData * position_d
  * Since: 2.22
  */
 gboolean
-rsvg_handle_has_sub (RsvgHandle *handle,
-                     const char *id)
+rsvg_handle_has_sub (RsvgHandle *handle, const char *id)
 {
     g_return_val_if_fail (RSVG_IS_HANDLE (handle), FALSE);
 
@@ -887,7 +893,7 @@ rsvg_handle_has_sub (RsvgHandle *handle,
  * Since: 2.14
  **/
 GdkPixbuf *
-rsvg_handle_get_pixbuf_sub (RsvgHandle * handle, const char *id)
+rsvg_handle_get_pixbuf_sub (RsvgHandle *handle, const char *id)
 {
     g_return_val_if_fail (RSVG_IS_HANDLE (handle), NULL);
 
@@ -907,7 +913,7 @@ rsvg_handle_get_pixbuf_sub (RsvgHandle * handle, const char *id)
  * Returns: (transfer full) (nullable): the pixbuf loaded by @handle, or %NULL.
  **/
 GdkPixbuf *
-rsvg_handle_get_pixbuf (RsvgHandle * handle)
+rsvg_handle_get_pixbuf (RsvgHandle *handle)
 {
     return rsvg_handle_get_pixbuf_sub (handle, NULL);
 }
@@ -924,7 +930,7 @@ rsvg_handle_get_pixbuf (RsvgHandle * handle)
  * Since: 2.8
  */
 void
-rsvg_handle_set_dpi (RsvgHandle * handle, double dpi)
+rsvg_handle_set_dpi (RsvgHandle *handle, double dpi)
 {
     rsvg_handle_set_dpi_x_y (handle, dpi, dpi);
 }
@@ -942,7 +948,7 @@ rsvg_handle_set_dpi (RsvgHandle * handle, double dpi)
  * Since: 2.8
  */
 void
-rsvg_handle_set_dpi_x_y (RsvgHandle * handle, double dpi_x, double dpi_y)
+rsvg_handle_set_dpi_x_y (RsvgHandle *handle, double dpi_x, double dpi_y)
 {
     g_return_if_fail (RSVG_IS_HANDLE (handle));
 
@@ -1008,7 +1014,7 @@ rsvg_handle_set_dpi_x_y (RsvgHandle * handle, double dpi_x, double dpi_y)
  * unambiguous, to use code similar to the example above.
  **/
 void
-rsvg_handle_set_size_callback (RsvgHandle * handle,
+rsvg_handle_set_size_callback (RsvgHandle *handle,
                                RsvgSizeFunc size_func,
                                gpointer user_data,
                                GDestroyNotify user_data_destroy)
diff --git a/librsvg/rsvg-pixbuf.c b/librsvg/rsvg-pixbuf.c
index 65cf388f..2c381558 100644
--- a/librsvg/rsvg-pixbuf.c
+++ b/librsvg/rsvg-pixbuf.c
@@ -99,7 +99,9 @@ rsvg_pixbuf_from_file (const gchar *filename, GError **error)
  **/
 GdkPixbuf *
 rsvg_pixbuf_from_file_at_zoom (const gchar *filename,
-                               double x_zoom, double y_zoom, GError **error)
+                               double x_zoom,
+                               double y_zoom,
+                               GError **error)
 {
     g_return_val_if_fail (filename != NULL, NULL);
     g_return_val_if_fail (x_zoom > 0.0 && y_zoom > 0.0, NULL);
@@ -130,7 +132,9 @@ GdkPixbuf *
 rsvg_pixbuf_from_file_at_zoom_with_max (const gchar *filename,
                                         double x_zoom,
                                         double y_zoom,
-                                        gint max_width, gint max_height, GError **error)
+                                        gint max_width,
+                                        gint max_height,
+                                        GError **error)
 {
     g_return_val_if_fail (filename != NULL, NULL);
     g_return_val_if_fail (x_zoom > 0.0 && y_zoom > 0.0, NULL);
@@ -157,7 +161,10 @@ rsvg_pixbuf_from_file_at_zoom_with_max (const gchar *filename,
  * Deprecated: Set up a cairo matrix and use rsvg_handle_new_from_file() + rsvg_handle_render_cairo() 
instead.
  **/
 GdkPixbuf *
-rsvg_pixbuf_from_file_at_size (const gchar *filename, gint width, gint height, GError **error)
+rsvg_pixbuf_from_file_at_size (const gchar *filename,
+                               gint width,
+                               gint height,
+                               GError **error)
 {
     g_return_val_if_fail (filename != NULL, NULL);
     g_return_val_if_fail ((width >= 1 && height >= 1) || (width == -1 && height == -1), NULL);
@@ -183,7 +190,9 @@ rsvg_pixbuf_from_file_at_size (const gchar *filename, gint width, gint height, G
  **/
 GdkPixbuf *
 rsvg_pixbuf_from_file_at_max_size (const gchar *filename,
-                                   gint max_width, gint max_height, GError **error)
+                                   gint max_width,
+                                   gint max_height,
+                                   GError **error)
 {
     g_return_val_if_fail (filename != NULL, NULL);
     g_return_val_if_fail (max_width >= 1 && max_height >= 1, NULL);
diff --git a/librsvg/rsvg.h b/librsvg/rsvg.h
index ba5dd850..cfb694a1 100644
--- a/librsvg/rsvg.h
+++ b/librsvg/rsvg.h
@@ -166,34 +166,43 @@ void rsvg_set_default_dpi (double dpi);
 RSVG_DEPRECATED
 void rsvg_set_default_dpi_x_y  (double dpi_x, double dpi_y);
 
-void rsvg_handle_set_dpi       (RsvgHandle * handle, double dpi);
-void rsvg_handle_set_dpi_x_y   (RsvgHandle * handle, double dpi_x, double dpi_y);
+void rsvg_handle_set_dpi       (RsvgHandle *handle, double dpi);
+void rsvg_handle_set_dpi_x_y   (RsvgHandle *handle, double dpi_x, double dpi_y);
 
 RsvgHandle  *rsvg_handle_new           (void);
 
 RSVG_DEPRECATED_FOR(rsvg_handle_read_stream_sync)
-gboolean     rsvg_handle_write         (RsvgHandle * handle, const guchar * buf, 
-                                         gsize count, GError ** error);
+gboolean     rsvg_handle_write         (RsvgHandle   *handle,
+                                         const guchar *buf, 
+                                         gsize         count,
+                                         GError      **error);
 RSVG_DEPRECATED_FOR(rsvg_handle_read_stream_sync)
-gboolean     rsvg_handle_close         (RsvgHandle * handle, GError ** error);
+gboolean     rsvg_handle_close         (RsvgHandle *handle, GError **error);
 
-GdkPixbuf   *rsvg_handle_get_pixbuf    (RsvgHandle * handle);
-GdkPixbuf   *rsvg_handle_get_pixbuf_sub (RsvgHandle * handle, const char *id);
+GdkPixbuf   *rsvg_handle_get_pixbuf    (RsvgHandle *handle);
+GdkPixbuf   *rsvg_handle_get_pixbuf_sub (RsvgHandle *handle, const char *id);
 
-const char  *rsvg_handle_get_base_uri (RsvgHandle * handle);
-void         rsvg_handle_set_base_uri (RsvgHandle * handle, const char *base_uri);
+const char  *rsvg_handle_get_base_uri (RsvgHandle *handle);
+void         rsvg_handle_set_base_uri (RsvgHandle *handle, const char *base_uri);
 
-void rsvg_handle_get_dimensions (RsvgHandle * handle, RsvgDimensionData * dimension_data);
+void rsvg_handle_get_dimensions (RsvgHandle *handle, RsvgDimensionData *dimension_data);
 
 RSVG_DEPRECATED_FOR(rsvg_handle_get_geometry_sub)
-gboolean rsvg_handle_get_dimensions_sub (RsvgHandle * handle, RsvgDimensionData * dimension_data, const char 
*id);
+gboolean rsvg_handle_get_dimensions_sub (RsvgHandle        *handle,
+                                         RsvgDimensionData *dimension_data,
+                                         const char        *id);
 
 RSVG_DEPRECATED_FOR(rsvg_handle_get_geometry_sub)
-gboolean rsvg_handle_get_position_sub (RsvgHandle * handle, RsvgPositionData * position_data, const char 
*id);
+gboolean rsvg_handle_get_position_sub (RsvgHandle       *handle,
+                                       RsvgPositionData *position_data,
+                                       const char       *id);
 
-gboolean rsvg_handle_get_geometry_sub (RsvgHandle * handle, RsvgRectangle * ink_rect, RsvgRectangle * 
logical_rect, const char *id);
+gboolean rsvg_handle_get_geometry_sub (RsvgHandle    *handle,
+                                       RsvgRectangle *ink_rect,
+                                       RsvgRectangle *logical_rect,
+                                       const char    *id);
 
-gboolean rsvg_handle_has_sub (RsvgHandle * handle, const char *id);
+gboolean rsvg_handle_has_sub (RsvgHandle *handle, const char *id);
 
 /* GIO APIs */
 
@@ -246,8 +255,8 @@ RsvgHandle *rsvg_handle_new_from_stream_sync (GInputStream   *input_stream,
                                               GCancellable   *cancellable,
                                               GError        **error);
 
-RsvgHandle *rsvg_handle_new_from_data (const guint8 * data, gsize data_len, GError ** error);
-RsvgHandle *rsvg_handle_new_from_file (const gchar * file_name, GError ** error);
+RsvgHandle *rsvg_handle_new_from_data (const guint8 *data, gsize data_len, GError **error);
+RsvgHandle *rsvg_handle_new_from_file (const gchar *filename, GError **error);
 
 #ifndef __GTK_DOC_IGNORE__
 void rsvg_handle_internal_set_testing (RsvgHandle *handle, gboolean testing);
@@ -263,7 +272,7 @@ RSVG_DEPRECATED
 void rsvg_term (void);
 
 RSVG_DEPRECATED_FOR(g_object_unref)
-void rsvg_handle_free (RsvgHandle * handle);
+void rsvg_handle_free (RsvgHandle *handle);
 
 /**
  * RsvgSizeFunc:
@@ -280,35 +289,45 @@ void rsvg_handle_free (RsvgHandle * handle);
 typedef void (*RsvgSizeFunc) (gint * width, gint * height, gpointer user_data);
 
 RSVG_DEPRECATED
-void rsvg_handle_set_size_callback (RsvgHandle * handle,
-                                    RsvgSizeFunc size_func,
-                                    gpointer user_data, GDestroyNotify user_data_destroy);
+void rsvg_handle_set_size_callback (RsvgHandle    *handle,
+                                    RsvgSizeFunc   size_func,
+                                    gpointer       user_data,
+                                    GDestroyNotify user_data_destroy);
 
 /* GdkPixbuf convenience API */
 
 RSVG_DEPRECATED
-GdkPixbuf *rsvg_pixbuf_from_file            (const gchar * file_name, GError ** error);
+GdkPixbuf *rsvg_pixbuf_from_file            (const gchar *filename,
+                                             GError     **error);
 RSVG_DEPRECATED
-GdkPixbuf *rsvg_pixbuf_from_file_at_zoom    (const gchar * file_name,
-                                             double x_zoom, double y_zoom, GError ** error);
+GdkPixbuf *rsvg_pixbuf_from_file_at_zoom    (const gchar *filename,
+                                             double       x_zoom,
+                                             double       y_zoom,
+                                             GError     **error);
 RSVG_DEPRECATED
-GdkPixbuf *rsvg_pixbuf_from_file_at_size    (const gchar * file_name, gint width, gint height,
-                                             GError ** error);
+GdkPixbuf *rsvg_pixbuf_from_file_at_size    (const gchar *filename,
+                                             gint         width,
+                                             gint         height,
+                                             GError     **error);
 RSVG_DEPRECATED
-GdkPixbuf *rsvg_pixbuf_from_file_at_max_size    (const gchar * file_name,
-                                                 gint max_width, gint max_height, GError ** error);
+GdkPixbuf *rsvg_pixbuf_from_file_at_max_size    (const gchar *filename,
+                                                 gint         max_width,
+                                                 gint         max_height,
+                                                 GError     **error);
 RSVG_DEPRECATED
-GdkPixbuf *rsvg_pixbuf_from_file_at_zoom_with_max (const gchar * file_name,
-                                                   double x_zoom,
-                                                   double y_zoom,
-                                                   gint max_width, gint max_height, GError ** error);
+GdkPixbuf *rsvg_pixbuf_from_file_at_zoom_with_max (const gchar *filename,
+                                                   double       x_zoom,
+                                                   double       y_zoom,
+                                                   gint         max_width,
+                                                   gint         max_height,
+                                                   GError     **error);
 
 RSVG_DEPRECATED
-const char *rsvg_handle_get_title       (RsvgHandle * handle);
+const char *rsvg_handle_get_title       (RsvgHandle *handle);
 RSVG_DEPRECATED
-const char *rsvg_handle_get_desc        (RsvgHandle * handle);
+const char *rsvg_handle_get_desc        (RsvgHandle *handle);
 RSVG_DEPRECATED
-const char *rsvg_handle_get_metadata    (RsvgHandle * handle);
+const char *rsvg_handle_get_metadata    (RsvgHandle *handle);
 
 #endif /* !__GI_SCANNER__ */