r18970 - gnucash/trunk/src - Re-indentation of source code.
Christian Stimming
cstim at code.gnucash.org
Sat Mar 27 17:01:56 EDT 2010
Author: cstim
Date: 2010-03-27 17:01:56 -0400 (Sat, 27 Mar 2010)
New Revision: 18970
Trac: http://svn.gnucash.org/trac/changeset/18970
Modified:
gnucash/trunk/src/app-utils/gnc-ui-util.c
gnucash/trunk/src/app-utils/option-util.c
gnucash/trunk/src/business/business-core/gncAddress.c
gnucash/trunk/src/business/business-core/gncBillTerm.c
gnucash/trunk/src/business/business-core/gncBillTerm.h
gnucash/trunk/src/business/business-core/gncCustomer.c
gnucash/trunk/src/business/business-core/gncEmployee.c
gnucash/trunk/src/business/business-core/gncEntry.c
gnucash/trunk/src/business/business-core/gncInvoice.c
gnucash/trunk/src/business/business-core/gncJob.c
gnucash/trunk/src/business/business-core/gncOrder.c
gnucash/trunk/src/business/business-core/gncTaxTable.c
gnucash/trunk/src/business/business-core/gncVendor.c
gnucash/trunk/src/core-utils/gnc-filepath-utils.c
gnucash/trunk/src/core-utils/gnc-uri-utils.c
gnucash/trunk/src/debug/splint-defs.h
gnucash/trunk/src/engine/SchedXaction.c
gnucash/trunk/src/engine/TransLog.c
gnucash/trunk/src/engine/Transaction.c
gnucash/trunk/src/engine/kvp-scm.c
gnucash/trunk/src/engine/test/test-date.c
gnucash/trunk/src/experimental/cgi-bin/fastcgi-hello.c
gnucash/trunk/src/experimental/cgi-bin/gnc-server.c
gnucash/trunk/src/experimental/cgi-bin/hello.c
gnucash/trunk/src/experimental/cgi-bin/hello2.c
gnucash/trunk/src/experimental/cgi-bin/hello3.c
gnucash/trunk/src/gnome-search/gnc-general-search.c
gnucash/trunk/src/gnome-utils/dialog-file-access.c
gnucash/trunk/src/gnome-utils/dialog-object-references.c
gnucash/trunk/src/gnome-utils/gnc-keyring.c
gnucash/trunk/src/gnome/gnc-plugin-page-account-tree.c
gnucash/trunk/src/gnome/top-level.c
gnucash/trunk/src/gnome/window-autoclear.c
gnucash/trunk/src/import-export/csv/gnc-csv-import.c
gnucash/trunk/src/libqof/qof/qofinstance.c
Log:
Re-indentation of source code.
This also strips trailing whitespaces from lines where they existed.
This re-indentation was done using astyle-1.24 using the following options:
astyle --indent=spaces=4 --brackets=break --pad-oper --pad-header --suffix=none
Modified: gnucash/trunk/src/app-utils/gnc-ui-util.c
===================================================================
--- gnucash/trunk/src/app-utils/gnc-ui-util.c 2010-03-27 21:01:21 UTC (rev 18969)
+++ gnucash/trunk/src/app-utils/gnc-ui-util.c 2010-03-27 21:01:56 UTC (rev 18970)
@@ -1842,8 +1842,8 @@
#ifdef _MSC_VER
static double round(double x)
{
- // A simple round() implementation because MSVC doesn't seem to have that
- return floor(x + 0.5);
+ // A simple round() implementation because MSVC doesn't seem to have that
+ return floor(x + 0.5);
}
#endif
Modified: gnucash/trunk/src/app-utils/option-util.c
===================================================================
--- gnucash/trunk/src/app-utils/option-util.c 2010-03-27 21:01:21 UTC (rev 18969)
+++ gnucash/trunk/src/app-utils/option-util.c 2010-03-27 21:01:56 UTC (rev 18970)
@@ -1727,23 +1727,23 @@
section = gnc_option_section(option);
#ifdef GNOME
- {
- GtkWidget *dialog = gtk_message_dialog_new(NULL,
- 0,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_OK,
- format,
- section ? section : "(null)",
- name ? name : "(null)",
- message ? message : "(null)");
- gtk_dialog_run(GTK_DIALOG(dialog));
- gtk_widget_destroy(dialog);
- }
+ {
+ GtkWidget *dialog = gtk_message_dialog_new(NULL,
+ 0,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ format,
+ section ? section : "(null)",
+ name ? name : "(null)",
+ message ? message : "(null)");
+ gtk_dialog_run(GTK_DIALOG(dialog));
+ gtk_widget_destroy(dialog);
+ }
#else
- printf(format,
- section ? section : "(null)",
- name ? name : "(null)",
- message ? message : "(null)");
+ printf(format,
+ section ? section : "(null)",
+ name ? name : "(null)",
+ message ? message : "(null)");
#endif
if (name != NULL)
Modified: gnucash/trunk/src/business/business-core/gncAddress.c
===================================================================
--- gnucash/trunk/src/business/business-core/gncAddress.c 2010-03-27 21:01:21 UTC (rev 18969)
+++ gnucash/trunk/src/business/business-core/gncAddress.c 2010-03-27 21:01:56 UTC (rev 18970)
@@ -648,17 +648,17 @@
static QofObject GncAddressDesc =
{
- DI(.interface_version =) QOF_OBJECT_VERSION,
- DI(.e_type =) GNC_ID_ADDRESS,
- DI(.type_label =) "Address",
- DI(.create =) (gpointer)qofAddressCreate,
- DI(.book_begin =) NULL,
- DI(.book_end =) NULL,
- DI(.is_dirty =) qof_collection_is_dirty,
- DI(.mark_clean =) qof_collection_mark_clean,
- DI(.foreach =) qof_collection_foreach,
- DI(.printable =) NULL,
- DI(.version_cmp =) (int (*)(gpointer, gpointer)) qof_instance_version_cmp,
+ DI(.interface_version = ) QOF_OBJECT_VERSION,
+ DI(.e_type = ) GNC_ID_ADDRESS,
+ DI(.type_label = ) "Address",
+ DI(.create = ) (gpointer)qofAddressCreate,
+ DI(.book_begin = ) NULL,
+ DI(.book_end = ) NULL,
+ DI(.is_dirty = ) qof_collection_is_dirty,
+ DI(.mark_clean = ) qof_collection_mark_clean,
+ DI(.foreach = ) qof_collection_foreach,
+ DI(.printable = ) NULL,
+ DI(.version_cmp = ) (int (*)(gpointer, gpointer)) qof_instance_version_cmp,
};
gboolean gncAddressRegister (void)
Modified: gnucash/trunk/src/business/business-core/gncBillTerm.c
===================================================================
--- gnucash/trunk/src/business/business-core/gncBillTerm.c 2010-03-27 21:01:21 UTC (rev 18969)
+++ gnucash/trunk/src/business/business-core/gncBillTerm.c 2010-03-27 21:01:56 UTC (rev 18970)
@@ -811,17 +811,17 @@
static QofObject gncBillTermDesc =
{
- DI(.interface_version =) QOF_OBJECT_VERSION,
- DI(.e_type =) _GNC_MOD_NAME,
- DI(.type_label =) "Billing Term",
- DI(.create =) (gpointer)gncBillTermCreate,
- DI(.book_begin =) _gncBillTermCreate,
- DI(.book_end =) _gncBillTermDestroy,
- DI(.is_dirty =) qof_collection_is_dirty,
- DI(.mark_clean =) qof_collection_mark_clean,
- DI(.foreach =) qof_collection_foreach,
- DI(.printable =) NULL,
- DI(.version_cmp =) (int (*)(gpointer, gpointer)) qof_instance_version_cmp,
+ DI(.interface_version = ) QOF_OBJECT_VERSION,
+ DI(.e_type = ) _GNC_MOD_NAME,
+ DI(.type_label = ) "Billing Term",
+ DI(.create = ) (gpointer)gncBillTermCreate,
+ DI(.book_begin = ) _gncBillTermCreate,
+ DI(.book_end = ) _gncBillTermDestroy,
+ DI(.is_dirty = ) qof_collection_is_dirty,
+ DI(.mark_clean = ) qof_collection_mark_clean,
+ DI(.foreach = ) qof_collection_foreach,
+ DI(.printable = ) NULL,
+ DI(.version_cmp = ) (int (*)(gpointer, gpointer)) qof_instance_version_cmp,
};
gboolean gncBillTermRegister (void)
Modified: gnucash/trunk/src/business/business-core/gncBillTerm.h
===================================================================
--- gnucash/trunk/src/business/business-core/gncBillTerm.h 2010-03-27 21:01:21 UTC (rev 18969)
+++ gnucash/trunk/src/business/business-core/gncBillTerm.h 2010-03-27 21:01:56 UTC (rev 18970)
@@ -121,7 +121,7 @@
*/
static inline GncBillTerm * gncBillTermLookup (const QofBook *book, const GncGUID *guid)
{
- QOF_BOOK_RETURN_ENTITY(book, guid,GNC_ID_BILLTERM, GncBillTerm);
+ QOF_BOOK_RETURN_ENTITY(book, guid, GNC_ID_BILLTERM, GncBillTerm);
}
GncBillTerm *gncBillTermLookupByName (QofBook *book, const char *name);
Modified: gnucash/trunk/src/business/business-core/gncCustomer.c
===================================================================
--- gnucash/trunk/src/business/business-core/gncCustomer.c 2010-03-27 21:01:21 UTC (rev 18969)
+++ gnucash/trunk/src/business/business-core/gncCustomer.c 2010-03-27 21:01:56 UTC (rev 18970)
@@ -749,7 +749,7 @@
PWARN("addresses differ");
return FALSE;
}
-
+
return TRUE;
}
@@ -796,17 +796,17 @@
static QofObject gncCustomerDesc =
{
- DI(.interface_version =) QOF_OBJECT_VERSION,
- DI(.e_type =) _GNC_MOD_NAME,
- DI(.type_label =) "Customer",
- DI(.create =) (gpointer)gncCustomerCreate,
- DI(.book_begin =) NULL,
- DI(.book_end =) NULL,
- DI(.is_dirty =) qof_collection_is_dirty,
- DI(.mark_clean =) qof_collection_mark_clean,
- DI(.foreach =) qof_collection_foreach,
- DI(.printable =) (const char * (*)(gpointer))gncCustomerGetName,
- DI(.version_cmp =) (int (*)(gpointer, gpointer)) qof_instance_version_cmp,
+ DI(.interface_version = ) QOF_OBJECT_VERSION,
+ DI(.e_type = ) _GNC_MOD_NAME,
+ DI(.type_label = ) "Customer",
+ DI(.create = ) (gpointer)gncCustomerCreate,
+ DI(.book_begin = ) NULL,
+ DI(.book_end = ) NULL,
+ DI(.is_dirty = ) qof_collection_is_dirty,
+ DI(.mark_clean = ) qof_collection_mark_clean,
+ DI(.foreach = ) qof_collection_foreach,
+ DI(.printable = ) (const char * (*)(gpointer))gncCustomerGetName,
+ DI(.version_cmp = ) (int (*)(gpointer, gpointer)) qof_instance_version_cmp,
};
gboolean gncCustomerRegister (void)
Modified: gnucash/trunk/src/business/business-core/gncEmployee.c
===================================================================
--- gnucash/trunk/src/business/business-core/gncEmployee.c 2010-03-27 21:01:21 UTC (rev 18969)
+++ gnucash/trunk/src/business/business-core/gncEmployee.c 2010-03-27 21:01:56 UTC (rev 18970)
@@ -602,17 +602,17 @@
static QofObject gncEmployeeDesc =
{
- DI(.interface_version =) QOF_OBJECT_VERSION,
- DI(.e_type =) _GNC_MOD_NAME,
- DI(.type_label =) "Employee",
- DI(.create =) (gpointer)gncEmployeeCreate,
- DI(.book_begin =) NULL,
- DI(.book_end =) NULL,
- DI(.is_dirty =) qof_collection_is_dirty,
- DI(.mark_clean =) qof_collection_mark_clean,
- DI(.foreach =) qof_collection_foreach,
- DI(.printable =) _gncEmployeePrintable,
- DI(.version_cmp =) (int (*)(gpointer, gpointer)) qof_instance_version_cmp,
+ DI(.interface_version = ) QOF_OBJECT_VERSION,
+ DI(.e_type = ) _GNC_MOD_NAME,
+ DI(.type_label = ) "Employee",
+ DI(.create = ) (gpointer)gncEmployeeCreate,
+ DI(.book_begin = ) NULL,
+ DI(.book_end = ) NULL,
+ DI(.is_dirty = ) qof_collection_is_dirty,
+ DI(.mark_clean = ) qof_collection_mark_clean,
+ DI(.foreach = ) qof_collection_foreach,
+ DI(.printable = ) _gncEmployeePrintable,
+ DI(.version_cmp = ) (int (*)(gpointer, gpointer)) qof_instance_version_cmp,
};
gboolean gncEmployeeRegister (void)
Modified: gnucash/trunk/src/business/business-core/gncEntry.c
===================================================================
--- gnucash/trunk/src/business/business-core/gncEntry.c 2010-03-27 21:01:21 UTC (rev 18969)
+++ gnucash/trunk/src/business/business-core/gncEntry.c 2010-03-27 21:01:56 UTC (rev 18970)
@@ -1425,17 +1425,17 @@
static QofObject gncEntryDesc =
{
- DI(.interface_version =) QOF_OBJECT_VERSION,
- DI(.e_type =) _GNC_MOD_NAME,
- DI(.type_label =) "Order/Invoice/Bill Entry",
- DI(.create =) (gpointer)gncEntryCreate,
- DI(.book_begin =) NULL,
- DI(.book_end =) NULL,
- DI(.is_dirty =) qof_collection_is_dirty,
- DI(.mark_clean =) qof_collection_mark_clean,
- DI(.foreach =) qof_collection_foreach,
- DI(.printable =) NULL,
- DI(.version_cmp =) (int (*)(gpointer, gpointer)) qof_instance_version_cmp,
+ DI(.interface_version = ) QOF_OBJECT_VERSION,
+ DI(.e_type = ) _GNC_MOD_NAME,
+ DI(.type_label = ) "Order/Invoice/Bill Entry",
+ DI(.create = ) (gpointer)gncEntryCreate,
+ DI(.book_begin = ) NULL,
+ DI(.book_end = ) NULL,
+ DI(.is_dirty = ) qof_collection_is_dirty,
+ DI(.mark_clean = ) qof_collection_mark_clean,
+ DI(.foreach = ) qof_collection_foreach,
+ DI(.printable = ) NULL,
+ DI(.version_cmp = ) (int (*)(gpointer, gpointer)) qof_instance_version_cmp,
};
gboolean gncEntryRegister (void)
Modified: gnucash/trunk/src/business/business-core/gncInvoice.c
===================================================================
--- gnucash/trunk/src/business/business-core/gncInvoice.c 2010-03-27 21:01:21 UTC (rev 18969)
+++ gnucash/trunk/src/business/business-core/gncInvoice.c 2010-03-27 21:01:56 UTC (rev 18970)
@@ -198,7 +198,8 @@
s = g_strdup_printf("Invoice %s (%s)", inv->id, display_name);
g_free(display_name);
}
- else {
+ else
+ {
s = g_strdup_printf("Invoice %s", inv->id);
}
@@ -1919,17 +1920,17 @@
static QofObject gncInvoiceDesc =
{
- DI(.interface_version =) QOF_OBJECT_VERSION,
- DI(.e_type =) _GNC_MOD_NAME,
- DI(.type_label =) "Invoice",
- DI(.create =) (gpointer)gncInvoiceCreate,
- DI(.book_begin =) NULL,
- DI(.book_end =) NULL,
- DI(.is_dirty =) qof_collection_is_dirty,
- DI(.mark_clean =) qof_collection_mark_clean,
- DI(.foreach =) qof_collection_foreach,
- DI(.printable =) _gncInvoicePrintable,
- DI(.version_cmp =) (int (*)(gpointer, gpointer)) qof_instance_version_cmp,
+ DI(.interface_version = ) QOF_OBJECT_VERSION,
+ DI(.e_type = ) _GNC_MOD_NAME,
+ DI(.type_label = ) "Invoice",
+ DI(.create = ) (gpointer)gncInvoiceCreate,
+ DI(.book_begin = ) NULL,
+ DI(.book_end = ) NULL,
+ DI(.is_dirty = ) qof_collection_is_dirty,
+ DI(.mark_clean = ) qof_collection_mark_clean,
+ DI(.foreach = ) qof_collection_foreach,
+ DI(.printable = ) _gncInvoicePrintable,
+ DI(.version_cmp = ) (int (*)(gpointer, gpointer)) qof_instance_version_cmp,
};
static void
Modified: gnucash/trunk/src/business/business-core/gncJob.c
===================================================================
--- gnucash/trunk/src/business/business-core/gncJob.c 2010-03-27 21:01:21 UTC (rev 18969)
+++ gnucash/trunk/src/business/business-core/gncJob.c 2010-03-27 21:01:56 UTC (rev 18970)
@@ -473,17 +473,17 @@
static QofObject gncJobDesc =
{
- DI(.interface_version =) QOF_OBJECT_VERSION,
- DI(.e_type =) _GNC_MOD_NAME,
- DI(.type_label =) "Job",
- DI(.create =) (gpointer)gncJobCreate,
- DI(.book_begin =) NULL,
- DI(.book_end =) NULL,
- DI(.is_dirty =) qof_collection_is_dirty,
- DI(.mark_clean =) qof_collection_mark_clean,
- DI(.foreach =) qof_collection_foreach,
- DI(.printable =) _gncJobPrintable,
- DI(.version_cmp =) (int (*)(gpointer, gpointer)) qof_instance_version_cmp,
+ DI(.interface_version = ) QOF_OBJECT_VERSION,
+ DI(.e_type = ) _GNC_MOD_NAME,
+ DI(.type_label = ) "Job",
+ DI(.create = ) (gpointer)gncJobCreate,
+ DI(.book_begin = ) NULL,
+ DI(.book_end = ) NULL,
+ DI(.is_dirty = ) qof_collection_is_dirty,
+ DI(.mark_clean = ) qof_collection_mark_clean,
+ DI(.foreach = ) qof_collection_foreach,
+ DI(.printable = ) _gncJobPrintable,
+ DI(.version_cmp = ) (int (*)(gpointer, gpointer)) qof_instance_version_cmp,
};
gboolean gncJobRegister (void)
Modified: gnucash/trunk/src/business/business-core/gncOrder.c
===================================================================
--- gnucash/trunk/src/business/business-core/gncOrder.c 2010-03-27 21:01:21 UTC (rev 18969)
+++ gnucash/trunk/src/business/business-core/gncOrder.c 2010-03-27 21:01:56 UTC (rev 18970)
@@ -520,17 +520,17 @@
static QofObject gncOrderDesc =
{
- DI(.interface_version =) QOF_OBJECT_VERSION,
- DI(.e_type =) _GNC_MOD_NAME,
- DI(.type_label =) "Order",
- DI(.create =) (gpointer)gncOrderCreate,
- DI(.book_begin =) NULL,
- DI(.book_end =) NULL,
- DI(.is_dirty =) qof_collection_is_dirty,
- DI(.mark_clean =) qof_collection_mark_clean,
- DI(.foreach =) qof_collection_foreach,
- DI(.printable =) _gncOrderPrintable,
- DI(.version_cmp =) (int (*)(gpointer, gpointer)) qof_instance_version_cmp,
+ DI(.interface_version = ) QOF_OBJECT_VERSION,
+ DI(.e_type = ) _GNC_MOD_NAME,
+ DI(.type_label = ) "Order",
+ DI(.create = ) (gpointer)gncOrderCreate,
+ DI(.book_begin = ) NULL,
+ DI(.book_end = ) NULL,
+ DI(.is_dirty = ) qof_collection_is_dirty,
+ DI(.mark_clean = ) qof_collection_mark_clean,
+ DI(.foreach = ) qof_collection_foreach,
+ DI(.printable = ) _gncOrderPrintable,
+ DI(.version_cmp = ) (int (*)(gpointer, gpointer)) qof_instance_version_cmp,
};
gboolean gncOrderRegister (void)
Modified: gnucash/trunk/src/business/business-core/gncTaxTable.c
===================================================================
--- gnucash/trunk/src/business/business-core/gncTaxTable.c 2010-03-27 21:01:21 UTC (rev 18969)
+++ gnucash/trunk/src/business/business-core/gncTaxTable.c 2010-03-27 21:01:56 UTC (rev 18970)
@@ -954,17 +954,17 @@
static QofObject gncTaxTableDesc =
{
- DI(.interface_version =) QOF_OBJECT_VERSION,
- DI(.e_type =) _GNC_MOD_NAME,
- DI(.type_label =) "Tax Table",
- DI(.create =) (gpointer)gncTaxTableCreate,
- DI(.book_begin =) _gncTaxTableCreate,
- DI(.book_end =) _gncTaxTableDestroy,
- DI(.is_dirty =) qof_collection_is_dirty,
- DI(.mark_clean =) qof_collection_mark_clean,
- DI(.foreach =) qof_collection_foreach,
- DI(.printable =) NULL,
- DI(.version_cmp =) (int (*)(gpointer, gpointer)) qof_instance_version_cmp,
+ DI(.interface_version = ) QOF_OBJECT_VERSION,
+ DI(.e_type = ) _GNC_MOD_NAME,
+ DI(.type_label = ) "Tax Table",
+ DI(.create = ) (gpointer)gncTaxTableCreate,
+ DI(.book_begin = ) _gncTaxTableCreate,
+ DI(.book_end = ) _gncTaxTableDestroy,
+ DI(.is_dirty = ) qof_collection_is_dirty,
+ DI(.mark_clean = ) qof_collection_mark_clean,
+ DI(.foreach = ) qof_collection_foreach,
+ DI(.printable = ) NULL,
+ DI(.version_cmp = ) (int (*)(gpointer, gpointer)) qof_instance_version_cmp,
};
gboolean gncTaxTableRegister (void)
Modified: gnucash/trunk/src/business/business-core/gncVendor.c
===================================================================
--- gnucash/trunk/src/business/business-core/gncVendor.c 2010-03-27 21:01:21 UTC (rev 18969)
+++ gnucash/trunk/src/business/business-core/gncVendor.c 2010-03-27 21:01:56 UTC (rev 18970)
@@ -711,17 +711,17 @@
static QofObject gncVendorDesc =
{
- DI(.interface_version =) QOF_OBJECT_VERSION,
- DI(.e_type =) _GNC_MOD_NAME,
- DI(.type_label =) "Vendor",
- DI(.create =) (gpointer)gncVendorCreate,
- DI(.book_begin =) NULL,
- DI(.book_end =) NULL,
- DI(.is_dirty =) qof_collection_is_dirty,
- DI(.mark_clean =) qof_collection_mark_clean,
- DI(.foreach =) qof_collection_foreach,
- DI(.printable =) _gncVendorPrintable,
- DI(.version_cmp =) (int (*)(gpointer, gpointer)) qof_instance_version_cmp,
+ DI(.interface_version = ) QOF_OBJECT_VERSION,
+ DI(.e_type = ) _GNC_MOD_NAME,
+ DI(.type_label = ) "Vendor",
+ DI(.create = ) (gpointer)gncVendorCreate,
+ DI(.book_begin = ) NULL,
+ DI(.book_end = ) NULL,
+ DI(.is_dirty = ) qof_collection_is_dirty,
+ DI(.mark_clean = ) qof_collection_mark_clean,
+ DI(.foreach = ) qof_collection_foreach,
+ DI(.printable = ) _gncVendorPrintable,
+ DI(.version_cmp = ) (int (*)(gpointer, gpointer)) qof_instance_version_cmp,
};
gboolean gncVendorRegister (void)
Modified: gnucash/trunk/src/core-utils/gnc-filepath-utils.c
===================================================================
--- gnucash/trunk/src/core-utils/gnc-filepath-utils.c 2010-03-27 21:01:21 UTC (rev 18969)
+++ gnucash/trunk/src/core-utils/gnc-filepath-utils.c 2010-03-27 21:01:56 UTC (rev 18970)
@@ -178,7 +178,7 @@
/* ====================================================================== */
-/** @brief Check that the supplied directory path exists, is a directory, and
+/** @brief Check that the supplied directory path exists, is a directory, and
* that the user has adequate permissions to use it.
*
* @param dirname The path to check
Modified: gnucash/trunk/src/core-utils/gnc-uri-utils.c
===================================================================
--- gnucash/trunk/src/core-utils/gnc-uri-utils.c 2010-03-27 21:01:21 UTC (rev 18969)
+++ gnucash/trunk/src/core-utils/gnc-uri-utils.c 2010-03-27 21:01:56 UTC (rev 18970)
@@ -32,9 +32,9 @@
gboolean gnc_uri_is_file_protocol (const gchar *protocol)
{
if ( !g_ascii_strcasecmp (protocol, "file") ||
- !g_ascii_strcasecmp (protocol, "xml") ||
- !g_ascii_strcasecmp (protocol, "sqlite3")
- )
+ !g_ascii_strcasecmp (protocol, "xml") ||
+ !g_ascii_strcasecmp (protocol, "sqlite3")
+ )
return TRUE;
else
return FALSE;
@@ -121,7 +121,7 @@
{
/* There is password in the url */
delimiter[0] = '\0';
- *password = g_strdup ( (const gchar*)(delimiter+1) );
+ *password = g_strdup ( (const gchar*)(delimiter + 1) );
}
*username = g_strdup ( (const gchar*)tmpusername );
}
@@ -137,9 +137,9 @@
{
delimiter[0] = '\0';
if ( gnc_uri_is_file_protocol ( *protocol ) ) /* always return absolute file paths */
- *path = gnc_resolve_file_path ( (const gchar*)(delimiter+1) );
+ *path = gnc_resolve_file_path ( (const gchar*)(delimiter + 1) );
else /* path is no file path, so copy it as is */
- *path = g_strdup ( (const gchar*)(delimiter+1) );
+ *path = g_strdup ( (const gchar*)(delimiter + 1) );
}
/* Check for a port specifier */
@@ -147,7 +147,7 @@
if ( delimiter != NULL )
{
delimiter[0] = '\0';
- *port = g_ascii_strtoll ( delimiter+1, NULL, 0 );
+ *port = g_ascii_strtoll ( delimiter + 1, NULL, 0 );
}
*hostname = g_strdup ( (const gchar*)tmphostname );
@@ -206,7 +206,7 @@
const gchar *password,
const gchar *path)
{
- gchar *userpass=NULL, *portstr=NULL, *uri=NULL;
+ gchar *userpass = NULL, *portstr = NULL, *uri = NULL;
g_return_val_if_fail( path != 0, NULL );
Modified: gnucash/trunk/src/debug/splint-defs.h
===================================================================
--- gnucash/trunk/src/debug/splint-defs.h 2010-03-27 21:01:21 UTC (rev 18969)
+++ gnucash/trunk/src/debug/splint-defs.h 2010-03-27 21:01:56 UTC (rev 18970)
@@ -38,12 +38,15 @@
void dbi_conn_close( /*@ only @*/ dbi_conn );
int dbi_conn_error( dbi_conn, /*@ out @*/ const char** );
dbi_result dbi_conn_get_table_list( dbi_conn, const char*, /*@ null @*/ const char* );
-/*@ dependent @*/ const char* dbi_conn_get_option( dbi_conn, const char* );
+/*@ dependent @*/
+const char* dbi_conn_get_option( dbi_conn, const char* );
int dbi_result_free( /*@ only @*/ dbi_result );
-/*@ dependent @*/ const char* dbi_result_get_string_idx( dbi_result, unsigned int );
+/*@ dependent @*/
+const char* dbi_result_get_string_idx( dbi_result, unsigned int );
dbi_driver dbi_driver_list( /*@ null @*/ dbi_driver );
size_t dbi_conn_quote_string_copy( dbi_conn, const char*, /*@ out @*/ char** );
-/*@ dependent @*/ dbi_driver_get_name( dbi_driver );
+/*@ dependent @*/
+dbi_driver_get_name( dbi_driver );
#endif
/* gdate.h */
@@ -56,7 +59,8 @@
#ifdef __G_MEM_H__
/*@ null @*/ /*@ only @*/ /*@ out @*/ gpointer g_malloc(gsize n_bytes);
-/*@ null @*/ /*@ only @*/ /*@ out @*/ gpointer g_malloc0(gsize n_bytes);
+/*@ null @*/ /*@ only @*/ /*@ out @*/
+gpointer g_malloc0(gsize n_bytes);
void g_free( /*@ only @*/ gpointer );
#endif
@@ -64,7 +68,8 @@
#ifdef __G_VALUE_H__
GValue* g_value_init( /*@ out @*/ GValue*, GType );
-/*@ dependent @*/ const gchar* g_value_get_string(const GValue *value);
+/*@ dependent @*/
+const gchar* g_value_get_string(const GValue *value);
void g_value_take_string( GValue*, /*@ only @*/ const gchar *);
#endif
@@ -79,7 +84,8 @@
#ifdef __G_HASH_H__
GHashTable* g_hash_table_new_full( GHashFunc, GEqualFunc, /*@ null @*/ GDestroyNotify, /*@ null @*/ GDestroyNotify );
void g_hash_table_insert(GHashTable *hash_table, /*@ only @*/ gpointer key, gpointer value);
-/*@ dependent @*/ g_hash_table_lookup( GHashTable* hash_table, gpointer key );
+/*@ dependent @*/
+g_hash_table_lookup( GHashTable* hash_table, gpointer key );
#endif
/* glist.h */
@@ -107,7 +113,7 @@
#ifdef __G_TYPE_H__
/*@ dependent @*/ GTypeInstance* g_type_check_instance_cast(GTypeInstance *instance,
- GType iface_type);
+ GType iface_type);
#endif
/* gtestutils.h */
Modified: gnucash/trunk/src/engine/SchedXaction.c
===================================================================
--- gnucash/trunk/src/engine/SchedXaction.c 2010-03-27 21:01:21 UTC (rev 18969)
+++ gnucash/trunk/src/engine/SchedXaction.c 2010-03-27 21:01:56 UTC (rev 18970)
@@ -357,10 +357,10 @@
(gobject_class,
PROP_TEMPLATE_ACCOUNT,
g_param_spec_object("template-account",
- "Template account",
- "Account which holds the template transactions.",
- GNC_TYPE_ACCOUNT,
- G_PARAM_READWRITE));
+ "Template account",
+ "Account which holds the template transactions.",
+ GNC_TYPE_ACCOUNT,
+ G_PARAM_READWRITE));
}
static void
Modified: gnucash/trunk/src/engine/TransLog.c
===================================================================
--- gnucash/trunk/src/engine/TransLog.c 2010-03-27 21:01:21 UTC (rev 18969)
+++ gnucash/trunk/src/engine/TransLog.c 2010-03-27 21:01:56 UTC (rev 18970)
@@ -172,7 +172,7 @@
{
int norr = errno;
printf ("Error: xaccOpenLog(): cannot open journal \n"
- "\t %d %s\n", norr, g_strerror (norr) ? g_strerror (norr) : "");
+ "\t %d %s\n", norr, g_strerror (norr) ? g_strerror (norr) : "");
g_free (filename);
g_free (timestamp);
Modified: gnucash/trunk/src/engine/Transaction.c
===================================================================
--- gnucash/trunk/src/engine/Transaction.c 2010-03-27 21:01:21 UTC (rev 18969)
+++ gnucash/trunk/src/engine/Transaction.c 2010-03-27 21:01:56 UTC (rev 18970)
@@ -740,7 +740,7 @@
}
if ((same_book && ta->description != tb->description)
- || (!same_book && safe_strcmp(ta->description, tb->description)))
+ || (!same_book && safe_strcmp(ta->description, tb->description)))
{
PWARN ("descriptions differ: %s vs %s", ta->description, tb->description);
return FALSE;
Modified: gnucash/trunk/src/engine/kvp-scm.c
===================================================================
--- gnucash/trunk/src/engine/kvp-scm.c 2010-03-27 21:01:21 UTC (rev 18969)
+++ gnucash/trunk/src/engine/kvp-scm.c 2010-03-27 21:01:56 UTC (rev 18970)
@@ -107,7 +107,7 @@
case KVP_TYPE_GDATE:
return gnc_timespec2timepair(gdate_to_timespec(kvp_value_get_gdate(val)));
- /* FIXME: handle types below */
+ /* FIXME: handle types below */
case KVP_TYPE_BINARY:
break;
case KVP_TYPE_GLIST:
Modified: gnucash/trunk/src/engine/test/test-date.c
===================================================================
--- gnucash/trunk/src/engine/test/test-date.c 2010-03-27 21:01:21 UTC (rev 18969)
+++ gnucash/trunk/src/engine/test/test-date.c 2010-03-27 21:01:56 UTC (rev 18970)
@@ -84,9 +84,9 @@
d1 = timespec_to_gdate(ts);
d2 = timespec_to_gdate(gdate_to_timespec(d1));
if ((g_date_compare(&d1, &d2) != 0)
- || (g_date_get_day(&d1) != day)
- || (g_date_get_month(&d1) != month)
- || (g_date_get_year(&d1) != year))
+ || (g_date_get_day(&d1) != day)
+ || (g_date_get_month(&d1) != month)
+ || (g_date_get_year(&d1) != year))
{
fprintf (stderr,
"\nmis-converted \"%s\" to GDate\n",
Modified: gnucash/trunk/src/experimental/cgi-bin/fastcgi-hello.c
===================================================================
--- gnucash/trunk/src/experimental/cgi-bin/fastcgi-hello.c 2010-03-27 21:01:21 UTC (rev 18969)
+++ gnucash/trunk/src/experimental/cgi-bin/fastcgi-hello.c 2010-03-27 21:01:56 UTC (rev 18970)
@@ -7,46 +7,47 @@
int main (int argc, char *argv[])
{
- char *query_string, *method, *len=0x0;
- int count = 0;
- int i, ilen=0;
+ char *query_string, *method, *len = 0x0;
+ int count = 0;
+ int i, ilen = 0;
- while(FCGI_Accept() >= 0){
- printf("Content-type: text/html\r\n"
- "\r\n"
- "<title>FastCGI Hello!</title>"
- "<h1>FastCGI Hello!</h1>"
- "Request number %d running on host <i>%s</i>\n",
- ++count, getenv("SERVER_NAME"));
+ while (FCGI_Accept() >= 0)
+ {
+ printf("Content-type: text/html\r\n"
+ "\r\n"
+ "<title>FastCGI Hello!</title>"
+ "<h1>FastCGI Hello!</h1>"
+ "Request number %d running on host <i>%s</i>\n",
+ ++count, getenv("SERVER_NAME"));
- printf("<p>If you have configured fastcgi correctly, then "
- "the request number should increment every time you "
- "hit reload on your browser. You should also see "
- "\"%s\" (the name of this program) showing up in ps ax.\n",
- argv[0]);
+ printf("<p>If you have configured fastcgi correctly, then "
+ "the request number should increment every time you "
+ "hit reload on your browser. You should also see "
+ "\"%s\" (the name of this program) showing up in ps ax.\n",
+ argv[0]);
- query_string = getenv ("QUERY_STRING");
- printf ("<p>The QUERY_STRING environment vairable is %s\n"
- "The other environment variables are:<p>", query_string);
+ query_string = getenv ("QUERY_STRING");
+ printf ("<p>The QUERY_STRING environment vairable is %s\n"
+ "The other environment variables are:<p>", query_string);
- for (i=0; environ[i]; i++)
- {
- printf ("<br>%s\n", environ[i]);
- }
+ for (i = 0; environ[i]; i++)
+ {
+ printf ("<br>%s\n", environ[i]);
+ }
- method = getenv ("REQUEST_METHOD");
- if (!strcmp (method, "POST"))
- {
- char * bufp;
- ilen = atoi (getenv ("CONTENT_LENGTH"));
- printf ("<P>This is a method=post request, "
- "with content length=%d<P>\n", ilen);
- bufp = (char *) malloc (ilen);
- fread (bufp, ilen, 1, stdin);
-
- printf ("The POST data is<P>%s\n", bufp);
- }
+ method = getenv ("REQUEST_METHOD");
+ if (!strcmp (method, "POST"))
+ {
+ char * bufp;
+ ilen = atoi (getenv ("CONTENT_LENGTH"));
+ printf ("<P>This is a method=post request, "
+ "with content length=%d<P>\n", ilen);
+ bufp = (char *) malloc (ilen);
+ fread (bufp, ilen, 1, stdin);
- }
- return 0;
+ printf ("The POST data is<P>%s\n", bufp);
+ }
+
+ }
+ return 0;
}
Modified: gnucash/trunk/src/experimental/cgi-bin/gnc-server.c
===================================================================
--- gnucash/trunk/src/experimental/cgi-bin/gnc-server.c 2010-03-27 21:01:21 UTC (rev 18969)
+++ gnucash/trunk/src/experimental/cgi-bin/gnc-server.c 2010-03-27 21:01:56 UTC (rev 18970)
@@ -17,109 +17,109 @@
#include "gnc-engine.h"
#include "io-gncxml.h"
-
+
#include <fcgi_stdio.h>
/* ======================================================== */
-/* XXX -- hack alert -- should do the below in some far more
+/* XXX -- hack alert -- should do the below in some far more
* elegant fashion ... */
static void
reject_user_agent (const char *user_agent)
{
- printf("Content-type: text/html\r\n"
- "\r\n"
- "<html>\n"
- "<head><title>ERROR</title></head>\n"
- "<body bgcolor=#ffffff>\n"
- "<h1>Error - Wrong Browser</h1>\n"
- "Your browser was deteted to be %s<p>\n"
- "This server returns finacial data (XML) that only\n"
- "the GnuCash client understands. You must use GnuCash\n"
- "to view this data\n"
- "</body></html>\n",
- user_agent);
+ printf("Content-type: text/html\r\n"
+ "\r\n"
+ "<html>\n"
+ "<head><title>ERROR</title></head>\n"
+ "<body bgcolor=#ffffff>\n"
+ "<h1>Error - Wrong Browser</h1>\n"
+ "Your browser was deteted to be %s<p>\n"
+ "This server returns finacial data (XML) that only\n"
+ "the GnuCash client understands. You must use GnuCash\n"
+ "to view this data\n"
+ "</body></html>\n",
+ user_agent);
}
static void
reject_method (const char * method)
{
- printf("Content-type: text/html\r\n"
- "\r\n"
- "<html>\n"
- "<head><title>ERROR</title></head>\n"
- "<body bgcolor=#ffffff>\n"
- "<h1>Error - Unsupported Method</h1>\n"
- "Your browser sent METHOD=%s\n"
- "<p>Only METHOD=POST is supported\n"
- "</body></html>\n",
- method);
+ printf("Content-type: text/html\r\n"
+ "\r\n"
+ "<html>\n"
+ "<head><title>ERROR</title></head>\n"
+ "<body bgcolor=#ffffff>\n"
+ "<h1>Error - Unsupported Method</h1>\n"
+ "Your browser sent METHOD=%s\n"
+ "<p>Only METHOD=POST is supported\n"
+ "</body></html>\n",
+ method);
}
static void
reject_session (const char * session)
{
- printf("Content-type: text/html\r\n"
- "\r\n"
- "<html>\n"
- "<head><title>ERROR</title></head>\n"
- "<body bgcolor=#ffffff>\n"
- "<h1>Error - Invalid Session ID</h1>\n"
- "Your browser sent the session id %s\n"
- "<p>This is not a valid session ID\n"
- "</body></html>\n",
- session);
+ printf("Content-type: text/html\r\n"
+ "\r\n"
+ "<html>\n"
+ "<head><title>ERROR</title></head>\n"
+ "<body bgcolor=#ffffff>\n"
+ "<h1>Error - Invalid Session ID</h1>\n"
+ "Your browser sent the session id %s\n"
+ "<p>This is not a valid session ID\n"
+ "</body></html>\n",
+ session);
}
static void
reject_auth (void)
{
- printf("Content-type: text/html\r\n"
- "\r\n"
- "<html>\n"
- "<head><title>ERROR</title></head>\n"
- "<body bgcolor=#ffffff>\n"
- "<h1>Error - Bad Login</h1>\n"
- "Your supplied a bad username or password\n"
- "<p>Try again\n"
- "</body></html>\n");
+ printf("Content-type: text/html\r\n"
+ "\r\n"
+ "<html>\n"
+ "<head><title>ERROR</title></head>\n"
+ "<body bgcolor=#ffffff>\n"
+ "<h1>Error - Bad Login</h1>\n"
+ "Your supplied a bad username or password\n"
+ "<p>Try again\n"
+ "</body></html>\n");
}
/* ======================================================== */
-/* XXX -- hack alert -- cheesy user authentication and tracking
+/* XXX -- hack alert -- cheesy user authentication and tracking
* this should be replaced by something more professional
*
- * This implementation uses gnucash GncGUID's to track sessions,
+ * This implementation uses gnucash GncGUID's to track sessions,
* but the API is designed so that anything that can be converted
* to a string & back will work.
*/
GList * logged_in_users = NULL;
-/* The auth_user() routine authenticates the user. If the
- * authentication fails, then NULL is returned. If the authentication
- * suceeds, then a string that uniquely identifies this session
- * should be returned. (When the user logs off, the session
+/* The auth_user() routine authenticates the user. If the
+ * authentication fails, then NULL is returned. If the authentication
+ * suceeds, then a string that uniquely identifies this session
+ * should be returned. (When the user logs off, the session
* should become invalid.
*/
static const char *
auth_user (const char * name, const char *passwd)
{
- GncGUID *guid;
- const char *session_auth_string;
+ GncGUID *guid;
+ const char *session_auth_string;
- /* hack alert - XXX - we do no authentication whatsoever,
- * any user is allowed to login. We only reject null users.
- */
- if (!name || !passwd) return NULL;
+ /* hack alert - XXX - we do no authentication whatsoever,
+ * any user is allowed to login. We only reject null users.
+ */
+ if (!name || !passwd) return NULL;
- guid = g_new (GncGUID, 1);
- guid_new (guid);
- logged_in_users = g_list_prepend (logged_in_users, guid);
- session_auth_string = guid_to_string (guid); /* THREAD UNSAFE */
- return session_auth_string;
+ guid = g_new (GncGUID, 1);
+ guid_new (guid);
+ logged_in_users = g_list_prepend (logged_in_users, guid);
+ session_auth_string = guid_to_string (guid); /* THREAD UNSAFE */
+ return session_auth_string;
}
/*
@@ -131,18 +131,19 @@
static gboolean
have_session (const char *session_auth_string)
{
- GncGUID guid;
- GList *next = logged_in_users;
+ GncGUID guid;
+ GList *next = logged_in_users;
- string_to_guid (session_auth_string, &guid);
+ string_to_guid (session_auth_string, &guid);
- while(next) {
- if (guid_equal (&guid, next->data)) return TRUE;
- next = next->next;
- }
+ while (next)
+ {
+ if (guid_equal (&guid, next->data)) return TRUE;
+ next = next->next;
+ }
- /* guid was not found */
- return FALSE;
+ /* guid was not found */
+ return FALSE;
}
/* ======================================================== */
@@ -151,237 +152,238 @@
static const char *
find_cookie (const char * cookie_name)
{
- const char *cookie_string;
- size_t len;
- len = strlen (cookie_name);
-
- cookie_string = getenv ("HTTP_COOKIE");
- if (!cookie_string) return NULL;
+ const char *cookie_string;
+ size_t len;
+ len = strlen (cookie_name);
- while (cookie_string)
- {
- if (!strncmp (cookie_string, cookie_name, len) &&
- ('=' == cookie_string[len]))
- {
- return cookie_string+len+1;
- }
- cookie_string = strchr (cookie_string, ';');
- if (cookie_string) cookie_string ++;
- }
-
- return NULL;
+ cookie_string = getenv ("HTTP_COOKIE");
+ if (!cookie_string) return NULL;
+
+ while (cookie_string)
+ {
+ if (!strncmp (cookie_string, cookie_name, len) &&
+ ('=' == cookie_string[len]))
+ {
+ return cookie_string + len + 1;
+ }
+ cookie_string = strchr (cookie_string, ';');
+ if (cookie_string) cookie_string ++;
+ }
+
+ return NULL;
}
/* ======================================================== */
-/* simpleminded utility parses GET/POST string for username,
+/* simpleminded utility parses GET/POST string for username,
* password. Not only is it totally inflexible as to what
* it looks for, but it also fails to url-decode, so that
* characters like & cannot be used insode of passwords
* XXX hack alert above should be fixed.
*/
-static void
+static void
parse_for_login (char * bufp, char **namep, char **passwdp)
{
- if (!bufp) return;
-
- while (bufp) {
- if (!strncmp (bufp, "name=", 5))
- {
- *namep = bufp+5;
- } else
- if (!strncmp (bufp, "passwd=", 7))
- {
- *passwdp = bufp+7;
- }
+ if (!bufp) return;
- bufp = strchr (bufp, '&');
- if (bufp)
- {
- *bufp = 0x0;
- bufp++;
- }
- }
+ while (bufp)
+ {
+ if (!strncmp (bufp, "name=", 5))
+ {
+ *namep = bufp + 5;
+ }
+ else if (!strncmp (bufp, "passwd=", 7))
+ {
+ *passwdp = bufp + 7;
+ }
+
+ bufp = strchr (bufp, '&');
+ if (bufp)
+ {
+ *bufp = 0x0;
+ bufp++;
+ }
+ }
}
/* ======================================================== */
int
-main (int argc, char *argv[])
+main (int argc, char *argv[])
{
- int err, fake_argc =1;
- char * fake_argv[] = {"hello", 0};
- QofBook *book;
- Account *root;
- char *request_bufp, *reply_bufp;
- int rc, sz;
-
- /* intitialize the engine */
- gnc_engine_init (fake_argc, fake_argv);
+ int err, fake_argc = 1;
+ char * fake_argv[] = {"hello", 0};
+ QofBook *book;
+ Account *root;
+ char *request_bufp, *reply_bufp;
+ int rc, sz;
- /* contact the database, which is a flat file for this demo */
- /* this should really be an SQL server */
- book = qof_book_new ();
+ /* intitialize the engine */
+ gnc_engine_init (fake_argc, fake_argv);
- rc = gnc_book_begin (book, "file:/tmp/demo.xac", FALSE);
- if (!rc) goto bookerrexit;
+ /* contact the database, which is a flat file for this demo */
+ /* this should really be an SQL server */
+ book = qof_book_new ();
- rc = gnc_book_load (book);
- if (!rc) goto bookerrexit;
+ rc = gnc_book_begin (book, "file:/tmp/demo.xac", FALSE);
+ if (!rc) goto bookerrexit;
- /* the root pointer points to our local cache of the data */
- root = gnc_book_get_root_account (book);
-
- /* --------------------------------------------------- */
- /* done with initialization, go into event loop */
+ rc = gnc_book_load (book);
+ if (!rc) goto bookerrexit;
- while(FCGI_Accept() >= 0)
- {
- GList *split_list;
- Query *q = NULL;
- const char *request_method;
- const char *user_agent;
- const char *auth_string;
- const char *content_length;
- int read_len=0;
- int send_accts = 0;
+ /* the root pointer points to our local cache of the data */
+ root = gnc_book_get_root_account (book);
- /* get the user agent; reject if wrong agent */
- user_agent = getenv ("HTTP_USER_AGENT");
- if (strncmp ("gnucash", user_agent, 7))
- {
- reject_user_agent (user_agent);
- continue;
- }
+ /* --------------------------------------------------- */
+ /* done with initialization, go into event loop */
- /* get the request method */
- request_method = getenv ("REQUEST_METHOD");
- if (strcmp ("POST", request_method))
- {
- /* method=post is the only spported method*/
- reject_method(request_method);
- continue;
- }
+ while (FCGI_Accept() >= 0)
+ {
+ GList *split_list;
+ Query *q = NULL;
+ const char *request_method;
+ const char *user_agent;
+ const char *auth_string;
+ const char *content_length;
+ int read_len = 0;
+ int send_accts = 0;
- /* ----------------------------------------------- */
- /* look for an authentication cookie */
- auth_string = find_cookie ("gnc-server");
+ /* get the user agent; reject if wrong agent */
+ user_agent = getenv ("HTTP_USER_AGENT");
+ if (strncmp ("gnucash", user_agent, 7))
+ {
+ reject_user_agent (user_agent);
+ continue;
+ }
- /* found the cookie, lets make sure that it is valid */
- if (auth_string)
- {
- gboolean valid_session;
- valid_session = have_session (auth_string);
- if (!valid_session)
- {
-
- /* XXX invalid sessions are a sign of hacking;
- * this event should be noted in a security log
- * and the server admin contacted.
- */
- reject_session (auth_string);
+ /* get the request method */
+ request_method = getenv ("REQUEST_METHOD");
+ if (strcmp ("POST", request_method))
+ {
+ /* method=post is the only spported method*/
+ reject_method(request_method);
continue;
- }
- }
+ }
- /* go ahead and read the message body.
- * we'll need this soon enough */
- content_length = getenv("CONTENT_LENGTH");
- read_len = atoi (content_length);
+ /* ----------------------------------------------- */
+ /* look for an authentication cookie */
+ auth_string = find_cookie ("gnc-server");
- /* read 'read_len' bytes from stdin ... */
- request_bufp = (char *) g_malloc (read_len);
- fread (request_bufp, read_len, 1, stdin);
+ /* found the cookie, lets make sure that it is valid */
+ if (auth_string)
+ {
+ gboolean valid_session;
+ valid_session = have_session (auth_string);
+ if (!valid_session)
+ {
- /* if no previously authenticated session,
- * authenticate now */
- if (!auth_string)
- {
- char *name=NULL, *passwd=NULL;
- parse_for_login (request_bufp, &name, &passwd);
+ /* XXX invalid sessions are a sign of hacking;
+ * this event should be noted in a security log
+ * and the server admin contacted.
+ */
+ reject_session (auth_string);
+ continue;
+ }
+ }
- auth_string = auth_user (name, passwd);
- if (!auth_string)
- {
- reject_auth();
- g_free (request_bufp);
- continue;
- }
- send_accts = 1;
- }
+ /* go ahead and read the message body.
+ * we'll need this soon enough */
+ content_length = getenv("CONTENT_LENGTH");
+ read_len = atoi (content_length);
- /* ----------------------------------------------- */
- /* send only the accounts to the user */
- if (send_accts)
- {
- /* print the HTTP header */
- printf("Content-type: text/gnc-xml\r\n"
- "Set-Cookie: %s\r\n"
- "Content-Length: %d\r\n"
- "\r\n",
- auth_string, sz);
-
- /* since this is the first time the user is logging
- * in, send them the full set of accounts.
- * (Do not send them any transactions yet).
- */
- gncxml_write_account_tree_to_buf(root, &reply_bufp, &sz);
+ /* read 'read_len' bytes from stdin ... */
+ request_bufp = (char *) g_malloc (read_len);
+ fread (request_bufp, read_len, 1, stdin);
- /* send the xml to the client */
- printf ("%s", reply_bufp);
- g_free (request_bufp);
+ /* if no previously authenticated session,
+ * authenticate now */
+ if (!auth_string)
+ {
+ char *name = NULL, *passwd = NULL;
+ parse_for_login (request_bufp, &name, &passwd);
- /* wait for the next request */
- continue;
- }
+ auth_string = auth_user (name, passwd);
+ if (!auth_string)
+ {
+ reject_auth();
+ g_free (request_bufp);
+ continue;
+ }
+ send_accts = 1;
+ }
- /* ----------------------------------------------- */
- /* If we got to here, then the ser should be sending
- * us a query xml.
- * we should somehow error check that what we got
- * is really a valid query
- */
+ /* ----------------------------------------------- */
+ /* send only the accounts to the user */
+ if (send_accts)
+ {
+ /* print the HTTP header */
+ printf("Content-type: text/gnc-xml\r\n"
+ "Set-Cookie: %s\r\n"
+ "Content-Length: %d\r\n"
+ "\r\n",
+ auth_string, sz);
- /* conver the xml input into a gnucash query structure... */
- q = gncxml_read_query (request_bufp, read_len);
- xaccQuerySetGroup (q, root);
+ /* since this is the first time the user is logging
+ * in, send them the full set of accounts.
+ * (Do not send them any transactions yet).
+ */
+ gncxml_write_account_tree_to_buf(root, &reply_bufp, &sz);
- /* hack -- limit to 30 splits ... */
- xaccQuerySetMaxSplits (q, 30);
- split_list = xaccQueryGetSplits (q);
+ /* send the xml to the client */
+ printf ("%s", reply_bufp);
+ g_free (request_bufp);
- /* poke those splits into an ccount group structure */
- /* XXX not implemented */
+ /* wait for the next request */
+ continue;
+ }
- /* send the account group structure back to the user */
- /* XXX not implemented */
+ /* ----------------------------------------------- */
+ /* If we got to here, then the ser should be sending
+ * us a query xml.
+ * we should somehow error check that what we got
+ * is really a valid query
+ */
- xaccFreeQuery (q);
- g_free (request_bufp);
+ /* conver the xml input into a gnucash query structure... */
+ q = gncxml_read_query (request_bufp, read_len);
+ xaccQuerySetGroup (q, root);
- }
+ /* hack -- limit to 30 splits ... */
+ xaccQuerySetMaxSplits (q, 30);
+ split_list = xaccQueryGetSplits (q);
+ /* poke those splits into an ccount group structure */
+ /* XXX not implemented */
+
+ /* send the account group structure back to the user */
+ /* XXX not implemented */
+
+ xaccFreeQuery (q);
+ g_free (request_bufp);
+
+ }
+
bookerrexit:
- err = gnc_book_get_error (book);
+ err = gnc_book_get_error (book);
- /* 500 Server Error */
- FCGI_SetExitStatus (500);
+ /* 500 Server Error */
+ FCGI_SetExitStatus (500);
- printf("Content-type: text/plain\r\n\r\n"
- "error was %s\n", strerror (err));
+ printf("Content-type: text/plain\r\n\r\n"
+ "error was %s\n", strerror (err));
- FCGI_Finish();
+ FCGI_Finish();
- /* close the book */
- qof_book_destroy (book);
+ /* close the book */
+ qof_book_destroy (book);
- /* shut down the engine */
- gnc_engine_shutdown ();
+ /* shut down the engine */
+ gnc_engine_shutdown ();
- sleep (1);
+ sleep (1);
- /* must return a non-zero error code, otherwise fastcgi
- * attempts to respawn this daemon. */
- return 500;
+ /* must return a non-zero error code, otherwise fastcgi
+ * attempts to respawn this daemon. */
+ return 500;
}
Modified: gnucash/trunk/src/experimental/cgi-bin/hello.c
===================================================================
--- gnucash/trunk/src/experimental/cgi-bin/hello.c 2010-03-27 21:01:21 UTC (rev 18969)
+++ gnucash/trunk/src/experimental/cgi-bin/hello.c 2010-03-27 21:01:56 UTC (rev 18970)
@@ -1,6 +1,6 @@
/*
* FILE:
- * hello.c
+ * hello.c
*
* FUNCTION:
* The first in a sequence of demos for cgi-bin programming
@@ -17,61 +17,63 @@
#include "gnc-engine.h"
#include "io-gncxml-v2.h"
-
+
int
-main (int argc, char *argv[])
+main (int argc, char *argv[])
{
- int fake_argc =1;
- char * fake_argv[] = {"hello", 0};
- QofBook *book;
- int rc;
-
- /* intitialize the engine */
- gnc_engine_init (fake_argc, fake_argv);
+ int fake_argc = 1;
+ char * fake_argv[] = {"hello", 0};
+ QofBook *book;
+ int rc;
- /* dirty little hack to work around commodity borkeness */
- {
- gnc_commodity_table *t = gnc_engine_commodities ();
- gnc_commodity *cm = gnc_commodity_new ("US Dollar", "ISO4217", "USD", "840", 100);
- gnc_commodity_table_insert (t, cm);
- }
+ /* intitialize the engine */
+ gnc_engine_init (fake_argc, fake_argv);
- /* contact the database, which is a flat file for this demo */
- book = qof_book_new ();
+ /* dirty little hack to work around commodity borkeness */
+ {
+ gnc_commodity_table *t = gnc_engine_commodities ();
+ gnc_commodity *cm = gnc_commodity_new ("US Dollar", "ISO4217", "USD", "840", 100);
+ gnc_commodity_table_insert (t, cm);
+ }
- rc = gnc_book_begin (book, "file:/tmp/demo.gml", FALSE, FALSE);
- if (!rc) {
- GNCBackendError err = gnc_book_get_error (book);
- printf ("HTTP/1.1 500 Server Error\n");
- printf ("\n");
- printf ("err=%d \n", err);
- goto bookerrexit;
- }
+ /* contact the database, which is a flat file for this demo */
+ book = qof_book_new ();
- rc = gnc_book_load (book);
- if (!rc) {
- GNCBackendError err = gnc_book_get_error (book);
- printf ("HTTP/1.1 500 Server Error\n");
- printf ("\n");
- printf ("err=%d \n", err);
- goto bookerrexit;
- }
+ rc = gnc_book_begin (book, "file:/tmp/demo.gml", FALSE, FALSE);
+ if (!rc)
+ {
+ GNCBackendError err = gnc_book_get_error (book);
+ printf ("HTTP/1.1 500 Server Error\n");
+ printf ("\n");
+ printf ("err=%d \n", err);
+ goto bookerrexit;
+ }
- /* print the HTTP header */
- printf ("HTTP/1.1 200 OK\n");
- printf ("Content-Type: text/gnc-xml\r\n");
- // the current write interfaces don't give us a length :-(
- // printf ("Content-Length: %d\r\n", sz);
- printf ("\r\n");
+ rc = gnc_book_load (book);
+ if (!rc)
+ {
+ GNCBackendError err = gnc_book_get_error (book);
+ printf ("HTTP/1.1 500 Server Error\n");
+ printf ("\n");
+ printf ("err=%d \n", err);
+ goto bookerrexit;
+ }
- gnc_book_write_to_xml_filehandle_v2 (book, stdout);
+ /* print the HTTP header */
+ printf ("HTTP/1.1 200 OK\n");
+ printf ("Content-Type: text/gnc-xml\r\n");
+ // the current write interfaces don't give us a length :-(
+ // printf ("Content-Length: %d\r\n", sz);
+ printf ("\r\n");
+ gnc_book_write_to_xml_filehandle_v2 (book, stdout);
+
bookerrexit:
- /* close the book */
- qof_book_destroy (book);
+ /* close the book */
+ qof_book_destroy (book);
- /* shut down the engine */
- gnc_engine_shutdown ();
+ /* shut down the engine */
+ gnc_engine_shutdown ();
- return 0;
+ return 0;
}
Modified: gnucash/trunk/src/experimental/cgi-bin/hello2.c
===================================================================
--- gnucash/trunk/src/experimental/cgi-bin/hello2.c 2010-03-27 21:01:21 UTC (rev 18969)
+++ gnucash/trunk/src/experimental/cgi-bin/hello2.c 2010-03-27 21:01:56 UTC (rev 18970)
@@ -1,6 +1,6 @@
/*
* FILE:
- * hello2.c
+ * hello2.c
*
* FUNCTION:
* the second in a series of cgi-bin programming eamples.
@@ -13,103 +13,105 @@
#include "gnc-engine.h"
#include "io-gncxml.h"
#include "Query.h"
-
+
int
-main (int argc, char *argv[])
+main (int argc, char *argv[])
{
- int fake_argc =1;
- char * fake_argv[] = {"hello2", 0};
- QofBook *book;
- Account *root;
- Query *q, *qq;
- GList *split_list, *sl2, *node;
- Split *s;
- char *bufp;
- int i, ii, rc, sz;
-
+ int fake_argc = 1;
+ char * fake_argv[] = {"hello2", 0};
+ QofBook *book;
+ Account *root;
+ Query *q, *qq;
+ GList *split_list, *sl2, *node;
+ Split *s;
+ char *bufp;
+ int i, ii, rc, sz;
- /* intitialize the engine */
- gnc_engine_init (fake_argc, fake_argv);
- /* contact the database, which is a flat file for this demo */
- book = qof_book_new ();
+ /* intitialize the engine */
+ gnc_engine_init (fake_argc, fake_argv);
- rc = gnc_book_begin (book, "file:/tmp/demo.xac", FALSE);
- if (!rc) {
- int err = gnc_book_get_error (book);
- printf ("HTTP/1.1 500 Server Error\n");
- printf ("\n");
- printf ("%d %s\n", err, strerror (err));
- goto bookerrexit;
- }
+ /* contact the database, which is a flat file for this demo */
+ book = qof_book_new ();
- rc = gnc_book_load (book);
- if (!rc) {
- int err = gnc_book_get_error (book);
- printf ("HTTP/1.1 500 Server Error\n");
- printf ("\n");
- printf ("%d %s\n", err, strerror (err));
- goto bookerrexit;
- }
+ rc = gnc_book_begin (book, "file:/tmp/demo.xac", FALSE);
+ if (!rc)
+ {
+ int err = gnc_book_get_error (book);
+ printf ("HTTP/1.1 500 Server Error\n");
+ printf ("\n");
+ printf ("%d %s\n", err, strerror (err));
+ goto bookerrexit;
+ }
- /* the root pointer points to our local cache of the data */
- root = gnc_book_get_root_account (book);
-
- /* build a query */
- q = xaccMallocQuery ();
- xaccQuerySetGroup (q, root);
- xaccQuerySetMaxSplits (q, 30);
-
- /* Get everything between some random dates */
- /* In real life, we would use a query as specified by the user */
- xaccQueryAddDateMatch (q, TRUE, 28, 2, 1982,
- FALSE, 16, 10, 2010,
- QUERY_OR);
+ rc = gnc_book_load (book);
+ if (!rc)
+ {
+ int err = gnc_book_get_error (book);
+ printf ("HTTP/1.1 500 Server Error\n");
+ printf ("\n");
+ printf ("%d %s\n", err, strerror (err));
+ goto bookerrexit;
+ }
- split_list = xaccQueryGetSplits (q);
+ /* the root pointer points to our local cache of the data */
+ root = gnc_book_get_root_account (book);
- /* count number of splits */
- i = 0;
- for (node = split_list; node; node = node->next)
- {
- s = node->data;
- i++;
- }
-
- gncxml_write_query_to_buf(q, &bufp, &sz);
- qq = gncxml_read_query (bufp, sz);
- xaccQuerySetMaxSplits (qq, 30);
- xaccQuerySetGroup (qq, root);
- sl2 = xaccQueryGetSplits (qq);
+ /* build a query */
+ q = xaccMallocQuery ();
+ xaccQuerySetGroup (q, root);
+ xaccQuerySetMaxSplits (q, 30);
- /* count number of splits */
- ii = 0;
- for (node = sl2; node; node = node->next)
- {
- s = node->data;
- ii++;
- }
-
- /* print the HTTP header */
- printf ("HTTP/1.1 200 OK\n");
- printf ("Content-Type: text/xml\n");
- printf ("Content-Length: %d\n", sz);
- printf ("\n");
+ /* Get everything between some random dates */
+ /* In real life, we would use a query as specified by the user */
+ xaccQueryAddDateMatch (q, TRUE, 28, 2, 1982,
+ FALSE, 16, 10, 2010,
+ QUERY_OR);
- printf ("%s", bufp);
+ split_list = xaccQueryGetSplits (q);
- printf (" its %d and %d \n", i, ii);
+ /* count number of splits */
+ i = 0;
+ for (node = split_list; node; node = node->next)
+ {
+ s = node->data;
+ i++;
+ }
- free (bufp);
- xaccFreeQuery (q);
+ gncxml_write_query_to_buf(q, &bufp, &sz);
+ qq = gncxml_read_query (bufp, sz);
+ xaccQuerySetMaxSplits (qq, 30);
+ xaccQuerySetGroup (qq, root);
+ sl2 = xaccQueryGetSplits (qq);
+ /* count number of splits */
+ ii = 0;
+ for (node = sl2; node; node = node->next)
+ {
+ s = node->data;
+ ii++;
+ }
+ /* print the HTTP header */
+ printf ("HTTP/1.1 200 OK\n");
+ printf ("Content-Type: text/xml\n");
+ printf ("Content-Length: %d\n", sz);
+ printf ("\n");
+
+ printf ("%s", bufp);
+
+ printf (" its %d and %d \n", i, ii);
+
+ free (bufp);
+ xaccFreeQuery (q);
+
+
bookerrexit:
- /* close the book */
- qof_book_destroy (book);
+ /* close the book */
+ qof_book_destroy (book);
- /* shut down the engine */
- gnc_engine_shutdown ();
+ /* shut down the engine */
+ gnc_engine_shutdown ();
- return 0;
+ return 0;
}
Modified: gnucash/trunk/src/experimental/cgi-bin/hello3.c
===================================================================
--- gnucash/trunk/src/experimental/cgi-bin/hello3.c 2010-03-27 21:01:21 UTC (rev 18969)
+++ gnucash/trunk/src/experimental/cgi-bin/hello3.c 2010-03-27 21:01:56 UTC (rev 18970)
@@ -5,7 +5,7 @@
* FUNCTION:
* experimental gnucash server
* written as a demo, not real code.
- * this file is here mostly as a simple intro to what
+ * this file is here mostly as a simple intro to what
* the server is doing.
*/
@@ -16,120 +16,120 @@
#include "gnc-engine.h"
#include "io-gncxml.h"
-
+
#include <fcgi_stdio.h>
int
-main (int argc, char *argv[])
+main (int argc, char *argv[])
{
- int err, fake_argc =1;
- char * fake_argv[] = {"hello", 0};
- QofBook *book;
- Account *root;
- char *bufp;
- int rc, sz;
-
- /* intitialize the engine */
- gnc_engine_init (fake_argc, fake_argv);
+ int err, fake_argc = 1;
+ char * fake_argv[] = {"hello", 0};
+ QofBook *book;
+ Account *root;
+ char *bufp;
+ int rc, sz;
- /* contact the database, which is a flat file for this demo */
- book = qof_book_new ();
+ /* intitialize the engine */
+ gnc_engine_init (fake_argc, fake_argv);
- rc = gnc_book_begin (book, "file:/tmp/demo.xac", FALSE);
- if (!rc) goto bookerrexit;
+ /* contact the database, which is a flat file for this demo */
+ book = qof_book_new ();
- rc = gnc_book_load (book);
- if (!rc) goto bookerrexit;
+ rc = gnc_book_begin (book, "file:/tmp/demo.xac", FALSE);
+ if (!rc) goto bookerrexit;
- /* the root pointer points to our local cache of the data */
- root = gnc_book_get_root_account (book);
-
- /* --------------------------------------------------- */
- /* done with initialization, go into event loop */
+ rc = gnc_book_load (book);
+ if (!rc) goto bookerrexit;
- while(FCGI_Accept() >= 0)
- {
- GList *split_list;
- Query *q = NULL;
- char *request_method;
- int read_len=0;
+ /* the root pointer points to our local cache of the data */
+ root = gnc_book_get_root_account (book);
- /* get the request method */
- request_method = getenv ("REQUEST_METHOD");
+ /* --------------------------------------------------- */
+ /* done with initialization, go into event loop */
- /* Lets pretend that method=get means user has logged
- * in. Send the user the accounts and currencies,
- * but not the transactions/splits. */
- if (!strcmp ("GET", request_method))
- {
- gncxml_write_account_tree_to_buf(root, &bufp, &sz);
+ while (FCGI_Accept() >= 0)
+ {
+ GList *split_list;
+ Query *q = NULL;
+ char *request_method;
+ int read_len = 0;
- /* print the HTTP header */
- printf("Content-type: text/gnc-xml\r\n"
- "Content-Length: %d\r\n"
- "\r\n", sz);
-
- /* send the xml to the client */
- printf ("%s", bufp);
- free (bufp);
+ /* get the request method */
+ request_method = getenv ("REQUEST_METHOD");
- /* wait for the next request */
- continue;
- }
+ /* Lets pretend that method=get means user has logged
+ * in. Send the user the accounts and currencies,
+ * but not the transactions/splits. */
+ if (!strcmp ("GET", request_method))
+ {
+ gncxml_write_account_tree_to_buf(root, &bufp, &sz);
+ /* print the HTTP header */
+ printf("Content-type: text/gnc-xml\r\n"
+ "Content-Length: %d\r\n"
+ "\r\n", sz);
- if (!strcmp ("POST", request_method))
- {
- char * content_length = getenv("CONTENT_LENGTH");
- read_len = atoi (content_length);
+ /* send the xml to the client */
+ printf ("%s", bufp);
+ free (bufp);
- /* read 'read_len' bytes from stdin ... */
- bufp = (char *) malloc (read_len);
- fread (bufp, read_len, 1, stdin);
+ /* wait for the next request */
+ continue;
+ }
- /* conver the xml input into a gnucash query structure... */
- q = gncxml_read_query (bufp, read_len);
- xaccQuerySetGroup (q, root);
- /* hack -- limit to 30 splits ... */
- xaccQuerySetMaxSplits (q, 30);
- split_list = xaccQueryGetSplits (q);
+ if (!strcmp ("POST", request_method))
+ {
+ char * content_length = getenv("CONTENT_LENGTH");
+ read_len = atoi (content_length);
- xaccFreeQuery (q);
+ /* read 'read_len' bytes from stdin ... */
+ bufp = (char *) malloc (read_len);
+ fread (bufp, read_len, 1, stdin);
- /* wait for the next request */
- continue;
- }
+ /* conver the xml input into a gnucash query structure... */
+ q = gncxml_read_query (bufp, read_len);
+ xaccQuerySetGroup (q, root);
- /* if we got to here, an error -- unknown method */
- printf("Content-type: text/plain\r\n"
- "\r\n"
- "unknown request type \n");
-
+ /* hack -- limit to 30 splits ... */
+ xaccQuerySetMaxSplits (q, 30);
+ split_list = xaccQueryGetSplits (q);
- }
+ xaccFreeQuery (q);
+ /* wait for the next request */
+ continue;
+ }
+
+ /* if we got to here, an error -- unknown method */
+ printf("Content-type: text/plain\r\n"
+ "\r\n"
+ "unknown request type \n");
+
+
+ }
+
bookerrexit:
- err = gnc_book_get_error (book);
+ err = gnc_book_get_error (book);
- /* 500 Server Error */
- FCGI_SetExitStatus (500);
+ /* 500 Server Error */
+ FCGI_SetExitStatus (500);
- printf("Content-type: text/plain\r\n\r\n"
- "error was %s\n", strerror (err));
+ printf("Content-type: text/plain\r\n\r\n"
+ "error was %s\n", strerror (err));
- FCGI_Finish();
+ FCGI_Finish();
- /* close the book */
- qof_book_destroy (book);
+ /* close the book */
+ qof_book_destroy (book);
- /* shut down the engine */
- gnc_engine_shutdown ();
+ /* shut down the engine */
+ gnc_engine_shutdown ();
- sleep (1);
+ sleep (1);
- return 0;
+ return 0;
}
Modified: gnucash/trunk/src/gnome/gnc-plugin-page-account-tree.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-plugin-page-account-tree.c 2010-03-27 21:01:21 UTC (rev 18969)
+++ gnucash/trunk/src/gnome/gnc-plugin-page-account-tree.c 2010-03-27 21:01:56 UTC (rev 18970)
@@ -960,7 +960,8 @@
/* If the account has objects referring to it, show the list - the account can't be deleted until these
references are dealt with. */
list = qof_instance_get_referring_object_list(QOF_INSTANCE(account));
- if (list != NULL) {
+ if (list != NULL)
+ {
#define EXPLANATION "The list below shows objects which make use of the account which you want to delete.\nBefore you can delete it, you must either delete those objects or else modify them so they make use\nof another account"
gnc_ui_object_references_show( _(EXPLANATION), list);
Modified: gnucash/trunk/src/gnome/top-level.c
===================================================================
--- gnucash/trunk/src/gnome/top-level.c 2010-03-27 21:01:21 UTC (rev 18969)
+++ gnucash/trunk/src/gnome/top-level.c 2010-03-27 21:01:56 UTC (rev 18970)
@@ -96,8 +96,8 @@
location); \
return FALSE; \
} \
+
-
static gboolean
gnc_html_register_url_cb (const char *location, const char *label,
gboolean new_window, GNCURLResult *result)
Modified: gnucash/trunk/src/gnome/window-autoclear.c
===================================================================
--- gnucash/trunk/src/gnome/window-autoclear.c 2010-03-27 21:01:21 UTC (rev 18969)
+++ gnucash/trunk/src/gnome/window-autoclear.c 2010-03-27 21:01:56 UTC (rev 18970)
@@ -108,18 +108,18 @@
typedef struct _sack_foreach_data_t
{
- gnc_numeric split_value;
- GList *reachable_list;
+ gnc_numeric split_value;
+ GList *reachable_list;
} *sack_foreach_data_t;
static void sack_foreach_func(gpointer key, gpointer value, gpointer user_data)
{
- sack_foreach_data_t data = (sack_foreach_data_t)user_data;
- gnc_numeric thisvalue = *(gnc_numeric *)key;
+ sack_foreach_data_t data = (sack_foreach_data_t)user_data;
+ gnc_numeric thisvalue = *(gnc_numeric *)key;
- gnc_numeric reachable_value = gnc_numeric_add_fixed(thisvalue, data->split_value);
- data->reachable_list = g_list_append(data->reachable_list, g_memdup(&reachable_value, sizeof(gnc_numeric)));
- printf(" Sack: found %s, added %s\n", gnc_numeric_to_string(thisvalue), gnc_numeric_to_string(reachable_value));
+ gnc_numeric reachable_value = gnc_numeric_add_fixed(thisvalue, data->split_value);
+ data->reachable_list = g_list_append(data->reachable_list, g_memdup(&reachable_value, sizeof(gnc_numeric)));
+ printf(" Sack: found %s, added %s\n", gnc_numeric_to_string(thisvalue), gnc_numeric_to_string(reachable_value));
}
static void
Modified: gnucash/trunk/src/gnome-search/gnc-general-search.c
===================================================================
--- gnucash/trunk/src/gnome-search/gnc-general-search.c 2010-03-27 21:01:21 UTC (rev 18969)
+++ gnucash/trunk/src/gnome-search/gnc-general-search.c 2010-03-27 21:01:56 UTC (rev 18970)
@@ -538,7 +538,7 @@
{
const QofParam *get_guid = priv->get_guid;
priv->guid = * ((GncGUID *)(get_guid->param_getfcn
- (gsl->selected_item, get_guid)));
+ (gsl->selected_item, get_guid)));
gnc_gui_component_watch_entity
(priv->component_id, &(priv->guid),
QOF_EVENT_MODIFY | QOF_EVENT_DESTROY);
Modified: gnucash/trunk/src/gnome-utils/dialog-file-access.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-file-access.c 2010-03-27 21:01:21 UTC (rev 18969)
+++ gnucash/trunk/src/gnome-utils/dialog-file-access.c 2010-03-27 21:01:56 UTC (rev 18970)
@@ -59,7 +59,7 @@
} FileAccessWindow;
void gnc_ui_file_access_file_activated_cb( GtkFileChooser *chooser,
- FileAccessWindow *faw );
+ FileAccessWindow *faw );
void gnc_ui_file_access_response_cb( GtkDialog *, gint, GtkDialog * );
static void cb_uri_type_changed_cb( GtkComboBox* cb );
Modified: gnucash/trunk/src/gnome-utils/dialog-object-references.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-object-references.c 2010-03-27 21:01:21 UTC (rev 18969)
+++ gnucash/trunk/src/gnome-utils/dialog-object-references.c 2010-03-27 21:01:56 UTC (rev 18970)
@@ -60,7 +60,7 @@
/* Set up the list store */
store = gtk_list_store_new( 1, G_TYPE_STRING );
- for( node = objlist; node != NULL; node = node->next )
+ for ( node = objlist; node != NULL; node = node->next )
{
QofInstance* inst = node->data;
GtkTreeIter iter;
Modified: gnucash/trunk/src/gnome-utils/gnc-keyring.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-keyring.c 2010-03-27 21:01:21 UTC (rev 18969)
+++ gnucash/trunk/src/gnome-utils/gnc-keyring.c 2010-03-27 21:01:56 UTC (rev 18970)
@@ -49,13 +49,13 @@
guint32 *item_id = NULL;
gkr_result = gnome_keyring_set_network_password_sync
- (NULL, user, NULL, server, service,
- access_method, NULL, port, password, item_id);
+ (NULL, user, NULL, server, service,
+ access_method, NULL, port, password, item_id);
if (gkr_result != GNOME_KEYRING_RESULT_OK)
{
PWARN ("Gnome-keyring error: %s",
- gnome_keyring_result_to_message(gkr_result));
+ gnome_keyring_result_to_message(gkr_result));
PWARN ("The user will be prompted for a password again next time.");
}
#endif /* HAVE_GNOME_KEYRING */
@@ -74,15 +74,15 @@
// update function instead
g_set_application_name(PACKAGE);
status = SecKeychainAddInternetPassword ( NULL, /* keychain */
- strlen(server), server, /* servername */
- strlen(access_method), access_method,/* securitydomain */
- strlen(*user), *user, /* acountname */
- strlen(service), service, /* path */
- port, /* port */
- kSecProtocolTypeAny, /* protocol */
- kSecAuthenticationTypeDefault, /* auth type */
- strlen(password), password, /* passworddata */
- SecKeychainItemRef *itemRef );
+ strlen(server), server, /* servername */
+ strlen(access_method), access_method,/* securitydomain */
+ strlen(*user), *user, /* acountname */
+ strlen(service), service, /* path */
+ port, /* port */
+ kSecProtocolTypeAny, /* protocol */
+ kSecAuthenticationTypeDefault, /* auth type */
+ strlen(password), password, /* passworddata */
+ SecKeychainItemRef * itemRef );
if ( status != noErr )
{
@@ -129,8 +129,8 @@
#ifdef HAVE_GNOME_KEYRING
g_set_application_name(PACKAGE);
gkr_result = gnome_keyring_find_network_password_sync
- ( *user, NULL, server, service,
- access_method, NULL, port, &found_list );
+ ( *user, NULL, server, service,
+ access_method, NULL, port, &found_list );
if (gkr_result == GNOME_KEYRING_RESULT_OK)
{
@@ -141,7 +141,7 @@
}
else
PWARN ("Gnome-keyring access failed: %s.",
- gnome_keyring_result_to_message(gkr_result));
+ gnome_keyring_result_to_message(gkr_result));
gnome_keyring_network_password_list_free(found_list);
#endif /* HAVE_GNOME_KEYRING */
@@ -157,15 +157,15 @@
* distinguish between these two.
*/
status = SecKeychainFindInternetPassword( NULL,
- strlen(server), server,
- strlen(access_method), access_method,
- strlen(*user), *user,
- strlen(service), service,
- port,
- kSecProtocolTypeAny,
- kSecAuthenticationTypeDefault,
- &password_length, &password_data,
- NULL);
+ strlen(server), server,
+ strlen(access_method), access_method,
+ strlen(*user), *user,
+ strlen(service), service,
+ port,
+ kSecProtocolTypeAny,
+ kSecAuthenticationTypeDefault,
+ &password_length, &password_data,
+ NULL);
if ( status == noErr )
{
@@ -195,17 +195,17 @@
gchar *db_path, *heading;
if ( port == 0 )
- db_path=g_strdup_printf ( "%s://%s/%s", access_method, server, service );
+ db_path = g_strdup_printf ( "%s://%s/%s", access_method, server, service );
else
- db_path=g_strdup_printf ( "%s://%s:%d/%s", access_method, server, port, service );
+ db_path = g_strdup_printf ( "%s://%s:%d/%s", access_method, server, port, service );
heading = g_strdup_printf ( /* Translators: %s is a path to a database or any other url,
like mysql://user@server.somewhere/somedb, http://www.somequotes.com/thequotes */
- _("Enter a user name and password to connect to: %s"),
- db_path );
+ _("Enter a user name and password to connect to: %s"),
+ db_path );
password_found = gnc_get_username_password ( parent, heading,
- *user, NULL,
- user, password );
+ *user, NULL,
+ user, password );
g_free ( db_path );
g_free ( heading );
Modified: gnucash/trunk/src/import-export/csv/gnc-csv-import.c
===================================================================
--- gnucash/trunk/src/import-export/csv/gnc-csv-import.c 2010-03-27 21:01:21 UTC (rev 18969)
+++ gnucash/trunk/src/import-export/csv/gnc-csv-import.c 2010-03-27 21:01:56 UTC (rev 18970)
@@ -330,7 +330,7 @@
* @param preview The display of the data being imported
*/
static void column_type_changed(GtkCellRenderer* renderer, gchar* path,
- GtkTreeIter* new_text_iter, GncCsvPreview* preview)
+ GtkTreeIter* new_text_iter, GncCsvPreview* preview)
{
/* ncols is the number of columns in the data. */
int i, ncols = preview->parse_data->column_types->len;
Modified: gnucash/trunk/src/libqof/qof/qofinstance.c
===================================================================
--- gnucash/trunk/src/libqof/qof/qofinstance.c 2010-03-27 21:01:21 UTC (rev 18969)
+++ gnucash/trunk/src/libqof/qof/qofinstance.c 2010-03-27 21:01:56 UTC (rev 18970)
@@ -923,13 +923,14 @@
else
{
/* Not implemented - return default string */
- return g_strdup_printf("Object %s %p",
- qof_collection_get_type(qof_instance_get_collection(inst)),
- inst);
+ return g_strdup_printf("Object %s %p",
+ qof_collection_get_type(qof_instance_get_collection(inst)),
+ inst);
}
}
-typedef struct {
+typedef struct
+{
const QofInstance* inst;
GList* list;
} GetReferringObjectHelperData;
@@ -972,8 +973,8 @@
data.list = NULL;
qof_book_foreach_collection(qof_instance_get_book(inst),
- get_referring_object_helper,
- &data);
+ get_referring_object_helper,
+ &data);
return data.list;
}
More information about the gnucash-changes
mailing list