Merge branch 'easy-cppcheck-fixes' into 'v91-bugfix'

some easy cppcheck fixes

See merge request integer/scip!3439

Author: svigerske

src/scip/presol_tworowbnd.c

@@ -592,8 +592,8 @@ SCIP_RETCODE transformAndSolve(
 
    SCIP_Real newbnd;
 
-   assert(!swaprow1 || (swaprow1 && !SCIPisInfinity(scip, SCIPmatrixGetRowRhs(matrix, row1idx))));
-   assert(!swaprow2 || (swaprow2 && !SCIPisInfinity(scip, SCIPmatrixGetRowRhs(matrix, row2idx))));
+   assert(!swaprow1 || !SCIPisInfinity(scip, SCIPmatrixGetRowRhs(matrix, row1idx)));
+   assert(!swaprow2 || !SCIPisInfinity(scip, SCIPmatrixGetRowRhs(matrix, row2idx)));
 
    row1len = SCIPmatrixGetRowNNonzs(matrix, row1idx);
    row2len = SCIPmatrixGetRowNNonzs(matrix, row2idx);

src/scip/symmetry_graph.c

@@ -824,21 +824,10 @@ int compareVarsSignedPerm(
    assert(var1 != NULL);
    assert(var2 != NULL);
 
-   /* use SCIP's comparison functions if available */
-   if( scip == NULL )
-   {
-      if( SCIPvarGetType(var1) < SCIPvarGetType(var2) )
-         return -1;
-      if( SCIPvarGetType(var1) > SCIPvarGetType(var2) )
-         return 1;
-   }
-   else
-   {
-      if( SCIPvarGetType(var1) < SCIPvarGetType(var2) )
-         return -1;
-      if( SCIPvarGetType(var1) > SCIPvarGetType(var2) )
-         return 1;
-   }
+   if( SCIPvarGetType(var1) < SCIPvarGetType(var2) )
+      return -1;
+   if( SCIPvarGetType(var1) > SCIPvarGetType(var2) )
+      return 1;
 
    obj1 = isneg1 ? -SCIPvarGetObj(var1) : SCIPvarGetObj(var1);
    obj2 = isneg2 ? -SCIPvarGetObj(var2) : SCIPvarGetObj(var2);

src/scip/tree.c

@@ -6407,6 +6407,7 @@ SCIP_RETCODE treeCreateProbingNode(
 
    /* get the current node */
    currentnode = SCIPtreeGetCurrentNode(tree);
+   assert(currentnode != NULL);
    assert(SCIPnodeGetType(currentnode) == SCIP_NODETYPE_FOCUSNODE
       || SCIPnodeGetType(currentnode) == SCIP_NODETYPE_REFOCUSNODE
       || SCIPnodeGetType(currentnode) == SCIP_NODETYPE_PROBINGNODE);
@@ -6720,8 +6721,9 @@ SCIP_RETCODE SCIPtreeMarkProbingNodeHasLP(
 
    /* get current probing node */
    node = SCIPtreeGetCurrentNode(tree);
+   assert(node != NULL);
    assert(SCIPnodeGetType(node) == SCIP_NODETYPE_PROBINGNODE);
-   assert(node != NULL && node->data.probingnode != NULL);
+   assert(node->data.probingnode != NULL);
 
    /* update LP information in probingnode data */
    /* cppcheck-suppress nullPointer */