Merge pull request #590 from gruenich/feature/cppcheck-warnings

Simlify some if conditions to fix Cppcheck warnings

Author: mlschroe

src/decision.c

@@ -607,7 +607,7 @@ getdecisionlist(Solver *solv, Map *dm, int flags, Queue *decisionlistq)
       info = solv->decisionq_why.elements[ii];
       if (info > 0)
 	reason = SOLVER_REASON_UNIT_RULE;
-      else if (info <= 0)
+      else
 	{
 	  info = -info;
 	  reason = solv->decisionmap[vv];

src/order.c

@@ -1472,9 +1472,10 @@ transaction_check_order(Transaction *trans)
       p = trans->steps.elements[i];
       s = pool->solvables + p;
       if (s->repo != pool->installed)
+      {
 	lastins = p;
-      if (s->repo != pool->installed)
 	MAPSET(&ins, p);
+      }
       if (havescripts(pool, p, 0))
 	{
 	  MAPZERO(&seen);

src/pool.c

@@ -594,8 +594,7 @@ pool_createwhatprovides(Pool *pool)
     }
   else if (!pool->addedfileprovides && pool->disttype == DISTTYPE_RPM)
     {
-      if (!pool->addedfileprovides)
-	POOL_DEBUG(SOLV_DEBUG_STATS, "WARNING: pool_addfileprovides was not called, this may result in slow operation\n");
+      POOL_DEBUG(SOLV_DEBUG_STATS, "WARNING: pool_addfileprovides was not called, this may result in slow operation\n");
       /* lazyly add file provides */
       for (i = 1; i < num; i++)
 	{

src/rules.c

@@ -3206,7 +3206,7 @@ solver_ruleclass(Solver *solv, Id rid)
 {
   if (rid <= 0)
     return SOLVER_RULE_UNKNOWN;
-  if (rid > 0 && rid < solv->pkgrules_end)
+  if (rid < solv->pkgrules_end)
     return SOLVER_RULE_PKG;
   if (rid >= solv->jobrules && rid < solv->jobrules_end)
     return SOLVER_RULE_JOB;