IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Save GUIDs instead of assuming the pointer will stick around

Browse Source 
work around a gcc compiler bug: unroll a do { } while() that
does not need to exist.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@6930 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Derek Atkins 2002-06-01 01:59:36 +00:00
parent 719060454a
commit 329736d2c3
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/engine/QueryCore.c
View File

@ -134,26 +134,19 @@ static int string_match_predicate (gpointer object, QueryAccess get_fcn,
s = ((query_string_getter)get_fcn) (object);
do {
if (pdata->is_regex) {
regmatch_t match;
if (!regexec (&pdata->compiled, s, 1, &match, 0))
ret = 1;
break;
}
if (pdata->options == STRING_MATCH_CASEINSENSITIVE) {
if (strcasestr (s, pdata->matchstring))
ret = 1;
break;
}
if (strstr (s, pdata->matchstring))
if (pdata->is_regex) {
regmatch_t match;
if (!regexec (&pdata->compiled, s, 1, &match, 0))
ret = 1;
} while (FALSE);
} else if (pdata->options == STRING_MATCH_CASEINSENSITIVE) {
if (strcasestr (s, pdata->matchstring))
ret = 1;
} else {
if (strstr (s, pdata->matchstring))
ret = 1;
}
switch (pd->how) {
case COMPARE_EQUAL:
@ -527,7 +520,10 @@ static int guid_match_predicate (gpointer object, QueryAccess get_fcn,
static void guid_free_pdata (QueryPredData_t pd)
{
query_guid_t pdata = (query_guid_t)pd;
GList *node;
VERIFY_PDATA (query_guid_type);
for (node = pdata->guids; node; node = node->next)
xaccGUIDFree (node->data);
g_list_free (pdata->guids);
g_free (pdata);
}
@ -542,11 +538,17 @@ static QueryPredData_t guid_copy_predicate (QueryPredData_t pd)
QueryPredData_t gncQueryGUIDPredicate (guid_match_t options, GList *guids)
{
query_guid_t pdata;
GList *node;
pdata = g_new0 (query_guid_def, 1);
pdata->pd.type_name = query_guid_type;
pdata->options = options;
pdata->guids = g_list_copy (guids);
for (node = pdata->guids; node; node = node->next) {
GUID *guid = xaccGUIDMalloc ();
*guid = *((GUID *)node->data);
node->data = guid;
}
return ((QueryPredData_t)pdata);
}