diff options
Diffstat (limited to 'src/MaskUtils.c')
| -rw-r--r-- | src/MaskUtils.c | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/src/MaskUtils.c b/src/MaskUtils.c index 77350ac..2e9bf8e 100644 --- a/src/MaskUtils.c +++ b/src/MaskUtils.c @@ -415,10 +415,13 @@ SpaceMask_GetTypeBits(const char* type_name) { int i; - for (i=0; i<spacemask_registry->ntypes; ++i) + if (spacemask_registry != NULL) { - if (!strcmp(spacemask_registry->type_list[i]->name, type_name)) - return spacemask_registry->type_list[i]->bitmask; + for (i=0; i<spacemask_registry->ntypes; ++i) + { + if (!strcmp(spacemask_registry->type_list[i]->name, type_name)) + return spacemask_registry->type_list[i]->bitmask; + } } CCTK_VInfo (CCTK_THORNSTRING, "Type \"%s\" has not been registered.\n", @@ -443,17 +446,20 @@ SpaceMask_GetStateBits(const char* type_name, const char* state_name) SpaceMask_Type* type; int i, j; - for (i=0; i<spacemask_registry->ntypes; ++i) + if (spacemask_registry != NULL) { - if (!strcmp(spacemask_registry->type_list[i]->name, type_name)) + for (i=0; i<spacemask_registry->ntypes; ++i) { - type = spacemask_registry->type_list[i]; - for (j=0; j<type->nstates; ++j) + if (!strcmp(spacemask_registry->type_list[i]->name, type_name)) { - if (!strcmp(type->state_list[j]->name, state_name)) - return type->state_list[j]->bitmask; + type = spacemask_registry->type_list[i]; + for (j=0; j<type->nstates; ++j) + { + if (!strcmp(type->state_list[j]->name, state_name)) + return type->state_list[j]->bitmask; + } } - } + } } CCTK_VInfo (CCTK_THORNSTRING, |