r17733 - gnucash/branches/2.2 - [r17585] Bug #539947: Replace __FUNCTION__ by G_STRFUNC.
Christian Stimming
cstim at cvs.gnucash.org
Thu Nov 27 06:17:31 EST 2008
Author: cstim
Date: 2008-11-27 06:17:30 -0500 (Thu, 27 Nov 2008)
New Revision: 17733
Trac: http://svn.gnucash.org/trac/changeset/17733
Modified:
gnucash/branches/2.2/lib/libqof/qof/qoflog.h
gnucash/branches/2.2/src/app-utils/gnc-exp-parser.c
gnucash/branches/2.2/src/app-utils/gnc-helpers.c
gnucash/branches/2.2/src/app-utils/option-util.c
gnucash/branches/2.2/src/backend/file/sixtp-utils.c
gnucash/branches/2.2/src/business/business-core/gncBusGuile.c
gnucash/branches/2.2/src/business/business-gnome/business-options-gnome.c
gnucash/branches/2.2/src/business/business-gnome/dialog-invoice.c
gnucash/branches/2.2/src/business/business-utils/business-options.c
gnucash/branches/2.2/src/core-utils/gnc-gobject-utils.c
gnucash/branches/2.2/src/engine/engine-helpers.c
gnucash/branches/2.2/src/engine/kvp-scm.c
gnucash/branches/2.2/src/gnome-utils/dialog-options.c
gnucash/branches/2.2/src/gnome/gnc-plugin-page-register.c
gnucash/branches/2.2/src/report/report-gnome/dialog-column-view.c
gnucash/branches/2.2/src/report/report-gnome/gnc-plugin-page-report.c
gnucash/branches/2.2/src/report/report-system/gnc-report.c
Log:
[r17585] Bug #539947: Replace __FUNCTION__ by G_STRFUNC.
Patch from Halton Huo.
Modified: gnucash/branches/2.2/lib/libqof/qof/qoflog.h
===================================================================
--- gnucash/branches/2.2/lib/libqof/qof/qoflog.h 2008-11-27 11:17:13 UTC (rev 17732)
+++ gnucash/branches/2.2/lib/libqof/qof/qoflog.h 2008-11-27 11:17:30 UTC (rev 17733)
@@ -165,7 +165,7 @@
/** Set the default level for QOF-related log paths. **/
void qof_log_set_default(QofLogLevel log_level);
-#define PRETTY_FUNC_NAME qof_log_prettify(__FUNCTION__)
+#define PRETTY_FUNC_NAME qof_log_prettify(G_STRFUNC)
/** Log a fatal error */
#define FATAL(format, args...) do { \
@@ -254,21 +254,21 @@
#define START_CLOCK(clockno,format, args...) do { \
if (qof_log_check (log_module, QOF_LOG_INFO)) \
qof_start_clock (clockno, log_module, QOF_LOG_INFO, \
- __FUNCTION__, format , ## args); \
+ G_STRFUNC, format , ## args); \
} while (0)
/** report elapsed time since last report on a particular timer */
#define REPORT_CLOCK(clockno,format, args...) do { \
if (qof_log_check (log_module, QOF_LOG_INFO)) \
qof_report_clock (clockno, log_module, QOF_LOG_INFO, \
- __FUNCTION__, format , ## args); \
+ G_STRFUNC, format , ## args); \
} while (0)
/** report total elapsed time since timer started */
#define REPORT_CLOCK_TOTAL(clockno,format, args...) do { \
if (qof_log_check (log_module, QOF_LOG_INFO)) \
qof_report_clock_total (clockno, log_module, QOF_LOG_INFO, \
- __FUNCTION__, format , ## args); \
+ G_STRFUNC, format , ## args); \
} while (0)
Modified: gnucash/branches/2.2/src/app-utils/gnc-exp-parser.c
===================================================================
--- gnucash/branches/2.2/src/app-utils/gnc-exp-parser.c 2008-11-27 11:17:13 UTC (rev 17732)
+++ gnucash/branches/2.2/src/app-utils/gnc-exp-parser.c 2008-11-27 11:17:30 UTC (rev 17733)
@@ -382,7 +382,7 @@
}
result = g_new0( gnc_numeric, 1 );
- *result = double_to_gnc_numeric( scm_num2dbl(scmTmp, __FUNCTION__),
+ *result = double_to_gnc_numeric( scm_num2dbl(scmTmp, G_STRFUNC),
GNC_DENOM_AUTO,
GNC_DENOM_SIGFIGS(6) | GNC_RND_ROUND );
/* FIXME: cleanup scmArgs = scm_list, cons'ed cells? */
Modified: gnucash/branches/2.2/src/app-utils/gnc-helpers.c
===================================================================
--- gnucash/branches/2.2/src/app-utils/gnc-helpers.c 2008-11-27 11:17:13 UTC (rev 17732)
+++ gnucash/branches/2.2/src/app-utils/gnc-helpers.c 2008-11-27 11:17:30 UTC (rev 17733)
@@ -68,11 +68,11 @@
info_scm = SCM_CDR (info_scm);
info.max_decimal_places = scm_num2int (SCM_CAR (info_scm), SCM_ARG1,
- __FUNCTION__);
+ G_STRFUNC);
info_scm = SCM_CDR (info_scm);
info.min_decimal_places = scm_num2int (SCM_CAR (info_scm), SCM_ARG1,
- __FUNCTION__);
+ G_STRFUNC);
info_scm = SCM_CDR (info_scm);
info.use_separators = SCM_NFALSEP (SCM_CAR (info_scm));
Modified: gnucash/branches/2.2/src/app-utils/option-util.c
===================================================================
--- gnucash/branches/2.2/src/app-utils/option-util.c 2008-11-27 11:17:13 UTC (rev 17732)
+++ gnucash/branches/2.2/src/app-utils/option-util.c 2008-11-27 11:17:30 UTC (rev 17733)
@@ -821,7 +821,7 @@
if(SCM_EXACTP(value))
{
- return scm_num2int(value, SCM_ARG1, __FUNCTION__);
+ return scm_num2int(value, SCM_ARG1, G_STRFUNC);
}
else
{
@@ -850,7 +850,7 @@
}
else
{
- return scm_num2int(value, SCM_ARG1, __FUNCTION__);
+ return scm_num2int(value, SCM_ARG1, G_STRFUNC);
}
}
@@ -1032,7 +1032,7 @@
if (SCM_FALSEP (scm_integer_p (item))) {
PERR ("Invalid type");
} else {
- type = scm_num2long (item, SCM_ARG1, __FUNCTION__);
+ type = scm_num2long (item, SCM_ARG1, G_STRFUNC);
type_list = g_list_prepend (type_list, GINT_TO_POINTER (type));
}
}
@@ -1074,7 +1074,7 @@
return FALSE;
if (lower_bound != NULL)
- *lower_bound = scm_num2dbl(value, __FUNCTION__);
+ *lower_bound = scm_num2dbl(value, G_STRFUNC);
if (!SCM_LISTP(list) || SCM_NULLP(list))
return FALSE;
@@ -1087,7 +1087,7 @@
return FALSE;
if (upper_bound != NULL)
- *upper_bound = scm_num2dbl(value, __FUNCTION__);
+ *upper_bound = scm_num2dbl(value, G_STRFUNC);
if (!SCM_LISTP(list) || SCM_NULLP(list))
return FALSE;
@@ -1103,7 +1103,7 @@
* This is still safe for earlier guiles, too -- tested with 1.3.4.
*/
if (num_decimals != NULL) {
- double decimals = scm_num2dbl(value, __FUNCTION__);
+ double decimals = scm_num2dbl(value, G_STRFUNC);
*num_decimals = (int)decimals;
}
@@ -1118,7 +1118,7 @@
return FALSE;
if (step_size != NULL)
- *step_size = scm_num2dbl(value, __FUNCTION__);
+ *step_size = scm_num2dbl(value, G_STRFUNC);
return TRUE;
}
@@ -1148,7 +1148,7 @@
if (!SCM_NUMBERP(value))
return 0.0;
- return scm_num2dbl(value, __FUNCTION__);
+ return scm_num2dbl(value, G_STRFUNC);
}
@@ -1261,7 +1261,7 @@
scale = 1.0 / scale;
- rgba = scm_num2dbl(SCM_CAR(value), __FUNCTION__);
+ rgba = scm_num2dbl(SCM_CAR(value), G_STRFUNC);
if (red != NULL)
*red = MIN(1.0, rgba * scale);
@@ -1269,7 +1269,7 @@
if (!SCM_LISTP(value) || SCM_NULLP(value) || !SCM_NUMBERP(SCM_CAR(value)))
return FALSE;
- rgba = scm_num2dbl(SCM_CAR(value), __FUNCTION__);
+ rgba = scm_num2dbl(SCM_CAR(value), G_STRFUNC);
if (green != NULL)
*green = MIN(1.0, rgba * scale);
@@ -1277,7 +1277,7 @@
if (!SCM_LISTP(value) || SCM_NULLP(value) || !SCM_NUMBERP(SCM_CAR(value)))
return FALSE;
- rgba = scm_num2dbl(SCM_CAR(value), __FUNCTION__);
+ rgba = scm_num2dbl(SCM_CAR(value), G_STRFUNC);
if (blue != NULL)
*blue = MIN(1.0, rgba * scale);
@@ -1285,7 +1285,7 @@
if (!SCM_LISTP(value) || SCM_NULLP(value) || !SCM_NUMBERP(SCM_CAR(value)))
return FALSE;
- rgba = scm_num2dbl(SCM_CAR(value), __FUNCTION__);
+ rgba = scm_num2dbl(SCM_CAR(value), G_STRFUNC);
if (alpha != NULL)
*alpha = MIN(1.0, rgba * scale);
@@ -2215,7 +2215,7 @@
{
value = scm_call_0(getter);
if (SCM_NUMBERP(value))
- return scm_num2dbl(value, __FUNCTION__);
+ return scm_num2dbl(value, G_STRFUNC);
}
}
Modified: gnucash/branches/2.2/src/backend/file/sixtp-utils.c
===================================================================
--- gnucash/branches/2.2/src/backend/file/sixtp-utils.c 2008-11-27 11:17:13 UTC (rev 17732)
+++ gnucash/branches/2.2/src/backend/file/sixtp-utils.c 2008-11-27 11:17:30 UTC (rev 17733)
@@ -183,7 +183,7 @@
return(FALSE);
}
- *result = scm_num2dbl(conversion_result, __FUNCTION__);
+ *result = scm_num2dbl(conversion_result, G_STRFUNC);
}
#else /* don't USE_GUILE_FOR_DOUBLE_CONVERSION */
Modified: gnucash/branches/2.2/src/business/business-core/gncBusGuile.c
===================================================================
--- gnucash/branches/2.2/src/business/business-core/gncBusGuile.c 2008-11-27 11:17:13 UTC (rev 17732)
+++ gnucash/branches/2.2/src/business/business-core/gncBusGuile.c 2008-11-27 11:17:30 UTC (rev 17733)
@@ -26,7 +26,7 @@
#include "gncBusGuile.h"
#include "engine-helpers.h"
#include "swig-runtime.h"
-#define FUNC_NAME __FUNCTION__
+#define FUNC_NAME G_STRFUNC
static swig_type_info *
get_acct_type ()
Modified: gnucash/branches/2.2/src/business/business-gnome/business-options-gnome.c
===================================================================
--- gnucash/branches/2.2/src/business/business-gnome/business-options-gnome.c 2008-11-27 11:17:13 UTC (rev 17732)
+++ gnucash/branches/2.2/src/business/business-gnome/business-options-gnome.c 2008-11-27 11:17:30 UTC (rev 17733)
@@ -39,7 +39,7 @@
#include "business-gnome-utils.h"
#include "dialog-invoice.h"
-#define FUNC_NAME __FUNCTION__
+#define FUNC_NAME G_STRFUNC
static GtkWidget *
create_owner_widget (GNCOption *option, GncOwnerType type, GtkWidget *hbox)
@@ -98,7 +98,7 @@
SCM odata = gnc_option_get_option_data (option);
/* The option data is enum-typed. It's just the enum value. */
- return (GncOwnerType) scm_num2int(odata, SCM_ARG1, __FUNCTION__);
+ return (GncOwnerType) scm_num2int(odata, SCM_ARG1, G_STRFUNC);
}
Modified: gnucash/branches/2.2/src/business/business-gnome/dialog-invoice.c
===================================================================
--- gnucash/branches/2.2/src/business/business-gnome/dialog-invoice.c 2008-11-27 11:17:13 UTC (rev 17732)
+++ gnucash/branches/2.2/src/business/business-gnome/dialog-invoice.c 2008-11-27 11:17:30 UTC (rev 17733)
@@ -581,7 +581,7 @@
arg = scm_apply (func, args, SCM_EOL);
g_return_if_fail (SCM_EXACTP (arg));
- report_id = scm_num2int (arg, SCM_ARG1, __FUNCTION__);
+ report_id = scm_num2int (arg, SCM_ARG1, G_STRFUNC);
/* scm_gc_unprotect_object(func); */
if (report_id >= 0)
@@ -768,7 +768,7 @@
/* Apply the function to the args */
arg = scm_apply (func, args, SCM_EOL);
g_return_if_fail (SCM_EXACTP (arg));
- id = scm_num2int (arg, SCM_ARG1, __FUNCTION__);
+ id = scm_num2int (arg, SCM_ARG1, G_STRFUNC);
if (id >= 0)
reportWindow (id);
Modified: gnucash/branches/2.2/src/business/business-utils/business-options.c
===================================================================
--- gnucash/branches/2.2/src/business/business-utils/business-options.c 2008-11-27 11:17:13 UTC (rev 17732)
+++ gnucash/branches/2.2/src/business/business-utils/business-options.c 2008-11-27 11:17:30 UTC (rev 17733)
@@ -27,7 +27,7 @@
#include "business-options.h"
#include "swig-runtime.h"
-#define FUNC_NAME __FUNCTION__
+#define FUNC_NAME G_STRFUNC
#define LOOKUP_OPTION(fcn) \
GNCOption *option; \
Modified: gnucash/branches/2.2/src/core-utils/gnc-gobject-utils.c
===================================================================
--- gnucash/branches/2.2/src/core-utils/gnc-gobject-utils.c 2008-11-27 11:17:13 UTC (rev 17732)
+++ gnucash/branches/2.2/src/core-utils/gnc-gobject-utils.c 2008-11-27 11:17:30 UTC (rev 17733)
@@ -71,9 +71,9 @@
static void
gnc_gobject_dump_gobject (GObject *object, const gchar *name)
{
- //printf("Enter %s: object %p, name %s\n", __FUNCTION__, object, name);
+ //printf("Enter %s: object %p, name %s\n", G_STRFUNC, object, name);
g_message(" object %p, ref count %d", object, object->ref_count);
- //printf("Leave %s:\n", __FUNCTION__);
+ //printf("Leave %s:\n", G_STRFUNC);
}
@@ -86,10 +86,10 @@
static gboolean
gnc_gobject_dump_list (const gchar *name, GList *list, gpointer user_data)
{
- //printf("Enter %s: name %s, list %p\n", __FUNCTION__, name, list);
+ //printf("Enter %s: name %s, list %p\n", G_STRFUNC, name, list);
g_message(" %d %s", g_list_length(list), name);
g_list_foreach(list, (GFunc)gnc_gobject_dump_gobject, (gpointer)name);
- //printf("Leave %s:\n", __FUNCTION__);
+ //printf("Leave %s:\n", G_STRFUNC);
return TRUE;
}
@@ -105,14 +105,14 @@
{
GHashTable *table;
- //printf("Enter %s:\n", __FUNCTION__);
+ //printf("Enter %s:\n", G_STRFUNC);
table = gnc_gobject_tracking_table();
if (g_hash_table_size(table) > 0) {
g_message("The following objects remain alive:");
g_hash_table_foreach_remove(table, (GHRFunc)gnc_gobject_dump_list, NULL);
}
- //printf("Leave %s:\n", __FUNCTION__);
+ //printf("Leave %s:\n", G_STRFUNC);
}
@@ -135,13 +135,13 @@
klass = G_OBJECT_GET_CLASS(object);
name = g_type_name(G_TYPE_FROM_CLASS(klass));
- //printf("Enter %s: object %p of type %s\n", __FUNCTION__, object, name);
+ //printf("Enter %s: object %p of type %s\n", G_STRFUNC, object, name);
table = gnc_gobject_tracking_table();
list = g_hash_table_lookup(table, name);
if (g_list_index(list, object) != -1) {
g_critical("Object %p is already in list of %s", object, name);
- //printf("Leave %s: already in list\n", __FUNCTION__);
+ //printf("Leave %s: already in list\n", G_STRFUNC);
return;
}
@@ -149,7 +149,7 @@
g_hash_table_insert(table, g_strdup(name), list);
g_object_weak_ref(object, gnc_gobject_weak_cb, NULL);
- //printf("Leave %s:\n", __FUNCTION__);
+ //printf("Leave %s:\n", G_STRFUNC);
}
@@ -163,17 +163,17 @@
g_return_val_if_fail(G_IS_OBJECT(object), FALSE);
name = G_OBJECT_TYPE_NAME(object);
- //printf("Enter %s: object %p of type %s\n", __FUNCTION__, object, name);
+ //printf("Enter %s: object %p of type %s\n", G_STRFUNC, object, name);
table = gnc_gobject_tracking_table();
list = g_hash_table_lookup(table, name);
if (!list) {
- //printf("Leave %s: list for %s objects not found.\n", __FUNCTION__, name);
+ //printf("Leave %s: list for %s objects not found.\n", G_STRFUNC, name);
return FALSE;
}
item = g_list_find(list, object);
if (!item) {
- //printf("Leave %s: object %p not in %s object list.\n", __FUNCTION__,
+ //printf("Leave %s: object %p not in %s object list.\n", G_STRFUNC,
// object, name);
return FALSE;
}
@@ -181,10 +181,10 @@
list = g_list_remove_link(list, item);
if (list) {
g_hash_table_replace(table, g_strdup(name), list);
- //printf("Leave %s: object removed.\n", __FUNCTION__);
+ //printf("Leave %s: object removed.\n", G_STRFUNC);
} else {
g_hash_table_remove(table, name);
- //printf("Leave %s: object and list removed.\n", __FUNCTION__);
+ //printf("Leave %s: object and list removed.\n", G_STRFUNC);
}
return TRUE;
}
@@ -224,9 +224,9 @@
GHashTable *table;
GList *list;
- //printf("Enter %s: name %s\n", __FUNCTION__, name);
+ //printf("Enter %s: name %s\n", G_STRFUNC, name);
table = gnc_gobject_tracking_table();
list = g_hash_table_lookup(table, name);
- //printf("Leave %s: list %p\n", __FUNCTION__, list);
+ //printf("Leave %s: list %p\n", G_STRFUNC, list);
return list;
}
Modified: gnucash/branches/2.2/src/engine/engine-helpers.c
===================================================================
--- gnucash/branches/2.2/src/engine/engine-helpers.c 2008-11-27 11:17:13 UTC (rev 17732)
+++ gnucash/branches/2.2/src/engine/engine-helpers.c 2008-11-27 11:17:30 UTC (rev 17733)
@@ -42,7 +42,7 @@
#include "qofquery-p.h"
#include "qofquerycore-p.h"
-#define FUNC_NAME __FUNCTION__
+#define FUNC_NAME G_STRFUNC
static QofLogModule log_module = GNC_MOD_ENGINE;
@@ -106,7 +106,7 @@
if (gnc_timepair_p (x))
{
result.tv_sec = gnc_scm_to_gint64(SCM_CAR(x));
- result.tv_nsec = scm_num2long(SCM_CDR(x), SCM_ARG1, __FUNCTION__);
+ result.tv_nsec = scm_num2long(SCM_CDR(x), SCM_ARG1, G_STRFUNC);
}
return(result);
}
@@ -203,42 +203,42 @@
static QofQueryCompare
gnc_query_scm2compare (SCM how_scm)
{
- return scm_num2int(how_scm, SCM_ARG1, __FUNCTION__);
+ return scm_num2int(how_scm, SCM_ARG1, G_STRFUNC);
}
/* QofStringMatch */
static QofStringMatch
gnc_query_scm2string (SCM how_scm)
{
- return scm_num2int(how_scm, SCM_ARG1, __FUNCTION__);
+ return scm_num2int(how_scm, SCM_ARG1, G_STRFUNC);
}
/* QofDateMatch */
static QofDateMatch
gnc_query_scm2date (SCM how_scm)
{
- return scm_num2int(how_scm, SCM_ARG1, __FUNCTION__);
+ return scm_num2int(how_scm, SCM_ARG1, G_STRFUNC);
}
/* QofNumericMatch */
static QofNumericMatch
gnc_query_scm2numericop (SCM how_scm)
{
- return scm_num2int(how_scm, SCM_ARG1, __FUNCTION__);
+ return scm_num2int(how_scm, SCM_ARG1, G_STRFUNC);
}
/* QofGuidMatch */
static QofGuidMatch
gnc_query_scm2guid (SCM how_scm)
{
- return scm_num2int(how_scm, SCM_ARG1, __FUNCTION__);
+ return scm_num2int(how_scm, SCM_ARG1, G_STRFUNC);
}
/* QofCharMatch */
static QofCharMatch
gnc_query_scm2char (SCM how_scm)
{
- return scm_num2int(how_scm, SCM_ARG1, __FUNCTION__);
+ return scm_num2int(how_scm, SCM_ARG1, G_STRFUNC);
}
static QofGuidMatch
@@ -319,7 +319,7 @@
scm = SCM_CAR (field_scm);
field_scm = SCM_CDR (field_scm);
- bit = scm_num2int(scm, SCM_ARG2, __FUNCTION__);
+ bit = scm_num2int(scm, SCM_ARG2, G_STRFUNC);
field |= bit;
}
@@ -516,7 +516,7 @@
static KvpValueType
gnc_scm2KvpValueTypeype (SCM value_type_scm)
{
- return scm_num2int(value_type_scm, SCM_ARG1, __FUNCTION__);
+ return scm_num2int(value_type_scm, SCM_ARG1, G_STRFUNC);
}
static SCM gnc_kvp_frame2scm (KvpFrame *frame);
@@ -653,7 +653,7 @@
break;
case KVP_TYPE_DOUBLE:
- value = kvp_value_new_double (scm_num2dbl (val_scm, __FUNCTION__));
+ value = kvp_value_new_double (scm_num2dbl (val_scm, G_STRFUNC));
break;
case KVP_TYPE_STRING: {
@@ -988,7 +988,7 @@
qt_scm = SCM_CDR (qt_scm);
if (!SCM_NUMBERP (scm))
break;
- val = scm_num2dbl (scm, __FUNCTION__);
+ val = scm_num2dbl (scm, G_STRFUNC);
pd = qof_query_double_predicate (compare_how, val);
@@ -1179,7 +1179,7 @@
break;
scm = SCM_CAR (query_term_scm);
query_term_scm = SCM_CDR (query_term_scm);
- amount = scm_num2dbl (scm, __FUNCTION__);
+ amount = scm_num2dbl (scm, G_STRFUNC);
val = double_to_gnc_numeric (amount, GNC_DENOM_AUTO,
GNC_HOW_DENOM_SIGFIGS(6) | GNC_HOW_RND_ROUND);
@@ -1573,7 +1573,7 @@
gnc_query_path_free (p);
return FALSE;
}
- o = scm_num2int (val, SCM_ARG1, __FUNCTION__);
+ o = scm_num2int (val, SCM_ARG1, G_STRFUNC);
/* increasing */
val = SCM_CAR (sort_scm);
@@ -1813,7 +1813,7 @@
break;
}
- max_splits = scm_num2int (value, SCM_ARG1, __FUNCTION__);
+ max_splits = scm_num2int (value, SCM_ARG1, G_STRFUNC);
} else {
PERR ("Unknown symbol: %s", symbol);
@@ -1925,7 +1925,7 @@
break;
}
- max_results = scm_num2int (value, SCM_ARG1, __FUNCTION__);
+ max_results = scm_num2int (value, SCM_ARG1, G_STRFUNC);
} else {
ok = FALSE;
@@ -2047,7 +2047,7 @@
*/
for (i = 48; i >=0; i-= 16) {
bits = scm_ash(magnitude, SCM_MAKINUM(-i));
- c_bits = scm_num2ulong(scm_logand(bits, bits00to15_mask), SCM_ARG1, __FUNCTION__);
+ c_bits = scm_num2ulong(scm_logand(bits, bits00to15_mask), SCM_ARG1, G_STRFUNC);
c_result += ((long long)c_bits << i);
magnitude = scm_difference(magnitude, scm_ash(bits, SCM_MAKINUM(i)));
}
Modified: gnucash/branches/2.2/src/engine/kvp-scm.c
===================================================================
--- gnucash/branches/2.2/src/engine/kvp-scm.c 2008-11-27 11:17:13 UTC (rev 17732)
+++ gnucash/branches/2.2/src/engine/kvp-scm.c 2008-11-27 11:17:30 UTC (rev 17733)
@@ -32,7 +32,7 @@
}
else
{
- return kvp_value_new_double(scm_num2dbl(val, __FUNCTION__));
+ return kvp_value_new_double(scm_num2dbl(val, G_STRFUNC));
}
}
else if(gnc_numeric_p(val))
@@ -59,7 +59,7 @@
}
else if(SWIG_IsPointerOfType(val, SWIG_TypeQuery("_p_KvpFrame")))
{
- #define FUNC_NAME __FUNCTION__
+ #define FUNC_NAME G_STRFUNC
KvpFrame *frame = SWIG_MustGetPtr(val, SWIG_TypeQuery("_p_KvpFrame"),
1, 0);
#undef FUNC_NAME
Modified: gnucash/branches/2.2/src/gnome/gnc-plugin-page-register.c
===================================================================
--- gnucash/branches/2.2/src/gnome/gnc-plugin-page-register.c 2008-11-27 11:17:13 UTC (rev 17732)
+++ gnucash/branches/2.2/src/gnome/gnc-plugin-page-register.c 2008-11-27 11:17:30 UTC (rev 17733)
@@ -1864,7 +1864,7 @@
arg = scm_apply (func, args, SCM_EOL);
g_return_val_if_fail (SCM_EXACTP (arg), -1);
- return scm_num2int (arg, SCM_ARG1, __FUNCTION__);
+ return scm_num2int (arg, SCM_ARG1, G_STRFUNC);
}
/************************************************************/
Modified: gnucash/branches/2.2/src/gnome-utils/dialog-options.c
===================================================================
--- gnucash/branches/2.2/src/gnome-utils/dialog-options.c 2008-11-27 11:17:13 UTC (rev 17732)
+++ gnucash/branches/2.2/src/gnome-utils/dialog-options.c 2008-11-27 11:17:30 UTC (rev 17733)
@@ -53,7 +53,7 @@
#include "gnc-date-format.h"
#include "misc-gnome-utils.h"
-#define FUNC_NAME __FUNCTION__
+#define FUNC_NAME G_STRFUNC
/* TODO: clean up "register-stocks" junk
*/
@@ -2435,7 +2435,7 @@
if (SCM_NUMBERP(value))
{
- d_value = scm_num2dbl(value, __FUNCTION__);
+ d_value = scm_num2dbl(value, G_STRFUNC);
gtk_spin_button_set_value(spinner, d_value);
return FALSE;
}
Modified: gnucash/branches/2.2/src/report/report-gnome/dialog-column-view.c
===================================================================
--- gnucash/branches/2.2/src/report/report-gnome/dialog-column-view.c 2008-11-27 11:17:13 UTC (rev 17732)
+++ gnucash/branches/2.2/src/report/report-gnome/dialog-column-view.c 2008-11-27 11:17:30 UTC (rev 17733)
@@ -180,7 +180,7 @@
if (SCM_EQUALP (SCM_CAR(contents), selection))
row = i;
- id = scm_num2int(SCM_CAAR(contents), SCM_ARG1, __FUNCTION__);
+ id = scm_num2int(SCM_CAAR(contents), SCM_ARG1, G_STRFUNC);
this_report = gnc_report_find(id);
gtk_list_store_append(store, &iter);
@@ -190,9 +190,9 @@
this_report)),
CONTENTS_COL_ROW, i,
CONTENTS_COL_REPORT_COLS, scm_num2int(SCM_CADR(SCM_CAR(contents)),
- SCM_ARG1, __FUNCTION__),
+ SCM_ARG1, G_STRFUNC),
CONTENTS_COL_REPORT_ROWS, scm_num2int(SCM_CADDR(SCM_CAR(contents)),
- SCM_ARG1, __FUNCTION__),
+ SCM_ARG1, G_STRFUNC),
-1);
}
}
@@ -409,7 +409,7 @@
template_name = scm_list_ref(r->available_list,
scm_int2num(r->available_selected));
new_report = scm_call_1(make_report, template_name);
- id = scm_num2int(new_report, SCM_ARG1, __FUNCTION__);
+ id = scm_num2int(new_report, SCM_ARG1, G_STRFUNC);
scm_call_2(mark_report, gnc_report_find(id), SCM_BOOL_T);
oldlength = scm_ilength(r->contents_list);
@@ -585,10 +585,10 @@
scm_int2num(r->contents_selected));
gtk_spin_button_set_value(GTK_SPIN_BUTTON(colspin),
(float)scm_num2int(SCM_CADR(current),
- SCM_ARG1, __FUNCTION__));
+ SCM_ARG1, G_STRFUNC));
gtk_spin_button_set_value(GTK_SPIN_BUTTON(rowspin),
(float)scm_num2int(SCM_CADDR(current),
- SCM_ARG1, __FUNCTION__));
+ SCM_ARG1, G_STRFUNC));
dlg_ret = gtk_dialog_run(GTK_DIALOG(dlg));
gtk_widget_hide(dlg);
Modified: gnucash/branches/2.2/src/report/report-gnome/gnc-plugin-page-report.c
===================================================================
--- gnucash/branches/2.2/src/report/report-gnome/gnc-plugin-page-report.c 2008-11-27 11:17:13 UTC (rev 17732)
+++ gnucash/branches/2.2/src/report/report-gnome/gnc-plugin-page-report.c 2008-11-27 11:17:30 UTC (rev 17733)
@@ -808,7 +808,7 @@
return NULL;
}
- report_id = scm_num2int(final_id, SCM_ARG1, __FUNCTION__);
+ report_id = scm_num2int(final_id, SCM_ARG1, G_STRFUNC);
report = gnc_report_find(report_id);
if (!report) {
LEAVE("report doesn't exist");
Modified: gnucash/branches/2.2/src/report/report-system/gnc-report.c
===================================================================
--- gnucash/branches/2.2/src/report/report-system/gnc-report.c 2008-11-27 11:17:13 UTC (rev 17732)
+++ gnucash/branches/2.2/src/report/report-system/gnc-report.c 2008-11-27 11:17:30 UTC (rev 17733)
@@ -77,7 +77,7 @@
value = scm_call_1(get_id, report);
if (SCM_NUMBERP(value)) {
- id = scm_num2int(value, SCM_ARG1, __FUNCTION__);
+ id = scm_num2int(value, SCM_ARG1, G_STRFUNC);
if (!g_hash_table_lookup(reports, &id)) {
key = g_new(gint, 1);
*key = id;
More information about the gnucash-changes
mailing list