aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Allen <axlecrusher@gmail.com>2017-03-07 21:20:39 -0500
committerJoshua Allen <axlecrusher@gmail.com>2017-03-07 21:20:39 -0500
commit6613cdc174401379b88f253385e8f82304de42f5 (patch)
tree74e5fd411d59f2632f716c3df0580627fb5f28de
parent90ed96e7b59e60a39f1e1f33223c6ffb0ee833f7 (diff)
downloadlibsurvive-6613cdc174401379b88f253385e8f82304de42f5.tar.gz
libsurvive-6613cdc174401379b88f253385e8f82304de42f5.tar.bz2
simplify use of realloc
-rw-r--r--src/survive_config.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/src/survive_config.c b/src/survive_config.c
index d8bad17..23d7ef1 100644
--- a/src/survive_config.c
+++ b/src/survive_config.c
@@ -59,11 +59,10 @@ void sstrcpy(char** dest, const char *src) {
uint32_t len = strlen(src)+1;
assert(dest!=NULL);
- if (*dest == NULL) {
- *dest = (char*)malloc(len);
- } else {
- *dest = (char*)realloc(*dest, len);
- }
+ char* ptr = (char*)realloc(*dest, len); //acts like mallos if dest==NULL
+ assert(ptr!=NULL);
+ *dest = ptr;
+
strcpy(*dest,src);
}
@@ -170,12 +169,10 @@ const FLT* config_set_float_a(config_group *cg, const char *tag, const FLT* valu
sstrcpy(&(cv->tag), tag);
- if (cv->data == NULL) {
- cv->data = (char*)malloc(sizeof(FLT)*count);
- }
- else {
- cv->data = (char*)realloc(cv->data, sizeof(FLT)*count);
- }
+ char* ptr = (char*)realloc(cv->data, sizeof(FLT)*count);
+ assert(ptr!=NULL);
+ cv->data = ptr;
+
printf("float array\n");
memcpy(cv->data,values,sizeof(FLT)*count);