r17711 - gnucash/trunk/src - Fix compiler warning/error about incompatible function pointer type, fixing r17709

[Christian Stimming]

Author: cstim
Date: 2008-11-20 12:11:47 -0500 (Thu, 20 Nov 2008)
New Revision: 17711
Trac: http://svn.gnucash.org/trac/changeset/17711

Modified:
   gnucash/trunk/src/business/business-gnome/business-gnome-utils.c
   gnucash/trunk/src/engine/gnc-commodity.c
   gnucash/trunk/src/engine/gnc-commodity.h
   gnucash/trunk/src/gnome-utils/gnc-account-sel.c
Log:
Fix compiler warning/error about incompatible function pointer type, fixing r17709

This is fixed by inserting a wrapper function whose pointer has the
correct type as needed by g_list_find_custom.

Modified: gnucash/trunk/src/business/business-gnome/business-gnome-utils.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/business-gnome-utils.c	2008-11-20 17:00:53 UTC (rev 17710)
+++ gnucash/trunk/src/business/business-gnome/business-gnome-utils.c	2008-11-20 17:11:47 UTC (rev 17711)
@@ -343,7 +343,7 @@
     {
         if ( g_list_find_custom( acct_commodities,
                                  GINT_TO_POINTER(xaccAccountGetCommodity(account)),
-                                 gnc_commodity_compare) == NULL ) {
+                                 gnc_commodity_compare_void) == NULL ) {
             continue;
         }
     }

Modified: gnucash/trunk/src/engine/gnc-commodity.c
===================================================================
--- gnucash/trunk/src/engine/gnc-commodity.c	2008-11-20 17:00:53 UTC (rev 17710)
+++ gnucash/trunk/src/engine/gnc-commodity.c	2008-11-20 17:11:47 UTC (rev 17711)
@@ -1507,6 +1507,11 @@
     }
 }
 
+int gnc_commodity_compare_void(const void * a, const void * b)
+{
+  return gnc_commodity_compare(a, b);
+}
+
 /************************************************************
  *                   Namespace functions                    *
  ************************************************************/

Modified: gnucash/trunk/src/engine/gnc-commodity.h
===================================================================
--- gnucash/trunk/src/engine/gnc-commodity.h	2008-11-20 17:00:53 UTC (rev 17710)
+++ gnucash/trunk/src/engine/gnc-commodity.h	2008-11-20 17:11:47 UTC (rev 17711)
@@ -651,6 +651,12 @@
  *   than "true or false"
  */
 int gnc_commodity_compare(const gnc_commodity * a, const gnc_commodity * b);
+
+/** A wrapper around gnc_commodity_compare() which offers the function
+ * declaration that is needed for g_list_find_custom(), which needs
+ * void pointers instead of gnc_commodity ones.
+ */
+int gnc_commodity_compare_void(const void * a, const void * b);
 /** @} */
 
 

Modified: gnucash/trunk/src/gnome-utils/gnc-account-sel.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-account-sel.c	2008-11-20 17:00:53 UTC (rev 17710)
+++ gnucash/trunk/src/gnome-utils/gnc-account-sel.c	2008-11-20 17:11:47 UTC (rev 17711)
@@ -231,14 +231,6 @@
         }
 }
 
-/* Wrapper to offer the correct function declaration for
-   g_list_find_custom(), which needs void pointers instead of
-   gnc_commodity ones */
-static int gnc_commodity_compare_void(const void *a, const void *b)
-{
-  return gnc_commodity_compare(a, b);
-}
-
 static
 void
 gas_filter_accounts( gpointer data, gpointer user_data )