diff options
Diffstat (limited to 'src/Boundary.c')
-rw-r--r-- | src/Boundary.c | 31 |
1 files changed, 9 insertions, 22 deletions
diff --git a/src/Boundary.c b/src/Boundary.c index a94b6d2..5573be0 100644 --- a/src/Boundary.c +++ b/src/Boundary.c @@ -954,7 +954,7 @@ void Boundary_ApplyPhysicalBCs(CCTK_ARGUMENTS) struct BCDATA *current_bcdata; max_num_vars = 0; - vars = NULL; /* so that it won't be freed if it was never malloced */ + vars = NULL; /* avoids a compiler warning */ faces = NULL; /* avoids a compiler warning */ widths = NULL; /* avoids a compiler warning */ tables = NULL; /* avoids a compiler warning */ @@ -977,20 +977,10 @@ void Boundary_ApplyPhysicalBCs(CCTK_ARGUMENTS) if (num_vars > max_num_vars) { max_num_vars = num_vars; /* store new maximum */ - if (vars) - { - /* reallocate arrays if necessary */ - vars = (int *) realloc(vars, num_vars*sizeof(int)); - faces = (int *) realloc(faces, num_vars*sizeof(int)); - widths = (int *) realloc(widths, num_vars*sizeof(int)); - tables = (int *) realloc(tables, num_vars*sizeof(int)); - } else - { - vars = (int *) malloc(num_vars*sizeof(int)); - faces = (int *) malloc(num_vars*sizeof(int)); - widths = (int *) malloc(num_vars*sizeof(int)); - tables = (int *) malloc(num_vars*sizeof(int)); - } + vars = (int *) realloc(vars, num_vars*sizeof(int)); + faces = (int *) realloc(faces, num_vars*sizeof(int)); + widths = (int *) realloc(widths, num_vars*sizeof(int)); + tables = (int *) realloc(tables, num_vars*sizeof(int)); } /* get selected vars for this bc_name */ @@ -1041,13 +1031,10 @@ void Boundary_ApplyPhysicalBCs(CCTK_ARGUMENTS) } /* Free data */ - if (vars) - { - free(vars); - free(faces); - free(widths); - free(tables); - } + free(vars); + free(faces); + free(widths); + free(tables); } /*@@ |