r21229 - gnucash/trunk/src/engine - (cppcheck) Remove several redundant null checks

Christian Stimming cstim at code.gnucash.org
Thu Sep 1 02:50:33 EDT 2011


Author: cstim
Date: 2011-09-01 02:50:32 -0400 (Thu, 01 Sep 2011)
New Revision: 21229
Trac: http://svn.gnucash.org/trac/changeset/21229

Modified:
   gnucash/trunk/src/engine/Split.c
   gnucash/trunk/src/engine/gncInvoice.c
   gnucash/trunk/src/engine/gncOrder.c
Log:
(cppcheck) Remove several redundant null checks

Modified: gnucash/trunk/src/engine/Split.c
===================================================================
--- gnucash/trunk/src/engine/Split.c	2011-08-31 16:58:33 UTC (rev 21228)
+++ gnucash/trunk/src/engine/Split.c	2011-09-01 06:50:32 UTC (rev 21229)
@@ -1374,8 +1374,8 @@
 
     if (sa == sb) return 0;
     /* nothing is always less than something */
-    if (!sa && sb) return -1;
-    if (sa && !sb) return +1;
+    if (!sa) return -1;
+    if (!sb) return +1;
 
     retval = xaccTransOrder (sa->parent, sb->parent);
     if (retval) return retval;
@@ -1424,14 +1424,14 @@
 
     if (sa == sb) return 0;
     /* nothing is always less than something */
-    if (!sa && sb) return -1;
-    if (sa && !sb) return +1;
+    if (!sa) return -1;
+    if (!sb) return +1;
 
     ta = sa->parent;
     tb = sb->parent;
-    if ( ta && !tb ) return -1;
-    if ( !ta && tb ) return +1;
     if ( !ta && !tb ) return 0;
+    if ( !tb ) return -1;
+    if ( !ta ) return +1;
 
     /* if dates differ, return */
     DATE_CMP(ta, tb, date_posted);

Modified: gnucash/trunk/src/engine/gncInvoice.c
===================================================================
--- gnucash/trunk/src/engine/gncInvoice.c	2011-08-31 16:58:33 UTC (rev 21228)
+++ gnucash/trunk/src/engine/gncInvoice.c	2011-09-01 06:50:32 UTC (rev 21229)
@@ -1629,8 +1629,8 @@
     int compare;
 
     if (a == b) return 0;
-    if (!a && b) return -1;
-    if (a && !b) return 1;
+    if (!a) return -1;
+    if (!b) return 1;
 
     compare = safe_strcmp (a->id, b->id);
     if (compare) return compare;

Modified: gnucash/trunk/src/engine/gncOrder.c
===================================================================
--- gnucash/trunk/src/engine/gncOrder.c	2011-08-31 16:58:33 UTC (rev 21228)
+++ gnucash/trunk/src/engine/gncOrder.c	2011-09-01 06:50:32 UTC (rev 21229)
@@ -430,8 +430,8 @@
     int compare;
 
     if (a == b) return 0;
-    if (!a && b) return -1;
-    if (a && !b) return 1;
+    if (!a) return -1;
+    if (!b) return 1;
 
     compare = safe_strcmp (a->id, b->id);
     if (compare) return compare;



More information about the gnucash-changes mailing list