[Gnucash-changes] Frederic Leroy's patch to fix more %lld issues
without casts (#313741).
Derek Atkins
warlord at cvs.gnucash.org
Fri Aug 19 14:42:19 EDT 2005
Log Message:
-----------
Frederic Leroy's patch to fix more %lld issues without casts (#313741).
* src/app-utils/gnc-ui-util.c
* src/backend/file/sixtp-dom-generators.c
* src/backend/file/test/test-string-converters.c
* src/backend/postgres/builder.c
* src/backend/postgres/gncquery.c
* src/backend/postgres/kvp-sql.c
* src/backend/postgres/checkpoint.c
* src/engine/kvp_frame.c
* src/engine/test/test-numeric.c
* src/engine/qofsql.c
* src/engine/TransLog.c
all vars are gint64
->replaced %lld by G_GINT64_FORMAT and removed unnecessary
long long int' cast
* src/backend/file/test/test-date-converting.c
* src/backend/file/test/test-dom-converters1.c
* src/engine/test/test-date.c
%lld for casted tv_sec vars
->No change
* src/backend/postgres/putil.h
#define COMP_INT64(sqlname,fun,ndiffs)
Macro using %lld, but not used
->No change, dead code
* src/engine/gnc-numeric.c
use long long int for local variable instead gint64
->replaced longlongint by gint64 and lld by G_GINT64_FORMAT
and replaced GNC_SCANF_LLD by G_GINT64_FORMAT
/!\ should we remove GNC_SCANF_LLD ??
* src/engine/qofquerycore.c
type incoherency
-> replaced GNC_SCANF_LLD by G_GINT64_FORMAT
* src/import-export/log-replay/gnc-log-replay.c
dead code commented
-> no change
* src/engine/qofmath128.c
some lld used instead of llu
-> replacement of lld/llu along vars type
I didn't check but I think there is mixed (un)signed
* src/engine/qofquery-serialize.c
in macro PUT_INT64 : replaced %lld by G_GINT64_FORMAT
* lib/goffice/drawing/god-drawing-renderer-gdk.c
-> defined format for go_unit_t
silly change because lines containing %lld are commented
Tags:
----
gnucash-gnome2-dev
Modified Files:
--------------
gnucash:
ChangeLog
gnucash/lib/goffice/drawing:
god-drawing-renderer-gdk.c
gnucash/lib/goffice/utils:
go-units.h
gnucash/src/app-utils:
gnc-ui-util.c
gnucash/src/backend/file:
sixtp-dom-generators.c
gnucash/src/backend/file/test:
test-string-converters.c
gnucash/src/backend/postgres:
builder.c
checkpoint.c
gncquery.c
kvp-sql.c
gnucash/src/engine:
TransLog.c
gnc-numeric.c
kvp_frame.c
qofmath128.c
qofquery-serialize.c
qofquerycore.c
qofsql.c
gnucash/src/engine/test:
test-numeric.c
Revision Data
-------------
Index: ChangeLog
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/ChangeLog,v
retrieving revision 1.1487.2.267
retrieving revision 1.1487.2.268
diff -LChangeLog -LChangeLog -u -r1.1487.2.267 -r1.1487.2.268
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,59 @@
+2005-08-18 Derek Atkins <derek at ihtfp.com>
+
+ Frederic Leroy's patch to fix more %lld issues without casts.
+ Fixes bug #313741.
+ * src/app-utils/gnc-ui-util.c
+ * src/backend/file/sixtp-dom-generators.c
+ * src/backend/file/test/test-string-converters.c
+ * src/backend/postgres/builder.c
+ * src/backend/postgres/gncquery.c
+ * src/backend/postgres/kvp-sql.c
+ * src/backend/postgres/checkpoint.c
+ * src/engine/kvp_frame.c
+ * src/engine/test/test-numeric.c
+ * src/engine/qofsql.c
+ * src/engine/TransLog.c
+ all vars are gint64
+ ->replaced %lld by G_GINT64_FORMAT and removed unnecessary
+ long long int' cast
+
+ * src/backend/file/test/test-date-converting.c
+ * src/backend/file/test/test-dom-converters1.c
+ * src/engine/test/test-date.c
+ %lld for casted tv_sec vars
+ ->No change
+
+ * src/backend/postgres/putil.h
+ #define COMP_INT64(sqlname,fun,ndiffs)
+ Macro using %lld, but not used
+ ->No change, dead code
+
+ * src/engine/gnc-numeric.c
+ use long long int for local variable instead gint64
+ ->replaced longlongint by gint64 and lld by G_GINT64_FORMAT
+ and replaced GNC_SCANF_LLD by G_GINT64_FORMAT
+ /!\ should we remove GNC_SCANF_LLD ??
+
+ * src/engine/qofquerycore.c
+ type incoherency
+ -> replaced GNC_SCANF_LLD by G_GINT64_FORMAT
+
+ * src/import-export/log-replay/gnc-log-replay.c
+ dead code commented
+ -> no change
+
+ * src/engine/qofmath128.c
+ some lld used instead of llu
+ -> replacement of lld/llu along vars type
+ I didn't check but I think there is mixed (un)signed
+
+ * src/engine/qofquery-serialize.c
+ in macro PUT_INT64 : replaced %lld by G_GINT64_FORMAT
+
+ * lib/goffice/drawing/god-drawing-renderer-gdk.c
+ -> defined format for go_unit_t
+ silly change because lines containing %lld are commented
+
2005-08-17 Neil Williams <linux at codehelp.co.uk>
* src/import-export/hbci/hbci-interaction.c:
Index: go-units.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/lib/goffice/utils/Attic/go-units.h,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -Llib/goffice/utils/go-units.h -Llib/goffice/utils/go-units.h -u -r1.1.4.1 -r1.1.4.2
--- lib/goffice/utils/go-units.h
+++ lib/goffice/utils/go-units.h
@@ -65,6 +65,7 @@
#define GO_EMU_TO_CM(emu) ((emu)*CM_PER_IN/EMU_PER_IN/100)
typedef gint64 go_unit_t;
+#define GO_UNIT_T_FORMAT G_GINT64_FORMAT
typedef struct {
go_unit_t x;
Index: gnc-ui-util.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/app-utils/gnc-ui-util.c,v
retrieving revision 1.39.2.9
retrieving revision 1.39.2.10
diff -Lsrc/app-utils/gnc-ui-util.c -Lsrc/app-utils/gnc-ui-util.c -u -r1.39.2.9 -r1.39.2.10
--- src/app-utils/gnc-ui-util.c
+++ src/app-utils/gnc-ui-util.c
@@ -1154,7 +1154,7 @@
}
/* print the integer part without separators */
- sprintf(temp_buf, "%lld", (long long int) whole.num);
+ sprintf(temp_buf, "%" G_GINT64_FORMAT, whole.num);
num_whole_digits = strlen (temp_buf);
if (!info->use_separators)
@@ -1228,9 +1228,9 @@
{
val = gnc_numeric_reduce (val);
- sprintf (temp_buf, " + %lld / %lld",
- (long long int) val.num,
- (long long int) val.denom);
+ sprintf (temp_buf, " + %" G_GINT64_FORMAT " / %" G_GINT64_FORMAT,
+ val.num,
+ val.denom);
strcat (buf, temp_buf);
}
Index: sixtp-dom-generators.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/sixtp-dom-generators.c,v
retrieving revision 1.5.4.5
retrieving revision 1.5.4.6
diff -Lsrc/backend/file/sixtp-dom-generators.c -Lsrc/backend/file/sixtp-dom-generators.c -u -r1.5.4.5 -r1.5.4.6
--- src/backend/file/sixtp-dom-generators.c
+++ src/backend/file/sixtp-dom-generators.c
@@ -58,7 +58,7 @@
gchar *text;
xmlNodePtr result;
- text = g_strdup_printf("%lld", (long long int) val);
+ text = g_strdup_printf("%" G_GINT64_FORMAT, val);
result = text_to_dom_tree(tag, text);
g_free(text);
return result;
@@ -264,8 +264,7 @@
{
case KVP_TYPE_GINT64:
add_text_to_node(val_node, "integer",
- g_strdup_printf("%lld",
- (long long int)
+ g_strdup_printf("%" G_GINT64_FORMAT,
kvp_value_get_gint64(val)));
break;
case KVP_TYPE_DOUBLE:
Index: test-string-converters.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/test/test-string-converters.c,v
retrieving revision 1.2.6.3
retrieving revision 1.2.6.4
diff -Lsrc/backend/file/test/test-string-converters.c -Lsrc/backend/file/test/test-string-converters.c -u -r1.2.6.3 -r1.2.6.4
--- src/backend/file/test/test-string-converters.c
+++ src/backend/file/test/test-string-converters.c
@@ -47,8 +47,8 @@
if(test_data2_len != test_data1->len)
{
failure_args("binary_data", __FILE__, __LINE__,
- "lengths don't match: %lld vs %d",
- (long long int) test_data2_len, test_data1->len);
+ "lengths don't match: %" G_GINT64_FORMAT " vs %d",
+ test_data2_len, test_data1->len);
continue;
}
Index: gncquery.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/postgres/gncquery.c,v
retrieving revision 1.29.4.4
retrieving revision 1.29.4.5
diff -Lsrc/backend/postgres/gncquery.c -Lsrc/backend/postgres/gncquery.c -u -r1.29.4.4 -r1.29.4.5
--- src/backend/postgres/gncquery.c
+++ src/backend/postgres/gncquery.c
@@ -519,8 +519,8 @@
case KVP_TYPE_NUMERIC:{
gnc_numeric n = kvp_value_get_numeric(value);
- return g_strdup_printf("(%lld::int8 * %s.num::int8)",
- (long long int)n.denom, kvptable);
+ return g_strdup_printf("(%" G_GINT64_FORMAT "::int8 * %s.num::int8)",
+ n.denom, kvptable);
}
default:
@@ -542,8 +542,7 @@
switch (value_t) {
case KVP_TYPE_GINT64:
- return g_strdup_printf("%lld",
- (long long int)
+ return g_strdup_printf("%" G_GINT64_FORMAT,
kvp_value_get_gint64(value));
case KVP_TYPE_DOUBLE:
@@ -569,8 +568,8 @@
case KVP_TYPE_NUMERIC:{
gnc_numeric n = kvp_value_get_numeric(value);
- return g_strdup_printf("(%lld::int8 * %s.denom::int8)",
- (long long int)n.num, kvptable);
+ return g_strdup_printf("(%" G_GINT64_FORMAT "::int8 * %s.denom::int8)",
+ n.num, kvptable);
}
default:
Index: checkpoint.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/postgres/checkpoint.c,v
retrieving revision 1.9.4.3
retrieving revision 1.9.4.4
diff -Lsrc/backend/postgres/checkpoint.c -Lsrc/backend/postgres/checkpoint.c -u -r1.9.4.3 -r1.9.4.4
--- src/backend/postgres/checkpoint.c
+++ src/backend/postgres/checkpoint.c
@@ -468,7 +468,7 @@
DEBUGCMD({
char buf[80];
gnc_timespec_to_iso8601_buff (chk.date_start, buf);
- PINFO("%s balance to %s baln=%lld/%lld clr=%lld/%lld rcn=%lld/%lld",
+ PINFO("%s balance to %s baln=%" G_GINT64_FORMAT "/%" G_GINT64_FORMAT " clr=%" G_GINT64_FORMAT "/%" G_GINT64_FORMAT " rcn=%" G_GINT64_FORMAT "/%" G_GINT64_FORMAT,
xaccAccountGetDescription (acc), buf,
b, deno, cl_b, deno, rec_b, deno);
})
@@ -490,7 +490,7 @@
DEBUGCMD ({
char buf[80];
gnc_timespec_to_iso8601_buff (as_of_date, buf);
- LEAVE("be=%p %s %s baln=%lld/%lld clr=%lld/%lld rcn=%lld/%lld", be,
+ LEAVE("be=%p %s %s baln=%" G_GINT64_FORMAT "/%" G_GINT64_FORMAT " clr=%" G_GINT64_FORMAT "/%" G_GINT64_FORMAT " rcn=%" G_GINT64_FORMAT "/%" G_GINT64_FORMAT, be,
xaccAccountGetDescription (acc), buf,
b, deno, cl_b, deno, rec_b, deno);
})
Index: builder.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/postgres/builder.c,v
retrieving revision 1.3.6.2
retrieving revision 1.3.6.3
diff -Lsrc/backend/postgres/builder.c -Lsrc/backend/postgres/builder.c -u -r1.3.6.2 -r1.3.6.3
--- src/backend/postgres/builder.c
+++ src/backend/postgres/builder.c
@@ -272,7 +272,7 @@
char val[100];
if (!b || !tag) return;
- snprintf (val, 100, "%lld", (long long int) nval);
+ snprintf (val, 100, "%" G_GINT64_FORMAT, nval);
if (b->tag_need_comma) b->ptag = stpcpy(b->ptag, ", ");
b->tag_need_comma = 1;
Index: kvp-sql.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/postgres/kvp-sql.c,v
retrieving revision 1.13.2.2
retrieving revision 1.13.2.3
diff -Lsrc/backend/postgres/kvp-sql.c -Lsrc/backend/postgres/kvp-sql.c -u -r1.13.2.2 -r1.13.2.3
--- src/backend/postgres/kvp-sql.c
+++ src/backend/postgres/kvp-sql.c
@@ -224,9 +224,9 @@
case KVP_TYPE_GINT64:
{
gint64 ival = kvp_value_get_gint64 (val);
- PINFO ("path=%s type=gint64 val=%lld",
+ PINFO ("path=%s type=gint64 val=%" G_GINT64_FORMAT,
cb_data->path,
- (long long int) ival);
+ ival);
cb_data->stype = "int8";
cb_data->u.ival = ival;
@@ -248,10 +248,10 @@
case KVP_TYPE_NUMERIC:
{
gnc_numeric ival = kvp_value_get_numeric (val);
- PINFO ("path=%s type=numeric val=%lld/%lld",
+ PINFO ("path=%s type=numeric val=%" G_GINT64_FORMAT "/%" G_GINT64_FORMAT,
cb_data->path,
- (long long int) ival.num,
- (long long int) ival.denom);
+ ival.num,
+ ival.denom);
cb_data->stype = "frac";
cb_data->u.numeric = ival;
Index: god-drawing-renderer-gdk.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/lib/goffice/drawing/Attic/god-drawing-renderer-gdk.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -Llib/goffice/drawing/god-drawing-renderer-gdk.c -Llib/goffice/drawing/god-drawing-renderer-gdk.c -u -r1.1.4.1 -r1.1.4.2
--- lib/goffice/drawing/god-drawing-renderer-gdk.c
+++ lib/goffice/drawing/god-drawing-renderer-gdk.c
@@ -354,8 +354,8 @@
g_print ("space before: %f\n", space_before);
g_print ("space after: %f\n", space_after);
g_print ("indent: %f\n", indent);
- g_print ("x_units: %lld\n", draw_context->renderer->priv->x_units_per_pixel);
- g_print ("y_units: %lld\n", draw_context->renderer->priv->y_units_per_pixel);
+ g_print ("x_units: %" GO_UNIT_T_FORMAT "\n", draw_context->renderer->priv->x_units_per_pixel);
+ g_print ("y_units: %" GO_UNIT_T_FORMAT "\n", draw_context->renderer->priv->y_units_per_pixel);
#endif
}
Index: kvp_frame.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/kvp_frame.c,v
retrieving revision 1.30.4.9
retrieving revision 1.30.4.10
diff -Lsrc/engine/kvp_frame.c -Lsrc/engine/kvp_frame.c -u -r1.30.4.9 -r1.30.4.10
--- src/engine/kvp_frame.c
+++ src/engine/kvp_frame.c
@@ -1648,7 +1648,7 @@
switch(kvp_value_get_type(val))
{
case KVP_TYPE_GINT64:
- return g_strdup_printf("%lld",(long long int) kvp_value_get_gint64(val));
+ return g_strdup_printf("%" G_GINT64_FORMAT, kvp_value_get_gint64(val));
break;
case KVP_TYPE_DOUBLE:
@@ -1723,8 +1723,8 @@
switch(kvp_value_get_type(val))
{
case KVP_TYPE_GINT64:
- return g_strdup_printf("KVP_VALUE_GINT64(%lld)",
- (long long int) kvp_value_get_gint64(val));
+ return g_strdup_printf("KVP_VALUE_GINT64(%" G_GINT64_FORMAT ")",
+ kvp_value_get_gint64(val));
break;
case KVP_TYPE_DOUBLE:
Index: gnc-numeric.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/gnc-numeric.c,v
retrieving revision 1.26.4.8
retrieving revision 1.26.4.9
diff -Lsrc/engine/gnc-numeric.c -Lsrc/engine/gnc-numeric.c -u -r1.26.4.8 -r1.26.4.9
--- src/engine/gnc-numeric.c
+++ src/engine/gnc-numeric.c
@@ -1183,10 +1183,10 @@
gnc_numeric_to_string(gnc_numeric n)
{
gchar *result;
- long long int tmpnum = n.num;
- long long int tmpdenom = n.denom;
+ gint64 tmpnum = n.num;
+ gint64 tmpdenom = n.denom;
- result = g_strdup_printf("%lld/%lld", tmpnum, tmpdenom);
+ result = g_strdup_printf("%" G_GINT64_FORMAT "/%" G_GINT64_FORMAT, tmpnum, tmpdenom);
return result;
}
@@ -1196,13 +1196,13 @@
{
static char buff[1000];
static char *p = buff;
- long long int tmpnum = n.num;
- long long int tmpdenom = n.denom;
+ gint64 tmpnum = n.num;
+ gint64 tmpdenom = n.denom;
p+= 100;
if (p-buff >= 1000) p = buff;
- sprintf(p, "%lld/%lld", tmpnum, tmpdenom);
+ sprintf(p, "%" G_GINT64_FORMAT "/%" G_GINT64_FORMAT, tmpnum, tmpdenom);
return p;
}
@@ -1211,8 +1211,8 @@
string_to_gnc_numeric(const gchar* str, gnc_numeric *n)
{
size_t num_read;
- long long int tmpnum;
- long long int tmpdenom;
+ gint64 tmpnum;
+ gint64 tmpdenom;
if(!str) return FALSE;
@@ -1245,14 +1245,14 @@
{
char * retval;
if(gnc_numeric_check(in)) {
- retval = g_strdup_printf("<ERROR> [%lld / %lld]",
- (long long int) in.num,
- (long long int) in.denom);
+ retval = g_strdup_printf("<ERROR> [%" G_GINT64_FORMAT " / %" G_GINT64_FORMAT "]",
+ in.num,
+ in.denom);
}
else {
- retval = g_strdup_printf("[%lld / %lld]",
- (long long int) in.num,
- (long long int) in.denom);
+ retval = g_strdup_printf("[%" G_GINT64_FORMAT " / %" G_GINT64_FORMAT "]",
+ in.num,
+ in.denom);
}
return retval;
}
Index: TransLog.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/TransLog.c,v
retrieving revision 1.30.6.2
retrieving revision 1.30.6.3
diff -Lsrc/engine/TransLog.c -Lsrc/engine/TransLog.c -u -r1.30.6.2 -r1.30.6.3
--- src/engine/TransLog.c
+++ src/engine/TransLog.c
@@ -218,7 +218,7 @@
/* use tab-separated fields */
fprintf (trans_log,
"%c\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t"
- "%s\t%s\t%s\t%s\t%c\t%lld/%lld\t%lld/%lld\t%s\n",
+ "%s\t%s\t%s\t%s\t%c\t%" G_GINT64_FORMAT "/%" G_GINT64_FORMAT "\t%" G_GINT64_FORMAT "/%" G_GINT64_FORMAT "\t%s\n",
flag,
trans_guid_str, split_guid_str, /* trans+split make up unique id */
dnow ? dnow : "",
@@ -232,10 +232,10 @@
split->memo ? split->memo : "",
split->action ? split->action : "",
split->reconciled,
- (long long int) gnc_numeric_num(amt),
- (long long int) gnc_numeric_denom(amt),
- (long long int) gnc_numeric_num(val),
- (long long int) gnc_numeric_denom(val),
+ gnc_numeric_num(amt),
+ gnc_numeric_denom(amt),
+ gnc_numeric_num(val),
+ gnc_numeric_denom(val),
drecn ? drecn : "");
}
Index: qofmath128.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/qofmath128.c,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -Lsrc/engine/qofmath128.c -Lsrc/engine/qofmath128.c -u -r1.6.2.2 -r1.6.2.3
--- src/engine/qofmath128.c
+++ src/engine/qofmath128.c
@@ -334,7 +334,7 @@
static void pr (gint64 a, gint64 b)
{
qofint128 prod = mult128 (a,b);
- printf ("%lld * %lld = %lld %llu (0x%llx %llx) %hd\n",
+ printf ("%" G_GINT64_FORMAT " * %" G_GINT64_FORMAT " = %" G_GUINT64_FORMAT " %" G_GUINT64_FORMAT " (0x%llx %llx) %hd\n",
a, b, prod.hi, prod.lo, prod.hi, prod.lo, prod.isbig);
}
@@ -343,7 +343,7 @@
qofint128 prod = mult128 (a,b);
qofint128 quot = div128 (prod, c);
gint64 rem = rem128 (prod, c);
- printf ("%lld * %lld / %lld = %lld %llu + %lld (0x%llx %llx) %hd\n",
+ printf ("%" G_GINT64_FORMAT " * %" G_GINT64_FORMAT " / %" G_GINT64_FORMAT " = %" G_GUINT64_FORMAT " %" G_GUINT64_FORMAT " + %" G_GINT64_FORMAT " (0x%llx %llx) %hd\n",
a, b, c, quot.hi, quot.lo, rem, quot.hi, quot.lo, quot.isbig);
}
Index: qofquery-serialize.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/qofquery-serialize.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -Lsrc/engine/qofquery-serialize.c -Lsrc/engine/qofquery-serialize.c -u -r1.1.2.3 -r1.1.2.4
--- src/engine/qofquery-serialize.c
+++ src/engine/qofquery-serialize.c
@@ -53,7 +53,7 @@
#define PUT_INT64(TOK,VAL) { \
xmlNodePtr node; \
char buff[80]; \
- g_snprintf (buff, sizeof(buff), "%lld", (VAL)); \
+ g_snprintf (buff, sizeof(buff), "%" G_GINT64_FORMAT, (VAL)); \
node = xmlNewNode (NULL, TOK); \
xmlNodeAddContent(node, buff); \
xmlAddChild (topnode, node); \
Index: qofquerycore.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/qofquerycore.c,v
retrieving revision 1.8.2.8
retrieving revision 1.8.2.9
diff -Lsrc/engine/qofquerycore.c -Lsrc/engine/qofquerycore.c -u -r1.8.2.8 -r1.8.2.9
--- src/engine/qofquerycore.c
+++ src/engine/qofquerycore.c
@@ -877,7 +877,7 @@
{
gint64 num = ((query_int64_getter)getter->param_getfcn)(object, getter);
- return g_strdup_printf (GNC_SCANF_LLD, (long long int) num);
+ return g_strdup_printf ("%" G_GINT64_FORMAT, num);
}
/* ================================================================ */
Index: qofsql.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/qofsql.c,v
retrieving revision 1.5.2.5
retrieving revision 1.5.2.6
diff -Lsrc/engine/qofsql.c -Lsrc/engine/qofsql.c -u -r1.5.2.5 -r1.5.2.6
--- src/engine/qofsql.c
+++ src/engine/qofsql.c
@@ -240,7 +240,7 @@
case KVP_TYPE_GINT64:
{
gint64 ival = kvp_value_get_gint64(kv);
- sprintf (tmpbuff, "%lld\n", ival);
+ sprintf (tmpbuff, "%" G_GINT64_FORMAT "\n", ival);
break;
}
case KVP_TYPE_DOUBLE:
Index: test-numeric.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/test/test-numeric.c,v
retrieving revision 1.18.2.3
retrieving revision 1.18.2.4
diff -Lsrc/engine/test/test-numeric.c -Lsrc/engine/test/test-numeric.c -u -r1.18.2.3 -r1.18.2.4
--- src/engine/test/test-numeric.c
+++ src/engine/test/test-numeric.c
@@ -23,15 +23,15 @@
char * retval;
if(gnc_numeric_check(in))
{
- retval = g_strdup_printf("<ERROR> [%lld / %lld]",
- (long long int) in.num,
- (long long int) in.denom);
+ retval = g_strdup_printf("<ERROR> [%" G_GINT64_FORMAT " / %" G_GINT64_FORMAT "]",
+ in.num,
+ in.denom);
}
else
{
- retval = g_strdup_printf("[%lld / %lld]",
- (long long int) in.num,
- (long long int) in.denom);
+ retval = g_strdup_printf("[%" G_GINT64_FORMAT " / %" G_GINT64_FORMAT "]",
+ in.num,
+ in.denom);
}
return retval;
}
More information about the gnucash-changes
mailing list