gnucash master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/29923b1f (commit)
	 via  https://github.com/Gnucash/gnucash/commit/773326b7 (commit)
	from  https://github.com/Gnucash/gnucash/commit/d3389828 (commit)



commit 29923b1fd9676123411ec69a271e4b5801e8ad92
Author: John Ralls <jralls at ceridwen.us>
Date:   Wed Jul 2 22:55:36 2014 +0200

    Replace '\0' with NULL as char* argument, avoiding warning.

diff --git a/src/libqof/qof/test/test-qofbook.c b/src/libqof/qof/test/test-qofbook.c
index e6bd41b..81c3cae 100644
--- a/src/libqof/qof/test/test-qofbook.c
+++ b/src/libqof/qof/test/test-qofbook.c
@@ -261,7 +261,7 @@ test_book_get_counter( Fixture *fixture, gconstpointer pData )
     g_assert( g_strrstr( test_struct.msg, err_invalid_cnt ) != NULL );
     g_free( test_struct.msg );
 
-    counter = qof_book_get_counter( fixture->book, '\0' );
+    counter = qof_book_get_counter( fixture->book, NULL );
     g_assert_cmpint( counter, == , -1 );
     g_assert( g_strrstr( test_struct.msg, err_invalid_cnt ) != NULL );
     g_free( test_struct.msg );
@@ -298,7 +298,7 @@ test_book_get_counter_format ( Fixture *fixture, gconstpointer pData )
     g_free( test_struct.msg );
 
     g_test_message( "Testing counter format when counter name is empty string" );
-    r = qof_book_get_counter_format( fixture->book, '\0' );
+    r = qof_book_get_counter_format( fixture->book, NULL );
     g_assert_cmpstr( r, == , NULL );
     g_assert( g_strrstr( test_struct.msg, err_invalid_cnt ) != NULL );
     g_free( test_struct.msg );
@@ -340,7 +340,7 @@ test_book_increment_and_format_counter ( Fixture *fixture, gconstpointer pData )
     g_free( test_struct.msg );
 
     g_test_message( "Testing increment and format when counter name is empty string" );
-    r = qof_book_increment_and_format_counter( fixture->book, '\0' );
+    r = qof_book_increment_and_format_counter( fixture->book, NULL );
     g_assert_cmpstr( r, == , NULL );
     g_free( r );
     g_assert( g_strrstr( test_struct.msg, err_invalid_cnt ) != NULL );

commit 773326b7c554df5ea3e6f3255d7bed4480587273
Author: John Ralls <jralls at ceridwen.us>
Date:   Wed Jul 2 22:54:39 2014 +0200

    Fix typo from 859866a.

diff --git a/configure.ac b/configure.ac
index 105e0e5..3039330 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1313,9 +1313,9 @@ AC_ARG_ENABLE(python-bindings,
 
 # This has to come after AC_PROG_CC _AND_ GNOME_COMPILE_WARNINGS
 AC_LANG([C++])
-AX_CHECK_COMPILE_FLAG([-Werror -Wno-deprecated-register],
-    [AM_CXXFLAGS="${AM_CXXFLAGS} -Wno-unused -Wno-deprecated-register"]
-    [AM_CXXFLAGS="${AM_CXXFLAGS} -Wno-unused"])
+AX_CHECK_COMPILE_FLAG([-Wno-deprecated-register],
+    [AM_CXXFLAGS="${AM_CXXFLAGS} -Wno-unused -Wno-deprecated-register"],
+    [AM_CXXFLAGS="${AM_CXXFLAGS} -Wno-unused"], [-Werror])
 AC_LANG([C])
 AC_MSG_CHECKING(what extra warning flags to pass to the C compiler)
 if test ${GCC}x = yesx
@@ -1367,7 +1367,9 @@ then
 #include <stdio.h>
 	 ]],
 	 [[ printf( "%s\n", "Hello World!");]])],
-	 [warnFLAGS="${warnFLAGS} -D_FORTIFY_SOURCE=2"])
+	 [warnFLAGS="${warnFLAGS} -D_FORTIFY_SOURCE=2"
+	 AC_MSG_RESULT(OK)],
+	 [AC_MSG_RESULT(No)])
   CFLAGS="$cflags_save"
 
   AM_CFLAGS="${warnFLAGS} ${AM_CFLAGS}"



Summary of changes:
 configure.ac                       | 10 ++++++----
 src/libqof/qof/test/test-qofbook.c |  6 +++---
 2 files changed, 9 insertions(+), 7 deletions(-)