Merge branch 'fix_pclint_warnings_SCIP10' into 'master'

SCIP 10: fix pclint warnings

See merge request integer/scip!3866

Author: svigerske

pclint/scip.lnt

@@ -79,6 +79,11 @@
 // turn off warnings for third-party code
 -efile(*,src/amplmp/*)
 
+// switch condition is a constant expression
+-emacro(837,SCIPstatIncrement)
+-emacro(837,SCIPstatAdd)
+-emacro(837,SCIPstatUpdate)
+
 // last value assigned to '_restat_' not used
 -emacro(438,SCIP_CALL)
 -emacro(438,SCIP_CALL_ABORT)
@@ -195,6 +200,7 @@
 -emacro(774,debugMessage)
 -emacro(774,SCIP_CALL_TERMINATE)
 -emacro(774,MCFdebugMessage)
+-emacro(774,SG_FREE)
 
 // possible truncation of addition
 -emacro(776,SCIPreallocBufferArray)

src/scip/benders.c

@@ -4127,7 +4127,7 @@ SCIP_RETCODE SCIPbendersExec(
    /* inserting the subproblems into the priority queue for the next solve call */
    SCIP_CALL( updateSubproblemStatQueue(benders, executedidx, nexecutedidx, TRUE) );
 
-   if( stopped )
+   if( stopped ) /*lint !e774*/
       goto TERMINATE;
 
    allverified = (nverified == nsubproblems);
@@ -4278,7 +4278,7 @@ SCIP_RETCODE SCIPbendersExec(
 
 TERMINATE:
    /* if the solving process has stopped, then all subproblems need to be freed */
-   if( stopped )
+   if( stopped ) /*lint !e774*/
       nfree = nsubproblems;
    else
       nfree = nexecutedidx;

src/scip/branch_relpscost.c

@@ -1030,7 +1030,7 @@ SCIP_Bool continueStrongBranchingTreeSizeEstimation(
    SCIP_Real currentdepth;
    SCIP_Real currenttreesize;
    SCIP_Real absdualgap;
-   SCIP_Real gaptoclose;
+   SCIP_Real gaptoclose = -1.0;
 
    /* default values never used */
    SCIP_Real logmeangain = 0.0;
@@ -1061,6 +1061,7 @@ SCIP_Bool continueStrongBranchingTreeSizeEstimation(
    else
       return TRUE;
 
+   assert(gaptoclose >= 0.0);
    assert(!SCIPisInfinity(scip, -maxmeangain));
 
    SCIP_Real zeroprob = (SCIP_Real) branchruledata->nzerogains / (branchruledata->nzerogains + branchruledata->currndualgains);
@@ -1087,7 +1088,7 @@ SCIP_Bool continueStrongBranchingTreeSizeEstimation(
    }
 
    /* Continue strong branching since we do not have good enough gains in this case */
-   currentdepth = strongBranchingDepth(gaptoclose, maxmeangain);
+   currentdepth = strongBranchingDepth(gaptoclose, maxmeangain); /*lint !e644*/
 
    if (currentdepth >= 50)
       return TRUE;

src/scip/certificate.cpp

@@ -85,7 +85,9 @@ SCIP_Bool checkAndUpdateFilesize(
 {
    if( certificate->filesize < certificate->maxfilesize )
       certificate->filesize += nchars/(SCIP_MB_TO_CHAR_RATE);
-   return certificate->filesize < certificate->maxfilesize;
+   if( certificate->filesize < certificate->maxfilesize )
+      return TRUE;
+   return FALSE;
 }
 
 /** checks whether node is a left node or not */
@@ -816,7 +818,7 @@ SCIP_RETCODE SCIPcertificateExit(
 
    if( certificate->origfile != NULL )
    {
-      SCIP_Bool printingaborted = !checkAndUpdateFilesize(certificate, 0);
+      SCIP_Bool printingaborted = checkAndUpdateFilesize(certificate, 0) ? FALSE : TRUE;
 
       SCIPmessagePrintVerbInfo(messagehdlr, set->disp_verblevel, SCIP_VERBLEVEL_NORMAL,
          "closing certificate file (wrote approx. %.1f MB%s)\n", certificate->filesize,
@@ -896,8 +898,9 @@ SCIP_Bool SCIPcertificateIsEnabled(
    SCIP_CERTIFICATE*     certificate         /**< certificate information */
    )
 {
-   return certificate != NULL && certificate->transfile != NULL && certificate->origfile != NULL
-      && certificate->derivationfile != NULL;
+   if( certificate != NULL && certificate->transfile != NULL && certificate->origfile != NULL && certificate->derivationfile != NULL )
+      return TRUE;
+   return FALSE;
 }
 
 /** returns current certificate file size in MB */
@@ -935,26 +938,26 @@ SCIP_Bool SCIPcertificateEnsureLastBoundInfoConsistent(
    SCIP_Bool consistent;
 
    if( !SCIPcertificateIsEnabled(certificate) )
-      return true;
+      return TRUE;
 
    assert(certificate != NULL);
 
    consistent = certificate->lastinfo->isbound;
-   consistent = consistent && certificate->lastinfo->varindex == SCIPvarGetCertificateIndex(var);
+   consistent = consistent && certificate->lastinfo->varindex == SCIPvarGetCertificateIndex(var); /*lint !e1785*/
    if( boundtype == SCIP_BOUNDTYPE_LOWER )
    {
-      consistent = consistent && certificate->lastinfo->boundtype == SCIP_BOUNDTYPE_LOWER;
-      consistent = consistent && SCIPrationalRoundReal(certificate->lastinfo->boundval, SCIP_R_ROUND_DOWNWARDS) >= newbound;
+      consistent = consistent && certificate->lastinfo->boundtype == SCIP_BOUNDTYPE_LOWER;  /*lint !e1785*/
+      consistent = consistent && SCIPrationalRoundReal(certificate->lastinfo->boundval, SCIP_R_ROUND_DOWNWARDS) >= newbound; /*lint !e1785*/
    }
    else
    {
-      consistent = consistent && certificate->lastinfo->boundtype == SCIP_BOUNDTYPE_UPPER;
-      consistent = consistent && SCIPrationalRoundReal(certificate->lastinfo->boundval, SCIP_R_ROUND_UPWARDS) <= newbound;
+      consistent = consistent && certificate->lastinfo->boundtype == SCIP_BOUNDTYPE_UPPER; /*lint !e1785*/
+      consistent = consistent && SCIPrationalRoundReal(certificate->lastinfo->boundval, SCIP_R_ROUND_UPWARDS) <= newbound; /*lint !e1785*/
    }
-   consistent = consistent && (!needsglobal || certificate->lastinfo->isglobal);
-   consistent = consistent && certificate->lastinfo->certificateindex == certificate->indexcounter - 1;
-   return consistent;
+   consistent = consistent && (!needsglobal || certificate->lastinfo->isglobal); /*lint !e1785*/
+   consistent = consistent && certificate->lastinfo->certificateindex == certificate->indexcounter - 1; /*lint !e1785*/
 
+   return consistent;
 }
 #endif
 
@@ -1221,8 +1224,6 @@ SCIP_RETCODE SCIPcertificatePrintProofRational(
    int len = SCIPrationalStrLen(val) + 1;
    char* buffer = NULL;
 
-   assert(len <= INT_MAX);
-
    /* check whether certificate output should be created */
    if( !SCIPcertificateIsEnabled(certificate) )
      return SCIP_OKAY;;
@@ -3350,7 +3351,7 @@ SCIP_RETCODE SCIPcertificatePrintCutoffConflictingBounds(
                SCIPrationalDiv(ub, ub, var->exactdata->aggregate.scalar);
 
             assert(SCIPrationalIsZero(var->exactdata->aggregate.constant));
-            SCIP_Bool swapBounds = !SCIPrationalIsPositive(var->exactdata->aggregate.scalar);
+            SCIP_Bool swapBounds = SCIPrationalIsPositive(var->exactdata->aggregate.scalar) ? FALSE: TRUE;
             SCIP_CALL( SCIPcertificatePrintCutoffConflictingBounds(scip, certificate, var->data.aggregate.var, swapBounds ? ub : lb, swapBounds ? lb : ub,  swapBounds ? ubindex : lbindex, swapBounds ? lbindex : ubindex) );
             if( lb != NULL )
                SCIPrationalMult(lb, lb, var->exactdata->aggregate.scalar);

src/scip/cons_exactlinear.c

@@ -2039,10 +2039,11 @@ void consdataUpdateDelCoef(
 /** returns the minimum absolute value of all coefficients in the constraint */
 static
 SCIP_RATIONAL* consdataGetMinAbsvalEx(
-   SCIP*                 scip,
+   SCIP*                 scip,               /**< SCIP data structure */
    SCIP_CONSDATA*        consdata            /**< linear constraint data */
    )
 {
+   assert(scip != NULL);
    assert(consdata != NULL);
 
    if( !consdata->validminabsval )