r20936 - gnucash/trunk/src/engine - Formatting Fixes with astyle --indent=spaces=4 --brackets=break --pad-oper --pad-header --suffix=none
John Ralls
jralls at code.gnucash.org
Sun Jul 17 13:35:30 EDT 2011
Author: jralls
Date: 2011-07-17 13:35:30 -0400 (Sun, 17 Jul 2011)
New Revision: 20936
Trac: http://svn.gnucash.org/trac/changeset/20936
Modified:
gnucash/trunk/src/engine/Recurrence.c
gnucash/trunk/src/engine/Scrub.c
gnucash/trunk/src/engine/TransLog.c
gnucash/trunk/src/engine/Transaction.c
gnucash/trunk/src/engine/engine-helpers.c
gnucash/trunk/src/engine/glib-helpers.c
gnucash/trunk/src/engine/gncOwner.c
gnucash/trunk/src/engine/kvp-scm.c
Log:
Formatting Fixes with astyle --indent=spaces=4 --brackets=break --pad-oper --pad-header --suffix=none
Modified: gnucash/trunk/src/engine/Recurrence.c
===================================================================
--- gnucash/trunk/src/engine/Recurrence.c 2011-07-17 17:35:20 UTC (rev 20935)
+++ gnucash/trunk/src/engine/Recurrence.c 2011-07-17 17:35:30 UTC (rev 20936)
@@ -274,7 +274,7 @@
((pt == PERIOD_MONTH || pt == PERIOD_YEAR) &&
g_date_get_day(next) >= g_date_get_day(start)) ||
((pt == PERIOD_NTH_WEEKDAY || pt == PERIOD_LAST_WEEKDAY) &&
- nth_weekday_compare(start, next, pt) <= 0) )
+ nth_weekday_compare(start, next, pt) <= 0) )
g_date_add_months(next, mult);
else
/* one fewer month fwd because of the occurrence in this month */
Modified: gnucash/trunk/src/engine/Scrub.c
===================================================================
--- gnucash/trunk/src/engine/Scrub.c 2011-07-17 17:35:20 UTC (rev 20935)
+++ gnucash/trunk/src/engine/Scrub.c 2011-07-17 17:35:30 UTC (rev 20936)
@@ -934,7 +934,7 @@
}
else if (!gnc_commodity_equiv (retval, trans->common_currency))
{
- char guid_str[GUID_ENCODING_LENGTH+1];
+ char guid_str[GUID_ENCODING_LENGTH + 1];
guid_to_string_buff(xaccTransGetGUID(trans), guid_str);
PWARN ("expected common currency %s but found %s in txn %s\n",
gnc_commodity_get_unique_name (trans->common_currency),
@@ -945,7 +945,7 @@
{
/* In every situation I can think of, this routine should return
* common currency. So make note of this ... */
- char guid_str[GUID_ENCODING_LENGTH+1];
+ char guid_str[GUID_ENCODING_LENGTH + 1];
guid_to_string_buff(xaccTransGetGUID(trans), guid_str);
PWARN ("unable to find a common currency in txn %s, and that is strange.",
guid_str);
@@ -1087,7 +1087,7 @@
else
{
SplitList *node;
- char guid_str[GUID_ENCODING_LENGTH+1];
+ char guid_str[GUID_ENCODING_LENGTH + 1];
guid_to_string_buff(xaccTransGetGUID(trans), guid_str);
PWARN ("no common transaction currency found for trans=\"%s\" (%s)",
trans->description, guid_str);
Modified: gnucash/trunk/src/engine/TransLog.c
===================================================================
--- gnucash/trunk/src/engine/TransLog.c 2011-07-17 17:35:20 UTC (rev 20935)
+++ gnucash/trunk/src/engine/TransLog.c 2011-07-17 17:35:30 UTC (rev 20936)
@@ -215,8 +215,8 @@
xaccTransWriteLog (Transaction *trans, char flag)
{
GList *node;
- char trans_guid_str[GUID_ENCODING_LENGTH+1];
- char split_guid_str[GUID_ENCODING_LENGTH+1];
+ char trans_guid_str[GUID_ENCODING_LENGTH + 1];
+ char split_guid_str[GUID_ENCODING_LENGTH + 1];
const char *trans_notes;
char dnow[100], dent[100], dpost[100], drecn[100];
Timespec ts;
@@ -241,7 +241,7 @@
{
Split *split = node->data;
const char * accname = "";
- char acc_guid_str[GUID_ENCODING_LENGTH+1];
+ char acc_guid_str[GUID_ENCODING_LENGTH + 1];
gnc_numeric amt, val;
if (xaccSplitGetAccount(split))
Modified: gnucash/trunk/src/engine/Transaction.c
===================================================================
--- gnucash/trunk/src/engine/Transaction.c 2011-07-17 17:35:20 UTC (rev 20935)
+++ gnucash/trunk/src/engine/Transaction.c 2011-07-17 17:35:30 UTC (rev 20936)
@@ -799,8 +799,8 @@
if (!xaccSplitEqual (split_a, split_b, check_guids, check_balances,
FALSE))
{
- char str_a[GUID_ENCODING_LENGTH+1];
- char str_b[GUID_ENCODING_LENGTH+1];
+ char str_a[GUID_ENCODING_LENGTH + 1];
+ char str_b[GUID_ENCODING_LENGTH + 1];
guid_to_string_buff (xaccSplitGetGUID (split_a), str_a);
guid_to_string_buff (xaccSplitGetGUID (split_b), str_b);
@@ -909,12 +909,12 @@
imbal_value);
}
imbal_list = gnc_monetary_list_add_value(imbal_list, commodity,
- xaccSplitGetAmount(s));
+ xaccSplitGetAmount(s));
}
/* Add it to the value accumulator in case we need it. */
imbal_value = gnc_numeric_add(imbal_value, xaccSplitGetValue(s),
- GNC_DENOM_AUTO, GNC_HOW_DENOM_EXACT);
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_EXACT);
} );
@@ -2077,7 +2077,7 @@
KvpFrame *frame;
KvpValue *val;
Timespec now;
- char iso8601_str[ISO_DATELENGTH+1] = "";
+ char iso8601_str[ISO_DATELENGTH + 1] = "";
g_return_if_fail(trans && reason);
Modified: gnucash/trunk/src/engine/engine-helpers.c
===================================================================
--- gnucash/trunk/src/engine/engine-helpers.c 2011-07-17 17:35:20 UTC (rev 20935)
+++ gnucash/trunk/src/engine/engine-helpers.c 2011-07-17 17:35:30 UTC (rev 20936)
@@ -143,15 +143,15 @@
gchar * str;
if (!scm_is_string(guid_scm)
- || (GUID_ENCODING_LENGTH != scm_c_string_length (guid_scm)))
+ || (GUID_ENCODING_LENGTH != scm_c_string_length (guid_scm)))
{
return *guid_null();
}
- scm_dynwind_begin (0);
+ scm_dynwind_begin (0);
str = scm_to_locale_string (guid_scm);
string_to_guid(str, &guid);
- scm_dynwind_free (str);
- scm_dynwind_end ();
+ scm_dynwind_free (str);
+ scm_dynwind_end ();
return guid;
}
@@ -169,11 +169,11 @@
{
return FALSE;
}
- scm_dynwind_begin (0);
+ scm_dynwind_begin (0);
str = scm_to_locale_string (guid_scm);
return_int = string_to_guid(str, &guid);
- scm_dynwind_free (str);
- scm_dynwind_end ();
+ scm_dynwind_free (str);
+ scm_dynwind_end ();
return return_int;
}
@@ -515,11 +515,11 @@
if (!scm_is_string (key_scm))
break;
- scm_dynwind_begin (0);
- str = scm_to_locale_string(key_scm);
+ scm_dynwind_begin (0);
+ str = scm_to_locale_string(key_scm);
key = g_strdup (str);
- scm_dynwind_free (str);
- scm_dynwind_end ();
+ scm_dynwind_free (str);
+ scm_dynwind_end ();
path = g_slist_prepend (path, key);
@@ -688,11 +688,11 @@
case KVP_TYPE_STRING:
{
gchar * str;
- scm_dynwind_begin (0);
+ scm_dynwind_begin (0);
str = scm_to_locale_string (val_scm);
value = kvp_value_new_string (str);
- scm_dynwind_free (str);
- scm_dynwind_end ();
+ scm_dynwind_free (str);
+ scm_dynwind_end ();
break;
}
@@ -804,24 +804,24 @@
if (!scm_is_string (key_scm))
continue;
- scm_dynwind_begin (0);
+ scm_dynwind_begin (0);
key = scm_to_locale_string (key_scm);
if (!key)
{
- scm_dynwind_free (key);
- scm_dynwind_end ();
+ scm_dynwind_free (key);
+ scm_dynwind_end ();
continue;
}
value = gnc_scm2KvpValue (val_scm);
if (!value)
{
- scm_dynwind_free (key);
- scm_dynwind_end ();
+ scm_dynwind_free (key);
+ scm_dynwind_end ();
continue;
}
kvp_frame_set_slot_nc (frame, key, value);
- scm_dynwind_free (key);
- scm_dynwind_end ();
+ scm_dynwind_free (key);
+ scm_dynwind_end ();
}
return frame;
@@ -986,13 +986,13 @@
qt_scm = SCM_CDR (qt_scm);
if (!scm_is_string (scm)) break;
- scm_dynwind_begin (0);
+ scm_dynwind_begin (0);
matchstring = scm_to_locale_string (scm);
pd = qof_query_string_predicate (compare_how, matchstring,
options, is_regex);
- scm_dynwind_free (matchstring);
- scm_dynwind_end ();
+ scm_dynwind_free (matchstring);
+ scm_dynwind_end ();
}
else if (!safe_strcmp (type, QOF_TYPE_DATE))
{
@@ -1110,12 +1110,12 @@
qt_scm = SCM_CDR (qt_scm);
if (!scm_is_string (scm))
break;
- scm_dynwind_begin (0);
+ scm_dynwind_begin (0);
char_list = scm_to_locale_string (scm);
pd = qof_query_char_predicate (options, char_list);
- scm_dynwind_free (char_list);
- scm_dynwind_end ();
+ scm_dynwind_free (char_list);
+ scm_dynwind_end ();
}
else if (!safe_strcmp (type, QOF_TYPE_KVP))
{
@@ -1381,7 +1381,7 @@
scm = SCM_CAR (query_term_scm);
query_term_scm = SCM_CDR (query_term_scm);
- scm_dynwind_begin (0);
+ scm_dynwind_begin (0);
matchstring = scm_to_locale_string (scm);
if (!safe_strcmp (pr_type, "pr-action"))
@@ -1416,8 +1416,8 @@
{
PINFO ("Unknown string predicate: %s", pr_type);
}
- scm_dynwind_free (matchstring);
- scm_dynwind_end ();
+ scm_dynwind_free (matchstring);
+ scm_dynwind_end ();
}
else if (!safe_strcmp (pd_type, "pd-cleared"))
@@ -1470,11 +1470,11 @@
/* id type */
scm = SCM_CAR (query_term_scm);
query_term_scm = SCM_CDR (query_term_scm);
- scm_dynwind_begin (0);
+ scm_dynwind_begin (0);
str = scm_to_locale_string (scm);
id_type = g_strdup (str);
- scm_dynwind_free (str);
- scm_dynwind_end ();
+ scm_dynwind_free (str);
+ scm_dynwind_end ();
xaccQueryAddGUIDMatch (q, &guid, id_type, QOF_QUERY_OR);
g_free ((void *) id_type);
Modified: gnucash/trunk/src/engine/glib-helpers.c
===================================================================
--- gnucash/trunk/src/engine/glib-helpers.c 2011-07-17 17:35:20 UTC (rev 20935)
+++ gnucash/trunk/src/engine/glib-helpers.c 2011-07-17 17:35:30 UTC (rev 20936)
@@ -125,12 +125,12 @@
{
char * str;
- scm_dynwind_begin (0);
+ scm_dynwind_begin (0);
str = scm_to_locale_string (SCM_CAR(list));
if (str)
glist = g_list_prepend (glist, g_strdup (str));
- scm_dynwind_free (str);
- scm_dynwind_end ();
+ scm_dynwind_free (str);
+ scm_dynwind_end ();
}
list = SCM_CDR (list);
}
@@ -149,12 +149,12 @@
{
char * str;
- scm_dynwind_begin (0);
+ scm_dynwind_begin (0);
str = scm_to_locale_string (SCM_CAR(list));
if (str)
gslist = g_slist_prepend (gslist, g_strdup (str));
- scm_dynwind_free (str);
- scm_dynwind_end ();
+ scm_dynwind_free (str);
+ scm_dynwind_end ();
}
list = SCM_CDR (list);
}
Modified: gnucash/trunk/src/engine/gncOwner.c
===================================================================
--- gnucash/trunk/src/engine/gncOwner.c 2011-07-17 17:35:20 UTC (rev 20935)
+++ gnucash/trunk/src/engine/gncOwner.c 2011-07-17 17:35:30 UTC (rev 20936)
@@ -316,7 +316,7 @@
else
{
owner->type = GNC_OWNER_NONE;
- owner->owner.undefined=NULL;
+ owner->owner.undefined = NULL;
}
}
Modified: gnucash/trunk/src/engine/kvp-scm.c
===================================================================
--- gnucash/trunk/src/engine/kvp-scm.c 2011-07-17 17:35:20 UTC (rev 20935)
+++ gnucash/trunk/src/engine/kvp-scm.c 2011-07-17 17:35:30 UTC (rev 20936)
@@ -53,11 +53,11 @@
{
gchar *newstr;
KvpValue *ret;
- scm_dynwind_begin (0);
+ scm_dynwind_begin (0);
newstr = scm_to_locale_string (val);
ret = kvp_value_new_string(newstr);
- scm_dynwind_free (newstr);
- scm_dynwind_end ();
+ scm_dynwind_free (newstr);
+ scm_dynwind_end ();
return ret;
}
else if (SWIG_IsPointerOfType(val, SWIG_TypeQuery("_p_KvpFrame")))
More information about the gnucash-changes
mailing list