[Commits] [svn:einsteintoolkit] HydroBase/trunk/src/ (Rev. 71)

[rhaas at tapir.caltech.edu]

User: rhaas
Date: 2014/04/25 02:36 PM

Modified:
 /trunk/src/
  ParamCheck.c

Log:
 clean up code in ParamCheck

File Changes:

Directory: /trunk/src/
======================

File [modified]: ParamCheck.c
Delta lines: +4 -8
===================================================================
--- trunk/src/ParamCheck.c	2014-01-14 04:04:02 UTC (rev 70)
+++ trunk/src/ParamCheck.c	2014-04-25 19:36:26 UTC (rev 71)
@@ -16,10 +16,6 @@
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
   
-  char * variable_is_read;
-  int i;
-  int nvars;
-
   const struct { 
     const char * paramname;
     const char * paramvalue;
@@ -43,17 +39,17 @@
     {"initial_entropy", initial_entropy, "HydroBase::entropy"},
   };
 
-  variable_is_read = malloc (CCTK_NumVars());
+  char *variable_is_read = malloc (CCTK_NumVars());
   assert (variable_is_read);
-  for (i=0; i<CCTK_NumVars(); ++i) {
+  for (int i=0; i<CCTK_NumVars(); ++i) {
     variable_is_read[i] = 0;
   }
   
-  nvars = CCTK_TraverseString
+  const int nvars = CCTK_TraverseString
     (filereader_ID_vars, callback, variable_is_read, CCTK_GROUP_OR_VAR);
   assert (nvars >= 0);
   
-  for (i=0; i<(int)(sizeof(vars_to_read)/sizeof(vars_to_read[0])); ++i) {
+  for (size_t i=0; i<sizeof(vars_to_read)/sizeof(vars_to_read[0]); ++i) {
     if (CCTK_EQUALS(vars_to_read[i].paramvalue, "read from file")) {
       int const ivar = CCTK_VarIndex (vars_to_read[i].varname);
       assert (ivar >= 0);