fbt/sbase
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Convert codebase to use emalloc.c utility-functions

Browse Source 
This also definitely increases readability and makes OOM-conditions
more consistent.
This commit is contained in:
FRIGN
2014-11-16 11:07:26 +01:00
committed by sin
parent 045fc62028
commit e17b9cdd0a
10 changed files with 22 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ls.c
View File

@@ -92,8 +92,8 @@ main(int argc, char *argv[])
if (argc == 0)
*--argv = ".", argc++;
if (!(ents = malloc(argc * sizeof *ents)))
eprintf("malloc:");
ents = emalloc(argc * sizeof(*ents));
for (i = 0; i < argc; i++)
mkent(&ents[i], argv[i], 1);
qsort(ents, argc, sizeof *ents, entcmp);
@@ -154,10 +154,8 @@ lsdir(const char *path)
mkent(&ent, d->d_name, Fflag || lflag || iflag);
output(&ent);
} else {
if (!(ents = realloc(ents, ++n * sizeof *ents)))
eprintf("realloc:");
if (!(p = malloc((sz = strlen(d->d_name)+1))))
eprintf("malloc:");
ents = erealloc(ents, ++n * sizeof *ents);
p = emalloc((sz = strlen(d->d_name)+1));
memcpy(p, d->d_name, sz);
mkent(&ents[n-1], p, tflag || Fflag || lflag || iflag);
}