r15061 - gnucash/trunk/src - [Part 2] Audit all .scm files for cases where null objects were assumed
Chris Shoemaker
chris at cvs.gnucash.org
Sat Oct 28 23:39:40 EDT 2006
Author: chris
Date: 2006-10-28 23:39:39 -0400 (Sat, 28 Oct 2006)
New Revision: 15061
Trac: http://svn.gnucash.org/trac/changeset/15061
Modified:
gnucash/trunk/src/engine/engine-interface.scm
gnucash/trunk/src/import-export/qif-import/qif-dialog-utils.scm
gnucash/trunk/src/import-export/qif-import/qif-file.scm
gnucash/trunk/src/import-export/qif-io-core/qif-acct-table.scm
gnucash/trunk/src/import-export/qif-io-core/qif-bank-xtn-import.scm
gnucash/trunk/src/import-export/qif-io-core/qif-invst-xtn-import.scm
gnucash/trunk/src/report/standard-reports/budget.scm
gnucash/trunk/src/report/standard-reports/cash-flow.scm
gnucash/trunk/src/report/standard-reports/transaction.scm
Log:
[Part 2] Audit all .scm files for cases where null objects were assumed
to be #f. (It helps to save all buffers before the commit.)
Modified: gnucash/trunk/src/engine/engine-interface.scm
===================================================================
--- gnucash/trunk/src/engine/engine-interface.scm 2006-10-29 03:12:49 UTC (rev 15060)
+++ gnucash/trunk/src/engine/engine-interface.scm 2006-10-29 03:39:39 UTC (rev 15061)
@@ -242,7 +242,7 @@
;; used to use alternate account guids when creating splits.
(define (gnc:transaction-scm-onto-transaction trans-scm trans guid-mapping
commit? book)
- (if (not trans)
+ (if (null? trans)
#f
(begin
;; open the transaction for editing
Modified: gnucash/trunk/src/import-export/qif-import/qif-dialog-utils.scm
===================================================================
--- gnucash/trunk/src/import-export/qif-import/qif-dialog-utils.scm 2006-10-29 03:12:49 UTC (rev 15060)
+++ gnucash/trunk/src/import-export/qif-import/qif-dialog-utils.scm 2006-10-29 03:39:39 UTC (rev 15061)
@@ -612,7 +612,7 @@
(book (xaccGroupGetBook (gnc-get-current-group)))
(existing-type
(xaccAccountGetType existing-gnc-acct)))
- (if (and existing-gnc-acct
+ (if (and (not (null? existing-gnc-acct))
(memv existing-type (list GNC-STOCK-TYPE
GNC-MUTUAL-TYPE)))
;; gnc account already exists... we *know* what the
Modified: gnucash/trunk/src/import-export/qif-import/qif-file.scm
===================================================================
--- gnucash/trunk/src/import-export/qif-import/qif-file.scm 2006-10-29 03:12:49 UTC (rev 15060)
+++ gnucash/trunk/src/import-export/qif-import/qif-file.scm 2006-10-29 03:39:39 UTC (rev 15061)
@@ -386,7 +386,7 @@
(set! heinous-error #t))))))
;; update the progress bar for each line read
- (if progress-dialog
+ (if (not (null? progress-dialog))
(begin
(gnc-progress-dialog-set-value
progress-dialog (/ bytes-read file-size))
@@ -405,7 +405,7 @@
;; they were in the file. This is important in a few cases.
(qif-file:set-xtns! self (reverse (qif-file:xtns self)))
- (if progress-dialog
+ (if (not (null? progress-dialog))
(gnc-progress-dialog-destroy progress-dialog))
return-val)))
Modified: gnucash/trunk/src/import-export/qif-io-core/qif-acct-table.scm
===================================================================
--- gnucash/trunk/src/import-export/qif-io-core/qif-acct-table.scm 2006-10-29 03:12:49 UTC (rev 15060)
+++ gnucash/trunk/src/import-export/qif-io-core/qif-acct-table.scm 2006-10-29 03:39:39 UTC (rev 15061)
@@ -108,7 +108,7 @@
(hash-fold
(lambda (name acct p)
(let ((cmdty (xaccAccountGetCommodity acct)))
- (if (not cmdty)
+ (if (null? cmdty)
(begin
(xaccAccountBeginEdit acct)
(xaccAccountSetCommodity acct commodity)
Modified: gnucash/trunk/src/import-export/qif-io-core/qif-bank-xtn-import.scm
===================================================================
--- gnucash/trunk/src/import-export/qif-io-core/qif-bank-xtn-import.scm 2006-10-29 03:12:49 UTC (rev 15060)
+++ gnucash/trunk/src/import-export/qif-io-core/qif-bank-xtn-import.scm 2006-10-29 03:39:39 UTC (rev 15061)
@@ -56,7 +56,7 @@
gnc-acct-info acct-name acct-type))
(split (xaccMallocSplit (gnc-get-current-book))))
;; make the account if necessary
- (if (not acct)
+ (if (or (not acct) (null? acct))
(begin
(set! acct (xaccMallocAccount (gnc-get-current-book)))
(xaccAccountBeginEdit acct)
Modified: gnucash/trunk/src/import-export/qif-io-core/qif-invst-xtn-import.scm
===================================================================
--- gnucash/trunk/src/import-export/qif-io-core/qif-invst-xtn-import.scm 2006-10-29 03:12:49 UTC (rev 15060)
+++ gnucash/trunk/src/import-export/qif-io-core/qif-invst-xtn-import.scm 2006-10-29 03:39:39 UTC (rev 15061)
@@ -156,7 +156,7 @@
gnc-acct-info acct-name acct-type))
(split (xaccMallocSplit (gnc-get-current-book))))
;; make the account if necessary
- (if (not acct)
+ (if (or (not acct) (null? acct))
(begin
(set! acct (xaccMallocAccount (gnc-get-current-book)))
(xaccAccountSetName acct acct-name)
Modified: gnucash/trunk/src/report/standard-reports/budget.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/budget.scm 2006-10-29 03:12:49 UTC (rev 15060)
+++ gnucash/trunk/src/report/standard-reports/budget.scm 2006-10-29 03:39:39 UTC (rev 15061)
@@ -285,7 +285,7 @@
(define (account-get-depth account)
(define (account-get-depth-internal account-internal depth)
(let ((parent (xaccAccountGetParentAccount account-internal)))
- (if parent
+ (if (not (null? parent))
(account-get-depth-internal parent (+ depth 1))
depth)))
(account-get-depth-internal account 1))
Modified: gnucash/trunk/src/report/standard-reports/cash-flow.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/cash-flow.scm 2006-10-29 03:12:49 UTC (rev 15060)
+++ gnucash/trunk/src/report/standard-reports/cash-flow.scm 2006-10-29 03:39:39 UTC (rev 15061)
@@ -277,7 +277,7 @@
(s-commodity (xaccAccountGetCommodity s-account)))
;; Check if this is a dangling split
;; and print a warning
- (if (not s-account)
+ (if (null? s-account)
(display
(string-append
"WARNING: s-account is NULL for split: "
@@ -285,7 +285,7 @@
;(gnc:debug (xaccAccountGetName s-account))
(if (and ;; make sure we don't have
- s-account ;; any dangling splits
+ (not (null? s-account)) ;; any dangling splits
(not (account-in-list? s-account accounts)))
(if (not (split-in-list? s seen-split-list))
(begin
Modified: gnucash/trunk/src/report/standard-reports/transaction.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/transaction.scm 2006-10-29 03:12:49 UTC (rev 15060)
+++ gnucash/trunk/src/report/standard-reports/transaction.scm 2006-10-29 03:39:39 UTC (rev 15061)
@@ -128,8 +128,8 @@
;; display an account name depending on the options the user has set
(define (account-namestring account show-account-code show-account-name show-account-full-name)
- ;;# on multi-line splits we can get an empty (#f) account
- (if (not account)
+ ;;# on multi-line splits we can get an empty ('()) account
+ (if (null? account)
(_ "Split")
(string-append
;; display account code?
@@ -418,7 +418,7 @@
(parent (xaccSplitGetParent split))
(account (xaccSplitGetAccount split))
(account-type (xaccAccountGetType account))
- (currency (if account
+ (currency (if (not (null? account))
(xaccAccountGetCommodity account)
(gnc-default-currency)))
(report-currency (if (opt-val gnc:pagename-general optname-common-currency)
More information about the gnucash-changes
mailing list