gnucash maint: Fix a bunch of non-literal-null-conversion warnings.

John Ralls jralls at code.gnucash.org
Tue Sep 30 19:51:54 EDT 2014


Updated	 via  https://github.com/Gnucash/gnucash/commit/2666779b (commit)
	from  https://github.com/Gnucash/gnucash/commit/1583ce31 (commit)



commit 2666779bf6284b14504b7eda6c18313cf5a81d30
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Sep 30 17:18:40 2014 -0700

    Fix a bunch of non-literal-null-conversion warnings.

diff --git a/src/backend/sql/gnc-slots-sql.c b/src/backend/sql/gnc-slots-sql.c
index b61d43d..bc8e970 100644
--- a/src/backend/sql/gnc-slots-sql.c
+++ b/src/backend/sql/gnc-slots-sql.c
@@ -709,7 +709,7 @@ save_slot( const gchar* key, KvpValue* value, gpointer data )
 gboolean
 gnc_sql_slots_save( GncSqlBackend* be, const GncGUID* guid, gboolean is_infant, KvpFrame* pFrame )
 {
-    slot_info_t slot_info = { NULL, NULL, TRUE, NULL, 0, NULL, FRAME, NULL, g_string_new('\0') };
+    slot_info_t slot_info = { NULL, NULL, TRUE, NULL, 0, NULL, FRAME, NULL, g_string_new(NULL) };
 
     g_return_val_if_fail( be != NULL, FALSE );
     g_return_val_if_fail( guid != NULL, FALSE );
@@ -736,7 +736,7 @@ gnc_sql_slots_delete( GncSqlBackend* be, const GncGUID* guid )
     GncSqlResult* result;
     gchar guid_buf[GUID_ENCODING_LENGTH + 1];
     GncSqlStatement* stmt;
-    slot_info_t slot_info = { NULL, NULL, TRUE, NULL, 0, NULL, FRAME, NULL, g_string_new('\0') };
+    slot_info_t slot_info = { NULL, NULL, TRUE, NULL, 0, NULL, FRAME, NULL, g_string_new(NULL) };
 
     g_return_val_if_fail( be != NULL, FALSE );
     g_return_val_if_fail( guid != NULL, FALSE );
@@ -818,7 +818,7 @@ load_slot( slot_info_t *pInfo, GncSqlRow* row )
 void
 gnc_sql_slots_load( GncSqlBackend* be, QofInstance* inst )
 {
-    slot_info_t info = { NULL, NULL, TRUE, NULL, 0, NULL, FRAME, NULL, g_string_new('\0') };
+    slot_info_t info = { NULL, NULL, TRUE, NULL, 0, NULL, FRAME, NULL, g_string_new(NULL) };
     g_return_if_fail( be != NULL );
     g_return_if_fail( inst != NULL );
 
diff --git a/src/gnome-utils/gnc-tree-view-split-reg.c b/src/gnome-utils/gnc-tree-view-split-reg.c
index 74d4b98..82f7d72 100644
--- a/src/gnome-utils/gnc-tree-view-split-reg.c
+++ b/src/gnome-utils/gnc-tree-view-split-reg.c
@@ -5351,7 +5351,7 @@ gtv_sr_type_cb (GtkEntry    *entry,
         {
             /* If it's not there (or the list is empty) use default_flag */
             g_free (result);
-            result  = g_strdup (TXN_TYPE_NONE);
+            result  = NULL;
         }
     }
     else
diff --git a/src/libqof/qof/test/test-qofbook.c b/src/libqof/qof/test/test-qofbook.c
index 87f8ce0..8f3f2fd 100644
--- a/src/libqof/qof/test/test-qofbook.c
+++ b/src/libqof/qof/test/test-qofbook.c
@@ -252,7 +252,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 );
@@ -289,7 +289,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 );
@@ -331,7 +331,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 );
diff --git a/src/register/ledger-core/split-register-model.c b/src/register/ledger-core/split-register-model.c
index 253dcac..6aa4372 100644
--- a/src/register/ledger-core/split-register-model.c
+++ b/src/register/ledger-core/split-register-model.c
@@ -1074,8 +1074,8 @@ gnc_split_register_get_vnotes_entry (VirtualLocation virt_loc,
     trans = xaccSplitGetParent (split);
 
     if(trans == NULL)
-        return g_strdup('\0');
-    else 
+        return NULL;
+    else
         return xaccTransGetVoidReason(trans);
 }
 



Summary of changes:
 src/backend/sql/gnc-slots-sql.c                 | 6 +++---
 src/gnome-utils/gnc-tree-view-split-reg.c       | 2 +-
 src/libqof/qof/test/test-qofbook.c              | 6 +++---
 src/register/ledger-core/split-register-model.c | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)



More information about the gnucash-changes mailing list