From e528848f5a6b0b5e2a0915a0426013bb94499033 Mon Sep 17 00:00:00 2001 From: Chris Shoemaker Date: Sun, 29 Oct 2006 03:39:39 +0000 Subject: [PATCH] [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.) git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@15061 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/engine/engine-interface.scm | 2 +- src/import-export/qif-import/qif-dialog-utils.scm | 2 +- src/import-export/qif-import/qif-file.scm | 4 ++-- src/import-export/qif-io-core/qif-acct-table.scm | 2 +- src/import-export/qif-io-core/qif-bank-xtn-import.scm | 2 +- src/import-export/qif-io-core/qif-invst-xtn-import.scm | 2 +- src/report/standard-reports/budget.scm | 2 +- src/report/standard-reports/cash-flow.scm | 4 ++-- src/report/standard-reports/transaction.scm | 6 +++--- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/engine/engine-interface.scm b/src/engine/engine-interface.scm index 1bd1e45985..bf1aeea2e6 100644 --- a/src/engine/engine-interface.scm +++ b/src/engine/engine-interface.scm @@ -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 diff --git a/src/import-export/qif-import/qif-dialog-utils.scm b/src/import-export/qif-import/qif-dialog-utils.scm index 14fe43968c..6d805724de 100644 --- a/src/import-export/qif-import/qif-dialog-utils.scm +++ b/src/import-export/qif-import/qif-dialog-utils.scm @@ -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 diff --git a/src/import-export/qif-import/qif-file.scm b/src/import-export/qif-import/qif-file.scm index de4829940f..611c5a97e0 100644 --- a/src/import-export/qif-import/qif-file.scm +++ b/src/import-export/qif-import/qif-file.scm @@ -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))) diff --git a/src/import-export/qif-io-core/qif-acct-table.scm b/src/import-export/qif-io-core/qif-acct-table.scm index 05b30cc650..48a5134d9f 100644 --- a/src/import-export/qif-io-core/qif-acct-table.scm +++ b/src/import-export/qif-io-core/qif-acct-table.scm @@ -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) diff --git a/src/import-export/qif-io-core/qif-bank-xtn-import.scm b/src/import-export/qif-io-core/qif-bank-xtn-import.scm index f65e0b29e7..8f41cb3a45 100644 --- a/src/import-export/qif-io-core/qif-bank-xtn-import.scm +++ b/src/import-export/qif-io-core/qif-bank-xtn-import.scm @@ -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) diff --git a/src/import-export/qif-io-core/qif-invst-xtn-import.scm b/src/import-export/qif-io-core/qif-invst-xtn-import.scm index 24f963862b..de5ba197c6 100644 --- a/src/import-export/qif-io-core/qif-invst-xtn-import.scm +++ b/src/import-export/qif-io-core/qif-invst-xtn-import.scm @@ -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) diff --git a/src/report/standard-reports/budget.scm b/src/report/standard-reports/budget.scm index 3dfb4cb92f..6a2549ae60 100644 --- a/src/report/standard-reports/budget.scm +++ b/src/report/standard-reports/budget.scm @@ -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)) diff --git a/src/report/standard-reports/cash-flow.scm b/src/report/standard-reports/cash-flow.scm index 554834dfde..1ab15fb338 100644 --- a/src/report/standard-reports/cash-flow.scm +++ b/src/report/standard-reports/cash-flow.scm @@ -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 diff --git a/src/report/standard-reports/transaction.scm b/src/report/standard-reports/transaction.scm index d999cfc86d..28f92f8041 100644 --- a/src/report/standard-reports/transaction.scm +++ b/src/report/standard-reports/transaction.scm @@ -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)