Changeset 13780


Ignore:
Timestamp:
10/22/12 08:26:39 (12 years ago)
Author:
Mathieu Morlighem
Message:

CHG: some problems reported by cppcheck

Location:
issm/trunk-jpl/src/c
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/Container/Elements.cpp

    r13763 r13780  
    297297int Elements::NumberOfElements(void){
    298298
    299         int local_nelem=0;
     299        int local_nelem;
    300300        int numberofelements;
    301301

  • issm/trunk-jpl/src/c/Container/Loads.cpp

    r13622 r13780  
    5656int Loads::NumberOfLoads(void){
    5757
    58         int localloads=0;
    59         int numberofloads=0;
     58        int localloads;
     59        int numberofloads;
    6060
    6161        /*Get number of local loads*/

  • issm/trunk-jpl/src/c/Container/Observations.cpp

    r13763 r13780  
    121121
    122122        /*Output and Intermediaries*/
    123         bool         stop;
    124123        int          nobs,i,index;
    125124        IssmPDouble  h2,hmin2,radius2;

  • issm/trunk-jpl/src/c/Container/Options.h

    r13763 r13780  
    2525                template <class OptionType> void Get(OptionType* pvalue,const char* name){ /*{{{*/
    2626
    27                         GenericOption<OptionType>* genericoption=NULL;
    28 
    2927                        /*Get option*/
    30                         genericoption=(GenericOption<OptionType>*)GetOption(name);
     28                        GenericOption<OptionType>* genericoption=(GenericOption<OptionType>*)GetOption(name);
    3129
    3230                        /*If the pointer is not NULL, the option has been found*/
    … …  
    4240                template <class OptionType> void Get(OptionType* pvalue,int* pnumel, const char* name){ /*{{{*/
    4341
    44                         GenericOption<OptionType>* genericoption=NULL;
    45 
    4642                        /*Get option*/
    47                         genericoption=(GenericOption<OptionType>*)GetOption(name);
     43                        GenericOption<OptionType>* genericoption=(GenericOption<OptionType>*)GetOption(name);
    4844
    4945                        /*If the pointer is not NULL, the option has been found*/
    … …  
    6056                template <class OptionType> void Get(OptionType* pvalue,const char* name,OptionType default_value){ /*{{{*/
    6157
    62                         GenericOption<OptionType>* genericoption=NULL;
    63 
    6458                        /*Get option*/
    65                         genericoption=(GenericOption<OptionType>*)GetOption(name);
     59                        GenericOption<OptionType>* genericoption=(GenericOption<OptionType>*)GetOption(name);
    6660
    6761                        /*If the pointer is not NULL, the option has been found*/
    … …  
    7670                template <class OptionType> void Get(OptionType* pvalue,int* pnumel, const char* name,OptionType default_value){ /*{{{*/
    7771
    78                         GenericOption<OptionType>* genericoption=NULL;
    79 
    8072                        /*Get option*/
    81                         genericoption=(GenericOption<OptionType>*)GetOption(name);
     73                        GenericOption<OptionType>* genericoption=(GenericOption<OptionType>*)GetOption(name);
    8274
    8375                        /*If the pointer is not NULL, the option has been found*/
    … …  
    9890template <> inline void Options::Get(char** pvalue,const char* name,char* default_value){ /*{{{*/
    9991
    100         GenericOption<char*>* genericoption=NULL;
    101 
    10292        /*Get option*/
    103         genericoption=(GenericOption<char*>*)GetOption(name);
     93        GenericOption<char*>* genericoption=(GenericOption<char*>*)GetOption(name);
    10494
    10595        /*If the pointer is not NULL, the option has been found*/

  • issm/trunk-jpl/src/c/classes/matrix/Matrix.h

    r13623 r13780  
    274274                Matrix* Duplicate(void){
    275275
    276                         Matrix* output=NULL;
    277 
    278                         output=new Matrix();
     276                        Matrix* output=new Matrix();
    279277
    280278                        if(type==PetscMatType){

  • issm/trunk-jpl/src/c/classes/objects/Options/GenericOption.h

    r13767 r13780  
    113113template <> inline void GenericOption<char*>::Get(char** pvalue){ /*{{{*/
    114114
    115         char* outstring=NULL;
    116         int   stringsize;
    117 
    118         stringsize=strlen(this->value)+1;
    119         outstring=xNew<char>(stringsize);
     115        int   stringsize=strlen(this->value)+1;
     116        char* outstring=xNew<char>(stringsize);
    120117        xMemCpy<char>(outstring,this->value,stringsize);
    121118

  • issm/trunk-jpl/src/c/include/types.h

    r13767 r13780  
    4141/*Define communicator: */
    4242#ifdef _HAVE_MPI_
    43 #include "mpi.h"
     43#include <mpi.h>
    4444typedef MPI_Comm COMM;
    4545#else

  • issm/trunk-jpl/src/c/modules/TriMeshx/TriMeshx.h

    r13227 r13780  
    66#define _TRIMESHX_H_
    77
    8 #include "string.h"
     8#include <string.h>
    99#include "../../Container/Container.h"
    1010#include "../../classes/objects/objects.h"

  • issm/trunk-jpl/src/c/toolkits/issm/SeqVec.h

    r13623 r13780  
    6060                SeqVec(doubletype* buffer,int pM){
    6161
    62                         int i,j;
    63 
    6462                        this->M=pM;
    6563                        this->vector=NULL;

  • issm/trunk-jpl/src/c/toolkits/mpi/mpiincludes.h

    r1 r13780  
    77
    88/*MPI includes: */
    9 #include "mpi.h"
     9#include <mpi.h>
    1010
    1111/*Patches: */

  • issm/trunk-jpl/src/c/toolkits/petsc/patches/petscpatches.h

    r13754 r13780  
    66#define _PETSC_PATCHES_H_
    77
    8 #include "petscmat.h"
    9 #include "petscvec.h"
    10 #include "petscksp.h"
    11 #include "petscsys.h"
     8#include <petscmat.h>
     9#include <petscvec.h>
     10#include <petscksp.h>
     11#include <petscsys.h>
    1212
    1313#include "./SolverEnum.h"
Note: See TracChangeset for help on using the changeset viewer.