diff options
| author | Andrew J. Schorr <aschorr@telemetry-investments.com> | 2017-06-22 08:26:27 -0400 |
|---|---|---|
| committer | Andrew J. Schorr <aschorr@telemetry-investments.com> | 2017-06-22 08:26:27 -0400 |
| commit | 288b15d0793936fa14b51ed860056f6ce6200c52 (patch) | |
| tree | 5de9e9dca8b30e8d168da8661ae88e3ffe2504a3 /extension | |
| parent | b7d8b6ebcd5dd714bc21acf7637d9a651e2f7ea7 (diff) | |
| download | gawk-288b15d0793936fa14b51ed860056f6ce6200c52.tar.gz | |
Replace malloc+memset with calloc, mostly by using the new ezalloc macro.
Diffstat (limited to 'extension')
| -rw-r--r-- | extension/ChangeLog | 8 | ||||
| -rw-r--r-- | extension/filefuncs.c | 3 | ||||
| -rw-r--r-- | extension/gawkfts.c | 3 | ||||
| -rw-r--r-- | extension/readfile.c | 3 | ||||
| -rw-r--r-- | extension/rwarray.c | 3 | ||||
| -rw-r--r-- | extension/rwarray0.c | 3 |
6 files changed, 13 insertions, 10 deletions
diff --git a/extension/ChangeLog b/extension/ChangeLog index d10dc766..378de373 100644 --- a/extension/ChangeLog +++ b/extension/ChangeLog @@ -1,3 +1,11 @@ +2017-06-21 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * filefuncs.c (do_fts): Replace emalloc+memset with ezalloc. + * readfile.c (read_file_to_buffer): Ditto. + * rwarray.c (read_value): Replace gawk_malloc+memset with gawk_calloc. + * gawkfts.c (fts_open): Replace malloc+memset with calloc. + * rwarray0.c (read_value): Ditto. + 2017-04-03 Arnold D. Robbins <arnold@skeeve.com> * inplace.c (inplace_end): Correct the function name in the diff --git a/extension/filefuncs.c b/extension/filefuncs.c index 394de504..9ca22de8 100644 --- a/extension/filefuncs.c +++ b/extension/filefuncs.c @@ -877,8 +877,7 @@ do_fts(int nargs, awk_value_t *result, struct awk_ext_func *unused) /* make pathvector */ count = path_array->count + 1; - emalloc(pathvector, char **, count * sizeof(char *), "do_fts"); - memset(pathvector, 0, count * sizeof(char *)); + ezalloc(pathvector, char **, count * sizeof(char *), "do_fts"); /* fill it in */ count--; /* ignore final NULL at end of vector */ diff --git a/extension/gawkfts.c b/extension/gawkfts.c index 4a712153..d9edd87f 100644 --- a/extension/gawkfts.c +++ b/extension/gawkfts.c @@ -162,9 +162,8 @@ fts_open(char * const *argv, int options, } /* Allocate/initialize the stream */ - if ((sp = malloc((unsigned int)sizeof(FTS))) == NULL) + if ((sp = calloc(1, (unsigned int)sizeof(FTS))) == NULL) return (NULL); - memset(sp, 0, sizeof(FTS)); sp->fts_compar = compar; sp->fts_options = options; diff --git a/extension/readfile.c b/extension/readfile.c index fb1a376b..f470237b 100644 --- a/extension/readfile.c +++ b/extension/readfile.c @@ -82,8 +82,7 @@ read_file_to_buffer(int fd, const struct stat *sbuf) goto done; } - emalloc(text, char *, sbuf->st_size + 1, "do_readfile"); - memset(text, '\0', sbuf->st_size + 1); + ezalloc(text, char *, sbuf->st_size + 1, "do_readfile"); if ((ret = read(fd, text, sbuf->st_size)) != sbuf->st_size) { update_ERRNO_int(errno); diff --git a/extension/rwarray.c b/extension/rwarray.c index a7d752cf..370e38ac 100644 --- a/extension/rwarray.c +++ b/extension/rwarray.c @@ -482,8 +482,7 @@ read_value(FILE *fp, awk_value_t *value) break; } value->str_value.len = len; - value->str_value.str = gawk_malloc(len + 1); - memset(value->str_value.str, '\0', len + 1); + value->str_value.str = gawk_calloc(1, len + 1); if (fread(value->str_value.str, 1, len, fp) != (ssize_t) len) { gawk_free(value->str_value.str); diff --git a/extension/rwarray0.c b/extension/rwarray0.c index faa73783..abeb5326 100644 --- a/extension/rwarray0.c +++ b/extension/rwarray0.c @@ -446,8 +446,7 @@ read_value(int fd, awk_value_t *value) len = ntohl(len); value->val_type = AWK_STRING; value->str_value.len = len; - value->str_value.str = malloc(len + 1); - memset(value->str_value.str, '\0', len + 1); + value->str_value.str = calloc(1, len + 1); if (read(fd, value->str_value.str, len) != (ssize_t) len) { free(value->str_value.str); |