r19067 - gnucash/trunk/src - Bug #615168: Make sure that printf is available whereever it is used
Christian Stimming
cstim at code.gnucash.org
Fri Apr 23 17:19:05 EDT 2010
Author: cstim
Date: 2010-04-23 17:19:05 -0400 (Fri, 23 Apr 2010)
New Revision: 19067
Trac: http://svn.gnucash.org/trac/changeset/19067
Modified:
gnucash/trunk/src/app-utils/date-utilities.scm
gnucash/trunk/src/business/business-reports/aging.scm
gnucash/trunk/src/business/business-reports/easy-invoice.scm
gnucash/trunk/src/business/business-reports/fancy-invoice.scm
gnucash/trunk/src/business/business-reports/invoice.scm
gnucash/trunk/src/business/business-reports/job-report.scm
gnucash/trunk/src/business/business-reports/owner-report.scm
gnucash/trunk/src/import-export/qif-import/qif-file.scm
gnucash/trunk/src/import-export/qif-import/qif-parse.scm
gnucash/trunk/src/import-export/qif-import/qif-to-gnc.scm
gnucash/trunk/src/report/report-system/eguile-gnc.scm
gnucash/trunk/src/report/report-system/html-document.scm
gnucash/trunk/src/report/report-system/html-table.scm
gnucash/trunk/src/report/report-system/html-text.scm
gnucash/trunk/src/report/report-system/html-utilities.scm
gnucash/trunk/src/report/report-system/report-utilities.scm
gnucash/trunk/src/report/report-system/report.scm
gnucash/trunk/src/report/standard-reports/budget-income-statement.scm
gnucash/trunk/src/report/standard-reports/income-statement.scm
gnucash/trunk/src/report/standard-reports/trial-balance.scm
Log:
Bug #615168: Make sure that printf is available whereever it is used
So, the right thing is for each file to be in its own module. Barring
that it's tough to see what the environment is in a given module. So to
be safe, everywhere there's a printf, make sure the (gnucash printf)
module is duly included.
Patch by Andy Wingo.
Conflicts:
src/business/business-reports/easy-invoice.scm
src/business/business-reports/fancy-invoice.scm
src/business/business-reports/invoice.scm
src/business/business-reports/job-report.scm
src/report/standard-reports/budget-income-statement.scm
src/report/standard-reports/income-statement.scm
src/report/standard-reports/trial-balance.scm
Modified: gnucash/trunk/src/app-utils/date-utilities.scm
===================================================================
--- gnucash/trunk/src/app-utils/date-utilities.scm 2010-04-23 21:07:13 UTC (rev 19066)
+++ gnucash/trunk/src/app-utils/date-utilities.scm 2010-04-23 21:19:05 UTC (rev 19067)
@@ -20,7 +20,8 @@
;; 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652
;; Boston, MA 02110-1301, USA gnu at gnu.org
-(use-modules (gnucash core-utils))
+(use-modules (gnucash core-utils)
+ (gnucash printf))
(define gnc:reldate-list '())
Modified: gnucash/trunk/src/business/business-reports/aging.scm
===================================================================
--- gnucash/trunk/src/business/business-reports/aging.scm 2010-04-23 21:07:13 UTC (rev 19066)
+++ gnucash/trunk/src/business/business-reports/aging.scm 2010-04-23 21:19:05 UTC (rev 19067)
@@ -28,6 +28,7 @@
(use-modules (ice-9 slib))
(use-modules (gnucash main))
+(use-modules (gnucash printf))
(use-modules (gnucash gnc-module))
(require 'hash-table)
Modified: gnucash/trunk/src/business/business-reports/easy-invoice.scm
===================================================================
--- gnucash/trunk/src/business/business-reports/easy-invoice.scm 2010-04-23 21:07:13 UTC (rev 19066)
+++ gnucash/trunk/src/business/business-reports/easy-invoice.scm 2010-04-23 21:19:05 UTC (rev 19067)
@@ -32,6 +32,7 @@
(use-modules (srfi srfi-1))
(use-modules (ice-9 slib))
+(use-modules (gnucash printf))
(use-modules (gnucash gnc-module))
(require 'hash-table)
Modified: gnucash/trunk/src/business/business-reports/fancy-invoice.scm
===================================================================
--- gnucash/trunk/src/business/business-reports/fancy-invoice.scm 2010-04-23 21:07:13 UTC (rev 19066)
+++ gnucash/trunk/src/business/business-reports/fancy-invoice.scm 2010-04-23 21:19:05 UTC (rev 19067)
@@ -50,6 +50,7 @@
(use-modules (srfi srfi-1))
(use-modules (ice-9 slib))
+(use-modules (gnucash printf))
(use-modules (gnucash gnc-module))
(require 'hash-table)
Modified: gnucash/trunk/src/business/business-reports/invoice.scm
===================================================================
--- gnucash/trunk/src/business/business-reports/invoice.scm 2010-04-23 21:07:13 UTC (rev 19066)
+++ gnucash/trunk/src/business/business-reports/invoice.scm 2010-04-23 21:19:05 UTC (rev 19067)
@@ -26,6 +26,7 @@
(use-modules (srfi srfi-1))
(use-modules (ice-9 slib))
+(use-modules (gnucash printf))
(use-modules (gnucash gnc-module))
(require 'hash-table)
Modified: gnucash/trunk/src/business/business-reports/job-report.scm
===================================================================
--- gnucash/trunk/src/business/business-reports/job-report.scm 2010-04-23 21:07:13 UTC (rev 19066)
+++ gnucash/trunk/src/business/business-reports/job-report.scm 2010-04-23 21:19:05 UTC (rev 19067)
@@ -28,6 +28,7 @@
(use-modules (srfi srfi-1))
(use-modules (ice-9 slib))
+(use-modules (gnucash printf))
(use-modules (gnucash gnc-module))
(use-modules (gnucash main)) ; for gnc:debug
Modified: gnucash/trunk/src/business/business-reports/owner-report.scm
===================================================================
--- gnucash/trunk/src/business/business-reports/owner-report.scm 2010-04-23 21:07:13 UTC (rev 19066)
+++ gnucash/trunk/src/business/business-reports/owner-report.scm 2010-04-23 21:19:05 UTC (rev 19067)
@@ -29,6 +29,7 @@
(use-modules (srfi srfi-1))
(use-modules (ice-9 slib))
(use-modules (gnucash gnc-module))
+(use-modules (gnucash printf))
(use-modules (gnucash main)) ; for gnc:debug
(gnc:module-load "gnucash/report/report-system" 0)
Modified: gnucash/trunk/src/import-export/qif-import/qif-file.scm
===================================================================
--- gnucash/trunk/src/import-export/qif-import/qif-file.scm 2010-04-23 21:07:13 UTC (rev 19066)
+++ gnucash/trunk/src/import-export/qif-import/qif-file.scm 2010-04-23 21:19:05 UTC (rev 19067)
@@ -7,6 +7,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(use-modules (gnucash core-utils))
+(use-modules (gnucash printf))
(use-modules (ice-9 regex))
(use-modules (srfi srfi-13))
Modified: gnucash/trunk/src/import-export/qif-import/qif-parse.scm
===================================================================
--- gnucash/trunk/src/import-export/qif-import/qif-parse.scm 2010-04-23 21:07:13 UTC (rev 19066)
+++ gnucash/trunk/src/import-export/qif-import/qif-parse.scm 2010-04-23 21:19:05 UTC (rev 19067)
@@ -5,6 +5,8 @@
;;; Bill Gribble <grib at billgribble.com> 20 Feb 2000
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(use-modules (gnucash printf))
+
(define qif-category-compiled-rexp
(make-regexp "^ *(\\[)?([^]/|]*)(]?)(/?)([^|]*)(\\|(\\[)?([^]/]*)(]?)(/?)(.*))? *$"))
Modified: gnucash/trunk/src/import-export/qif-import/qif-to-gnc.scm
===================================================================
--- gnucash/trunk/src/import-export/qif-import/qif-to-gnc.scm 2010-04-23 21:07:13 UTC (rev 19066)
+++ gnucash/trunk/src/import-export/qif-import/qif-to-gnc.scm 2010-04-23 21:19:05 UTC (rev 19067)
@@ -7,6 +7,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(use-modules (srfi srfi-13))
+(use-modules (gnucash printf))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
Modified: gnucash/trunk/src/report/report-system/eguile-gnc.scm
===================================================================
--- gnucash/trunk/src/report/report-system/eguile-gnc.scm 2010-04-23 21:07:13 UTC (rev 19066)
+++ gnucash/trunk/src/report/report-system/eguile-gnc.scm 2010-04-23 21:19:05 UTC (rev 19067)
@@ -85,6 +85,7 @@
(use-modules (ice-9 regex)) ; for regular expressions
(use-modules (ice-9 rdelim)) ; for read-line
+(use-modules (gnucash printf))
(use-modules (gnucash app-utils)) ; for _
;; This is needed for displaying error messages -- note that it assumes that
Modified: gnucash/trunk/src/report/report-system/html-document.scm
===================================================================
--- gnucash/trunk/src/report/report-system/html-document.scm 2010-04-23 21:07:13 UTC (rev 19066)
+++ gnucash/trunk/src/report/report-system/html-document.scm 2010-04-23 21:19:05 UTC (rev 19067)
@@ -22,6 +22,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(gnc:module-load "gnucash/html" 0)
+(use-modules (gnucash printf))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; <html-document> class
Modified: gnucash/trunk/src/report/report-system/html-table.scm
===================================================================
--- gnucash/trunk/src/report/report-system/html-table.scm 2010-04-23 21:07:13 UTC (rev 19066)
+++ gnucash/trunk/src/report/report-system/html-table.scm 2010-04-23 21:19:05 UTC (rev 19067)
@@ -33,6 +33,8 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(use-modules (gnucash printf))
+
(define <html-table>
(make-record-type "<html-table>"
'(col-headers
Modified: gnucash/trunk/src/report/report-system/html-text.scm
===================================================================
--- gnucash/trunk/src/report/report-system/html-text.scm 2010-04-23 21:07:13 UTC (rev 19066)
+++ gnucash/trunk/src/report/report-system/html-text.scm 2010-04-23 21:19:05 UTC (rev 19067)
@@ -30,6 +30,8 @@
;; doc as arg to get the string out.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(use-modules (gnucash printf))
+
(define <html-text>
(make-record-type "<html-text>"
'(body style)))
Modified: gnucash/trunk/src/report/report-system/html-utilities.scm
===================================================================
--- gnucash/trunk/src/report/report-system/html-utilities.scm 2010-04-23 21:07:13 UTC (rev 19066)
+++ gnucash/trunk/src/report/report-system/html-utilities.scm 2010-04-23 21:19:05 UTC (rev 19067)
@@ -22,6 +22,8 @@
;; Boston, MA 02110-1301, USA gnu at gnu.org
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(use-modules (gnucash printf))
+
;; returns a list with n #f (empty cell) values
(define (gnc:html-make-empty-cell) #f)
(define (gnc:html-make-empty-cells n)
Modified: gnucash/trunk/src/report/report-system/report-utilities.scm
===================================================================
--- gnucash/trunk/src/report/report-system/report-utilities.scm 2010-04-23 21:07:13 UTC (rev 19066)
+++ gnucash/trunk/src/report/report-system/report-utilities.scm 2010-04-23 21:19:05 UTC (rev 19067)
@@ -18,6 +18,7 @@
;; Boston, MA 02110-1301, USA gnu at gnu.org
(use-modules (srfi srfi-13))
+(use-modules (gnucash printf))
(define (list-ref-safe list elt)
(if (> (length list) elt)
Modified: gnucash/trunk/src/report/report-system/report.scm
===================================================================
--- gnucash/trunk/src/report/report-system/report.scm 2010-04-23 21:07:13 UTC (rev 19066)
+++ gnucash/trunk/src/report/report-system/report.scm 2010-04-23 21:19:05 UTC (rev 19067)
@@ -21,6 +21,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(use-modules (gnucash main))
+(use-modules (gnucash printf))
(use-modules (sw_report_system))
;; This hash should contain all the reports available and will be used
Modified: gnucash/trunk/src/report/standard-reports/budget-income-statement.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/budget-income-statement.scm 2010-04-23 21:07:13 UTC (rev 19066)
+++ gnucash/trunk/src/report/standard-reports/budget-income-statement.scm 2010-04-23 21:19:05 UTC (rev 19067)
@@ -43,6 +43,7 @@
(define-module (gnucash report standard-reports budget-income-statement))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (ice-9 slib))
+(use-modules (gnucash printf))
(use-modules (gnucash gnc-module))
(gnc:module-load "gnucash/report/report-system" 0)
Modified: gnucash/trunk/src/report/standard-reports/income-statement.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/income-statement.scm 2010-04-23 21:07:13 UTC (rev 19066)
+++ gnucash/trunk/src/report/standard-reports/income-statement.scm 2010-04-23 21:19:05 UTC (rev 19067)
@@ -44,6 +44,7 @@
(define-module (gnucash report standard-reports income-statement))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (ice-9 slib))
+(use-modules (gnucash printf))
(use-modules (gnucash gnc-module))
(gnc:module-load "gnucash/report/report-system" 0)
Modified: gnucash/trunk/src/report/standard-reports/trial-balance.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/trial-balance.scm 2010-04-23 21:07:13 UTC (rev 19066)
+++ gnucash/trunk/src/report/standard-reports/trial-balance.scm 2010-04-23 21:19:05 UTC (rev 19067)
@@ -53,6 +53,7 @@
(define-module (gnucash report standard-reports trial-balance))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (ice-9 slib))
+(use-modules (gnucash printf))
(use-modules (gnucash gnc-module))
(gnc:module-load "gnucash/report/report-system" 0)
More information about the gnucash-changes
mailing list