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

signature change

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@1317 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Linas Vepstas 1998-10-18 17:04:46 +00:00
parent c2a72415ad
commit 893f6bb8f4
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/engine/Group.c
View File

@ -335,7 +335,9 @@ xaccRemoveAccount (Account *acc)
arr[i] = arr[j]; arr[i] = arr[j];
if( acc == arr[j] ) { i--; } if( acc == arr[j] ) { i--; }
} }
arr[grp->numAcc] = NULL;
} else { } else {
arr[grp->numAcc] = NULL;
grp->account = NULL; grp->account = NULL;
/* if this was the last account in a group, delete /* if this was the last account in a group, delete
@ -345,17 +347,14 @@ xaccRemoveAccount (Account *acc)
xaccFreeAccountGroup (grp); xaccFreeAccountGroup (grp);
} }
} }
arr[grp->numAcc] = NULL;
} }
/********************************************************************\ /********************************************************************\
\********************************************************************/ \********************************************************************/
int void
xaccInsertSubAccount( Account *adult, Account *child ) xaccInsertSubAccount( Account *adult, Account *child )
{ {
int retval; if (NULL == adult) return;
if (NULL == adult) return -1;
/* if a container for the children doesn't yet exist, add it */ /* if a container for the children doesn't yet exist, add it */
if (NULL == adult->children) { if (NULL == adult->children) {
@ -366,42 +365,47 @@ xaccInsertSubAccount( Account *adult, Account *child )
adult->children->parent = adult; adult->children->parent = adult;
/* allow side-effect of creating a child-less account group */ /* allow side-effect of creating a child-less account group */
if (NULL == child) return -1; if (NULL == child) return;
retval = xaccGroupInsertAccount (adult->children, child); xaccGroupInsertAccount (adult->children, child);
return retval;
} }
/********************************************************************\ /********************************************************************\
\********************************************************************/ \********************************************************************/
int
void
xaccGroupInsertAccount( AccountGroup *grp, Account *acc ) xaccGroupInsertAccount( AccountGroup *grp, Account *acc )
{ {
int i=-1; int i=-1;
Account **oldAcc; Account **arr;
if (NULL == grp) return -1; if (NULL == grp) return;
if (NULL == acc) return -1; if (NULL == acc) return;
/* If the account is currently in another group, remove it there first.
* Basically, we can't have accounts being in two places at once. */
if (acc->parent) {
xaccRemoveAccount (acc);
}
/* set back-pointer to the accounts parent */ /* set back-pointer to the accounts parent */
acc->parent = grp; acc->parent = grp;
oldAcc = grp->account; arr = grp->account;
grp->saved = FALSE; grp->saved = FALSE;
grp->account = (Account **)_malloc(((grp->numAcc)+2)*sizeof(Account *)); grp->account = (Account **)_malloc(((grp->numAcc)+2)*sizeof(Account *));
for( i=0; i<(grp->numAcc); i++ ) { for( i=0; i<(grp->numAcc); i++ ) {
grp->account[i] = oldAcc[i]; grp->account[i] = arr[i];
} }
_free(oldAcc); _free(arr);
grp->account[(grp->numAcc)] = acc; grp->account[(grp->numAcc)] = acc;
grp->numAcc++; grp->numAcc++;
grp->account[(grp->numAcc)] = NULL; grp->account[(grp->numAcc)] = NULL;
return i;
} }
/********************************************************************\ /********************************************************************\

4
src/engine/Group.h
View File

@ -74,8 +74,8 @@ void xaccAccountGroupMarkSaved (AccountGroup *grp);
*/ */
void xaccRemoveAccount (Account *); void xaccRemoveAccount (Account *);
void xaccRemoveGroup (AccountGroup *); void xaccRemoveGroup (AccountGroup *);
int xaccGroupInsertAccount( AccountGroup *grp, Account *acc ); void xaccGroupInsertAccount( AccountGroup *grp, Account *acc );
int xaccInsertSubAccount( Account *parent, Account *child ); void xaccInsertSubAccount( Account *parent, Account *child );
/* /*
* The xaccGetNumAccounts() subroutine returns the number * The xaccGetNumAccounts() subroutine returns the number