]> git.pld-linux.org Git - packages/gnucash.git/blame - gnucash-types.patch
projects / packages / gnucash.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- more type fixes for postgres backend
[packages/gnucash.git] / gnucash-types.patch
CommitLineData
741d5584
JB		 1--- gnucash-1.8.11/src/engine/gnc-engine-util.c.orig 2003-04-12 19:02:55.000000000 +0200
2+++ gnucash-1.8.11/src/engine/gnc-engine-util.c 2005-03-28 12:45:41.069095667 +0200
3@@ -234,7 +234,7 @@
4 if (!fout) fout = stderr;
5
6 fprintf (fout, "Clock %d Elapsed: %ld.%06lds %s: ",
7- clockno, now.tv_sec, now.tv_usec, prettify (function_name));
8+ clockno, (long)now.tv_sec, (long)now.tv_usec, prettify (function_name));
9
10 va_start (ap, format);
11
12@@ -265,8 +265,8 @@
13
14 fprintf (fout, "Clock %d Total Elapsed: %ld.%06lds %s: ",
15 clockno,
16- gnc_clock_total[clockno].tv_sec,
17- gnc_clock_total[clockno].tv_usec,
18+ (long)gnc_clock_total[clockno].tv_sec,
19+ (long)gnc_clock_total[clockno].tv_usec,
20 prettify (function_name));
21
22 va_start (ap, format);
23--- gnucash-1.8.11/src/backend/file/test/test-xml-transaction.c.orig 2002-12-28 22:25:52.000000000 +0100
24+++ gnucash-1.8.11/src/backend/file/test/test-xml-transaction.c 2005-03-28 12:44:25.393385305 +0200
25@@ -130,8 +130,8 @@
26 {
27 g_free(num);
28 return g_strdup_printf ("values differ: %lld/%lld v %lld/%lld",
29- (*num).num, (*num).denom,
30- val.num, val.denom);
31+ (long long)(*num).num, (long long)(*num).denom,
32+ (long long)val.num, (long long)val.denom);
33 }
34 g_free(num);
35 }
36@@ -142,15 +142,15 @@
37
38 if (!gnc_numeric_equal(*num, val)) {
39 return g_strdup_printf( "quantities differ under _equal: %lld/%lld v %lld/%lld",
40- (*num).num, (*num).denom,
41- val.num, val.denom );
42+ (long long)(*num).num, (long long)(*num).denom,
43+ (long long)val.num, (long long)val.denom );
44 }
45 if(!gnc_numeric_equal(*num, val))
46 {
47 g_free(num);
48 return g_strdup_printf ("quantities differ: %lld/%lld v %lld/%lld",
49- (*num).num, (*num).denom,
50- val.num, val.denom);
51+ (long long)(*num).num, (long long)(*num).denom,
52+ (long long)val.num, (long long)val.denom);
53 }
54 g_free(num);
55 }
56--- gnucash-1.8.11/src/gnome-utils/dialog-account.c.orig 2004-12-12 00:04:27.000000000 +0100
57+++ gnucash-1.8.11/src/gnome-utils/dialog-account.c 2005-03-28 12:50:48.534942768 +0200
58@@ -1325,7 +1325,7 @@
59 gnc_type_list_row_set_active(GtkCList *type_list, gint type, gboolean state)
60 {
61 GtkStyle *style = gtk_widget_get_style(GTK_WIDGET(type_list));
62- gint row = gtk_clist_find_row_from_data(type_list, (gpointer)type);
63+ gint row = gtk_clist_find_row_from_data(type_list, (gpointer)(size_t)type);
64
65 if (state)
66 {
67--- gnucash-1.8.11/src/gnome-utils/gnc-html.c.orig 2003-04-12 19:03:30.000000000 +0200
68+++ gnucash-1.8.11/src/gnome-utils/gnc-html.c 2005-03-28 12:53:40.313578949 +0200
69@@ -1315,7 +1315,7 @@
70 static gboolean
71 raw_html_receiver (gpointer engine,
72 const gchar *data,
73- guint len,
74+ size_t len,
75 gpointer user_data)
76 {
77 FILE *fh = (FILE *) user_data;
78--- gnucash-1.8.11/src/gnome/window-acct-tree.c.orig 2003-04-29 17:28:05.000000000 +0200
79+++ gnucash-1.8.11/src/gnome/window-acct-tree.c 2005-03-28 12:59:13.647224083 +0200
80@@ -95,7 +95,7 @@
81 gboolean sensitive)
82 {
83 g_list_foreach(win->account_sensitives, (GFunc)gtk_widget_set_sensitive,
84- (gpointer)sensitive);
85+ (gpointer)(size_t)sensitive);
86 }
87
88
89@@ -421,7 +421,7 @@
90 }
91 }
92
93- return (gpointer)(helper_res->has_splits || helper_res->has_ro_splits);
94+ return (gpointer)(size_t)(helper_res->has_splits || helper_res->has_ro_splits);
95 }
96
97 static void
98--- gnucash-1.8.11/src/gnome/dialog-sxsincelast.c.orig 2004-12-12 00:04:26.000000000 +0100
99+++ gnucash-1.8.11/src/gnome/dialog-sxsincelast.c 2005-03-28 12:58:11.675155486 +0200
100@@ -2482,7 +2482,7 @@
101
102 /* No ... we reallly need to skip the entire
103 transaction, at this point. :( Bug#130330. */
104- PERR( "err transaction %.8x", (int)newT );
105+ PERR( "err transaction %.8x", (int)(size_t)newT /* XXX */);
106 errFlag = TRUE;
107 break;
108 }
109--- gnucash-1.8.11/src/business/business-core/file/gnc-bill-term-xml-v2.c.orig 2003-09-11 19:45:22.000000000 +0200
110+++ gnucash-1.8.11/src/business/business-core/file/gnc-bill-term-xml-v2.c 2005-03-28 13:01:02.824926611 +0200
111@@ -669,7 +669,7 @@
112 if (count != gncBillTermGetRefcount(term) && !gncBillTermGetInvisible(term)) {
113 PWARN("Fixing refcount on billterm %s (%lld -> %d)\n",
114 guid_to_string(gncBillTermGetGUID(term)),
115- gncBillTermGetRefcount(term), count)
116+ (long long)gncBillTermGetRefcount(term), count)
117 gncBillTermSetRefcount(term, count);
118 }
119 }
120--- gnucash-1.8.11/src/business/business-core/file/gnc-tax-table-xml-v2.c.orig 2003-09-11 19:45:27.000000000 +0200
121+++ gnucash-1.8.11/src/business/business-core/file/gnc-tax-table-xml-v2.c 2005-03-28 13:02:14.453678325 +0200
122@@ -620,7 +620,7 @@
123 if (count != gncTaxTableGetRefcount(table) && !gncTaxTableGetInvisible(table)) {
124 PWARN("Fixing refcount on taxtable %s (%lld -> %d)\n",
125 guid_to_string(gncTaxTableGetGUID(table)),
126- gncTaxTableGetRefcount(table), count)
127+ (long long)gncTaxTableGetRefcount(table), count)
128 gncTaxTableSetRefcount(table, count);
129 }
130 }
131--- gnucash-1.8.11/src/business/business-gnome/dialog-customer.c.orig 2003-06-16 01:05:20.000000000 +0200
132+++ gnucash-1.8.11/src/business/business-gnome/dialog-customer.c 2005-03-28 13:03:01.319394930 +0200
133@@ -265,7 +265,7 @@
134 if (safe_strcmp (gtk_entry_get_text (GTK_ENTRY (cw->id_entry)), "") == 0) {
135 gtk_entry_set_text (GTK_ENTRY (cw->id_entry),
136 g_strdup_printf ("%.6lld",
137- gncCustomerNextID (cw->book)));
138+ (long long)gncCustomerNextID (cw->book)));
139 }
140
141 /* Now save it off */
142--- gnucash-1.8.11/src/business/business-gnome/dialog-employee.c.orig 2003-06-16 01:05:21.000000000 +0200
143+++ gnucash-1.8.11/src/business/business-gnome/dialog-employee.c 2005-03-28 13:04:08.291273260 +0200
144@@ -209,7 +209,7 @@
145 if (safe_strcmp (gtk_entry_get_text (GTK_ENTRY (ew->id_entry)), "") == 0) {
146 gtk_entry_set_text (GTK_ENTRY (ew->id_entry),
147 g_strdup_printf ("%.6lld",
148- gncEmployeeNextID (ew->book)));
149+ (long long)gncEmployeeNextID (ew->book)));
150 }
151
152 /* Now save it off */
153--- gnucash-1.8.11/src/business/business-gnome/dialog-job.c.orig 2003-04-21 04:42:07.000000000 +0200
154+++ gnucash-1.8.11/src/business/business-gnome/dialog-job.c 2005-03-28 13:05:10.387327778 +0200
155@@ -119,7 +119,7 @@
156 res = gtk_entry_get_text (GTK_ENTRY (jw->id_entry));
157 if (safe_strcmp (res, "") == 0) {
158 gtk_entry_set_text (GTK_ENTRY (jw->id_entry),
159- g_strdup_printf ("%.6lld", gncJobNextID(jw->book)));
160+ g_strdup_printf ("%.6lld", (long long)gncJobNextID(jw->book)));
161 }
162
163 /* Now save it off */
164--- gnucash-1.8.11/src/business/business-gnome/dialog-invoice.c.orig 2004-12-12 00:04:25.000000000 +0100
165+++ gnucash-1.8.11/src/business/business-gnome/dialog-invoice.c 2005-03-28 13:04:42.058145852 +0200
166@@ -297,7 +297,7 @@
167 res = gtk_entry_get_text (GTK_ENTRY (iw->id_entry));
168 if (safe_strcmp (res, "") == 0) {
169 gtk_entry_set_text (GTK_ENTRY (iw->id_entry),
170- g_strdup_printf ("%.6lld", gncInvoiceNextID(iw->book)));
171+ g_strdup_printf ("%.6lld", (long long)gncInvoiceNextID(iw->book)));
172 }
173
174 return TRUE;
175--- gnucash-1.8.11/src/business/business-gnome/dialog-order.c.orig 2003-01-19 00:36:36.000000000 +0100
176+++ gnucash-1.8.11/src/business/business-gnome/dialog-order.c 2005-03-28 13:05:37.406825339 +0200
177@@ -714,7 +714,7 @@
178 /* Setup initial values */
179 ow->order_guid = *gncOrderGetGUID (order);
180 gtk_entry_set_text (GTK_ENTRY (ow->id_entry),
181- g_strdup_printf ("%.6lld", gncOrderNextID(bookp)));
182+ g_strdup_printf ("%.6lld", (long long)gncOrderNextID(bookp)));
183
184 ow->component_id =
185 gnc_register_gui_component (DIALOG_NEW_ORDER_CM_CLASS,
186--- gnucash-1.8.11/src/business/business-gnome/dialog-vendor.c.orig 2004-12-12 00:04:25.000000000 +0100
187+++ gnucash-1.8.11/src/business/business-gnome/dialog-vendor.c 2005-03-28 13:06:13.813064564 +0200
188@@ -189,7 +189,7 @@
189 if (safe_strcmp (gtk_entry_get_text (GTK_ENTRY (vw->id_entry)), "") == 0)
190 gtk_entry_set_text (GTK_ENTRY (vw->id_entry),
191 g_strdup_printf ("%.6lld",
192- gncVendorNextID(vw->book)));
193+ (long long)gncVendorNextID(vw->book)));
194
195 /* Now save it off */
196 {
58b63522
JB		 197--- gnucash-1.8.11/src/backend/postgres/putil.h.orig 2003-08-12 05:17:22.000000000 +0200
198+++ gnucash-1.8.11/src/backend/postgres/putil.h 2005-03-28 17:57:31.854947120 +0200
199@@ -318,7 +318,7 @@
200 #define COMP_INT64(sqlname,fun,ndiffs) { \
201 if (strtoll (DB_GET_VAL(sqlname,0), NULL, 0) != fun) { \
202 PINFO("mis-match: %s sql='%s', eng='%lld'", sqlname, \
203- DB_GET_VAL (sqlname,0), fun); \
204+ DB_GET_VAL (sqlname,0), (long long)fun); \
205 ndiffs++; \
206 } \
207 }
208--- gnucash-1.8.11/src/backend/postgres/table.m4.orig 2003-08-12 05:17:24.000000000 +0200
209+++ gnucash-1.8.11/src/backend/postgres/table.m4 2005-03-28 18:01:48.376356492 +0200
210@@ -365,7 +365,7 @@
211 p = guid_to_string_buff (&(ptr->guid), p);
212 p = stpcpy (p, "''`;");
213 SEND_QUERY (be,be->buff, -1);
214- sql_version = (int) pgendGetResults (be, get_version_cb, (gpointer) -1);
215+ sql_version = (int)(size_t) pgendGetResults (be, get_version_cb, (gpointer) -1);
216
217 if (-1 == sql_version) return -1;
218 return (sql_version - version_function($@));
219@@ -395,7 +395,7 @@
220 p = guid_to_string_buff (&(ptr->guid), p);
221 p = stpcpy (p, "''` AND change = ''`d''`;");
222 SEND_QUERY (be,be->buff, -1);
223- sql_version = (int) pgendGetResults (be, get_version_cb, (gpointer) -1);
224+ sql_version = (int)(size_t) pgendGetResults (be, get_version_cb, (gpointer) -1);
225
226 return sql_version;
227 }
228--- gnucash-1.8.11/src/backend/postgres/checkpoint.c.orig 2003-08-12 05:17:19.000000000 +0200
229+++ gnucash-1.8.11/src/backend/postgres/checkpoint.c 2005-03-28 18:04:03.662874158 +0200
230@@ -472,7 +472,7 @@
231 gnc_timespec_to_iso8601_buff (chk.date_start, buf);
232 PINFO("%s balance to %s baln=%lld/%lld clr=%lld/%lld rcn=%lld/%lld",
233 xaccAccountGetDescription (acc), buf,
234- b, deno, cl_b, deno, rec_b, deno);
235+ (long long)b, (long long)deno, (long long)cl_b, (long long)deno, (long long)rec_b, (long long)deno);
236 })
237
238 /* add up loose entries since the checkpoint */
239@@ -494,7 +494,7 @@
240 gnc_timespec_to_iso8601_buff (as_of_date, buf);
241 LEAVE("be=%p %s %s baln=%lld/%lld clr=%lld/%lld rcn=%lld/%lld", be,
242 xaccAccountGetDescription (acc), buf,
243- b, deno, cl_b, deno, rec_b, deno);
244+ (long long)b, (long long)deno, (long long)cl_b, (long long)deno, (long long)rec_b, (long long)deno);
245 })
246 }
247
248--- gnucash-1.8.11/src/backend/postgres/kvp-sql.c.orig 2003-02-13 03:59:20.000000000 +0100
249+++ gnucash-1.8.11/src/backend/postgres/kvp-sql.c 2005-03-28 18:05:32.231608735 +0200
250@@ -120,7 +120,7 @@
251 ival_cb (PGBackend *be, PGresult *result, int j, gpointer data)
252 {
253 int ival = atoi (DB_GET_VAL ("ipath", 0));
254- return (gpointer) ival;
255+ return (gpointer)(size_t) ival;
256 }
257
258
259@@ -142,7 +142,7 @@
260 p = stpcpy (p, "';");
261
262 SEND_QUERY (be,be->buff, 0);
263- ival = (int) pgendGetResults (be, ival_cb, (gpointer) 0);
264+ ival = (int)(size_t) pgendGetResults (be, ival_cb, (gpointer) 0);
265 if (ival) return ival;
266
267 /* Else, this guid has never been stored before.
268--- gnucash-1.8.11/src/backend/postgres/price.c.orig 2003-07-28 06:00:26.000000000 +0200
269+++ gnucash-1.8.11/src/backend/postgres/price.c 2005-03-28 18:06:12.541930183 +0200
270@@ -200,7 +200,7 @@
271 static gboolean
272 commodity_mark_cb (gnc_commodity *cm, gpointer user_data)
273 {
274- gint32 v = ((gint32) user_data) & 0xffff;
275+ gint32 v = ((gint32)(size_t) user_data) & 0xffff;
276 gnc_commodity_set_mark (cm, (gint16) v);
277 return TRUE;
278 }
279--- gnucash-1.8.11/src/backend/postgres/upgrade.c.orig 2003-08-14 05:46:55.000000000 +0200
280+++ gnucash-1.8.11/src/backend/postgres/upgrade.c 2005-03-28 18:06:56.019491164 +0200
281@@ -126,7 +126,7 @@
282 get_iguid_cb (PGBackend *be, PGresult *result, int j, gpointer data)
283 {
284 int fin = atoi(DB_GET_VAL ("iguid", j));
285- return (gpointer) fin;
286+ return (gpointer)(size_t) fin;
287 }
288
289
290@@ -151,7 +151,7 @@
291
292 p = "SELECT iguid FROM gncGUIDCache ORDER BY iguid DESC LIMIT 1;";
293 SEND_QUERY (be,p, );
294- iguid = (guint32) pgendGetResults (be, get_iguid_cb, 0);
295+ iguid = (guint32)(size_t) pgendGetResults (be, get_iguid_cb, 0);
296 iguid ++;
297
298 sprintf(buff, "CREATE SEQUENCE gnc_iguid_seq START %d;", iguid);
GnuCash is an application to keep track of your finances
This page took 0.079389 seconds and 4 git commands to generate.