hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2025-01-24 01:57:06 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove the misnamed `xmalloc' and replace its uses with the realloc (along

Browse Source 
with error checking) that it actually was.
This commit is contained in:
David E. O'Brien 2001-07-24 14:14:11 +00:00
parent d54a8ce707
commit 44974a7f49
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=80293
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
usr.bin/col/col.c
View File

@ -101,7 +101,6 @@ void flush_blanks __P((void));
void free_line __P((LINE *)); void free_line __P((LINE *));
int main __P((int, char **)); int main __P((int, char **));
void usage __P((void)); void usage __P((void));
void *xmalloc __P((void *, size_t));
CSET last_set; /* char_set of last char printed */ CSET last_set; /* char_set of last char printed */
LINE *lines; LINE *lines;
@ -288,8 +287,9 @@ main(argc, argv)
int need; int need;
need = l->l_lsize ? l->l_lsize * 2 : 90; need = l->l_lsize ? l->l_lsize * 2 : 90;
l->l_line = xmalloc(l->l_line, if ((l->l_line = realloc(l->l_line,
(unsigned)need * sizeof(CHAR)); (unsigned)need * sizeof(CHAR))) == NULL)
err(1, (char *)NULL);
l->l_lsize = need; l->l_lsize = need;
} }
c = &l->l_line[l->l_line_len++]; c = &l->l_line[l->l_line_len++];
@ -405,13 +405,15 @@ flush_line(l)
*/ */
if (l->l_lsize > sorted_size) { if (l->l_lsize > sorted_size) {
sorted_size = l->l_lsize; sorted_size = l->l_lsize;
sorted = xmalloc(sorted, if ((sorted = realloc(sorted,
(unsigned)sizeof(CHAR) * sorted_size); (unsigned)sizeof(CHAR) * sorted_size)) == NULL)
err(1, (char *)NULL);
} }
if (l->l_max_col >= count_size) { if (l->l_max_col >= count_size) {
count_size = l->l_max_col + 1; count_size = l->l_max_col + 1;
count = xmalloc(count, if ((count = realloc(count,
(unsigned)sizeof(int) * count_size); (unsigned)sizeof(int) * count_size)) == NULL)
err(1, (char *)NULL);
} }
memset(count, 0, sizeof(int) * l->l_max_col + 1); memset(count, 0, sizeof(int) * l->l_max_col + 1);
for (i = nchars, c = l->l_line; --i >= 0; c++) for (i = nchars, c = l->l_line; --i >= 0; c++)
@ -498,7 +500,8 @@ alloc_line()
int i; int i;
if (!line_freelist) { if (!line_freelist) {
l = xmalloc(NULL, sizeof(LINE) * NALLOC); if ((l = realloc(NULL, sizeof(LINE) * NALLOC)) == NULL)
err(1, (char *)NULL);
line_freelist = l; line_freelist = l;
for (i = 1; i < NALLOC; i++, l++) for (i = 1; i < NALLOC; i++, l++)
l->l_next = l + 1; l->l_next = l + 1;
@ -520,17 +523,6 @@ free_line(l)
line_freelist = l; line_freelist = l;
} }
void *
xmalloc(p, size)
void *p;
size_t size;
{
if (!(p = realloc(p, size)))
err(1, (char *)NULL);
return (p);
}
void void
usage() usage()
{ {