code-style: prefer calloc over malloc+memset
This commit is contained in:
parent
9cdeeab9b8
commit
48343e99b8
3
main.c
3
main.c
@ -849,8 +849,7 @@ int main(int argc, char *argv[])
|
||||
else
|
||||
filecnt = options->filecnt;
|
||||
|
||||
files = emalloc(filecnt * sizeof(*files));
|
||||
memset(files, 0, filecnt * sizeof(*files));
|
||||
files = ecalloc(filecnt, sizeof(*files));
|
||||
fileidx = 0;
|
||||
|
||||
if (options->from_stdin) {
|
||||
|
1
nsxiv.h
1
nsxiv.h
@ -345,6 +345,7 @@ typedef struct {
|
||||
extern const char *progname;
|
||||
|
||||
void* emalloc(size_t);
|
||||
void* ecalloc(size_t, size_t);
|
||||
void* erealloc(void*, size_t);
|
||||
char* estrdup(const char*);
|
||||
void error(int, int, const char*, ...);
|
||||
|
8
thumbs.c
8
thumbs.c
@ -149,12 +149,10 @@ void tns_init(tns_t *tns, fileinfo_t *files, const int *cnt, int *sel, win_t *wi
|
||||
int len;
|
||||
const char *homedir, *dsuffix = "";
|
||||
|
||||
if (cnt != NULL && *cnt > 0) {
|
||||
tns->thumbs = emalloc(*cnt * sizeof(thumb_t));
|
||||
memset(tns->thumbs, 0, *cnt * sizeof(thumb_t));
|
||||
} else {
|
||||
if (cnt != NULL && *cnt > 0)
|
||||
tns->thumbs = ecalloc(*cnt, sizeof(thumb_t));
|
||||
else
|
||||
tns->thumbs = NULL;
|
||||
}
|
||||
tns->files = files;
|
||||
tns->cnt = cnt;
|
||||
tns->initnext = tns->loadnext = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user