[Gnucash-changes] CashUtil Sync: backend

[Neil Williams]

Log Message:
-----------
CashUtil Sync: backend

Tags:
----
gnucash-gnome2-dev

Modified Files:
--------------
    gnucash/src/backend/file:
        gnc-lot-xml-v2.c
        gnc-xml.h
        sixtp.c
    gnucash/src/backend/file/test:
        .cvsignore
        test-xml-pricedb.c
        test-xml-transaction.c

Revision Data
-------------
Index: sixtp.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/sixtp.c,v
retrieving revision 1.7.4.4
retrieving revision 1.7.4.5
diff -Lsrc/backend/file/sixtp.c -Lsrc/backend/file/sixtp.c -u -r1.7.4.4 -r1.7.4.5
--- src/backend/file/sixtp.c
+++ src/backend/file/sixtp.c
@@ -801,8 +801,9 @@
   g_return_val_if_fail(first_tag, FALSE);
   
   f = fopen(filename, "r");
-  if (f == NULL)
+  if (f == NULL) {
     return FALSE;
+  }
 
   num_read = fread(first_chunk, sizeof(char), sizeof(first_chunk) - 1, f);
   fclose(f);
Index: gnc-xml.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/gnc-xml.h,v
retrieving revision 1.8.4.4
retrieving revision 1.8.4.5
diff -Lsrc/backend/file/gnc-xml.h -Lsrc/backend/file/gnc-xml.h -u -r1.8.4.4 -r1.8.4.5
--- src/backend/file/gnc-xml.h
+++ src/backend/file/gnc-xml.h
@@ -35,8 +35,6 @@
 #include "gnc-xml-helper.h"
 #include "sixtp.h"
 
-#define GNCBook QofBook
-
 xmlNodePtr gnc_account_dom_tree_create(Account *act, gboolean exporting);
 sixtp* gnc_account_sixtp_parser_create(void);
 
Index: gnc-lot-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/gnc-lot-xml-v2.c,v
retrieving revision 1.4.4.2
retrieving revision 1.4.4.3
diff -Lsrc/backend/file/gnc-lot-xml-v2.c -Lsrc/backend/file/gnc-lot-xml-v2.c -u -r1.4.4.2 -r1.4.4.3
--- src/backend/file/gnc-lot-xml-v2.c
+++ src/backend/file/gnc-lot-xml-v2.c
@@ -41,7 +41,7 @@
 #include "gnc-xml.h"
 #include "io-gncxml-gen.h"
 #include "io-gncxml-v2.h"
-
+#include "qofid-p.h"
 #include "sixtp-dom-parsers.h"
 #include "gnc-lot.h"
 #include "gnc-lot-p.h"
Index: .cvsignore
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/test/.cvsignore,v
retrieving revision 1.5.6.1
retrieving revision 1.5.6.2
diff -Lsrc/backend/file/test/.cvsignore -Lsrc/backend/file/test/.cvsignore -u -r1.5.6.1 -r1.5.6.2
--- src/backend/file/test/.cvsignore
+++ src/backend/file/test/.cvsignore
@@ -17,3 +17,4 @@
 *.la
 *.lo
 test_file_*
+translog.*.log
Index: test-xml-pricedb.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/test/test-xml-pricedb.c,v
retrieving revision 1.6.4.1
retrieving revision 1.6.4.2
diff -Lsrc/backend/file/test/test-xml-pricedb.c -Lsrc/backend/file/test/test-xml-pricedb.c -u -r1.6.4.1 -r1.6.4.2
--- src/backend/file/test/test-xml-pricedb.c
+++ src/backend/file/test/test-xml-pricedb.c
@@ -111,7 +111,11 @@
     GNCPriceDB *db;
 
     db = get_random_pricedb (qof_session_get_book (session));
-
+    if (!db) {
+      failure_args ("gnc_random_price_db returned NULL",
+                    __FILE__, __LINE__, "%d", i);
+      return;
+    }
     if (gnc_pricedb_get_num_prices (db))
       test_db (i, db);
 
Index: test-xml-transaction.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/test/test-xml-transaction.c,v
retrieving revision 1.17.4.5
retrieving revision 1.17.4.6
diff -Lsrc/backend/file/test/test-xml-transaction.c -Lsrc/backend/file/test/test-xml-transaction.c -u -r1.17.4.5 -r1.17.4.6
--- src/backend/file/test/test-xml-transaction.c
+++ src/backend/file/test/test-xml-transaction.c
@@ -351,6 +351,12 @@
         int fd;
 
         ran_trn = get_random_transaction(book);
+        if(!ran_trn)
+        {
+            failure_args("transaction_xml", __FILE__, __LINE__,
+                         "get_random_transaction returned NULL");
+            return;
+       }
 
         {
           /* xaccAccountInsertSplit can reorder the splits. */