[rygel-gst-0-10-plugins] Fix function prototype so casting is not necessary.



commit 6cb8e73b8b1a3a8f997afe56bfc82cd00d6de3c7
Author: Krzesimir Nowak <krnowak openismus com>
Date:   Tue Feb 5 15:44:52 2013 +0100

    Fix function prototype so casting is not necessary.

 src/media-export/rygel-media-export-database.c |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/src/media-export/rygel-media-export-database.c b/src/media-export/rygel-media-export-database.c
index 429ac50..b6a868c 100644
--- a/src/media-export/rygel-media-export-database.c
+++ b/src/media-export/rygel-media-export-database.c
@@ -39,9 +39,9 @@ G_DEFINE_TYPE (RygelMediaExportDatabase,
 	       RYGEL_MEDIA_EXPORT_TYPE_SQLITE_WRAPPER)
 
 static void rygel_media_export_database_utf8_contains (sqlite3_context* context, sqlite3_value** args, int args_length1);
-static gint rygel_media_export_database_utf8_collate (gint alen, void* a, gint blen, void* b);
+static gint rygel_media_export_database_utf8_collate (gint alen, gconstpointer a, gint blen, gconstpointer b);
 static void rygel_media_export_database_utf8_contains_sqlite_user_func_callback (sqlite3_context* context, int values_length1, sqlite3_value** values);
-static gint rygel_media_export_database_utf8_collate_sqlite_compare_callback (gpointer self, gint alen, void* a, gint blen, void* b);
+static gint rygel_media_export_database_utf8_collate_sqlite_compare_callback (gpointer self, gint alen, gconstpointer a, gint blen, gconstpointer b);
 
 /**
  * Function to implement the custom SQL function 'contains'
@@ -79,10 +79,10 @@ void rygel_media_export_database_utf8_contains (sqlite3_context  *context,
  * Uses utf8 case-fold to compare the strings.
  */
 static gint
-rygel_media_export_database_utf8_collate (gint  alen G_GNUC_UNUSED,
-					  void *a,
-					  gint  blen G_GNUC_UNUSED,
-					  void *b) {
+rygel_media_export_database_utf8_collate (gint          alen G_GNUC_UNUSED,
+					  gconstpointer a,
+					  gint          blen G_GNUC_UNUSED,
+					  gconstpointer b) {
   return rygel_media_export_utf8_collate_str (a, b);
 }
 
@@ -100,11 +100,11 @@ rygel_media_export_database_utf8_contains_sqlite_user_func_callback (sqlite3_con
 	rygel_media_export_database_utf8_contains (context, values, values_length);
 }
 
-static gint rygel_media_export_database_utf8_collate_sqlite_compare_callback (gpointer  self G_GNUC_UNUSED,
-									      gint      alen,
-									      void     *a,
-									      gint      blen,
-									      void     *b) {
+static gint rygel_media_export_database_utf8_collate_sqlite_compare_callback (gpointer      self G_GNUC_UNUSED,
+									      gint          alen,
+									      gconstpointer a,
+									      gint          blen,
+									      gconstpointer b) {
 	return rygel_media_export_database_utf8_collate (alen, a, blen, b);
 }
 
@@ -172,7 +172,7 @@ rygel_media_export_database_new (const gchar  *name,
 			    "CASEFOLD",
 			    SQLITE_UTF8,
 			    NULL,
-			    (int (*)(void *, int,  const void *, int,  const void *)) rygel_media_export_database_utf8_collate_sqlite_compare_callback);
+			    rygel_media_export_database_utf8_collate_sqlite_compare_callback);
 
   return self;
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]