projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace mh_xmalloc() with mh_xcalloc()
[mmh]
/
uip
/
rcvdist.c
diff --git
a/uip/rcvdist.c
b/uip/rcvdist.c
index
1337c89
..
deeccb8
100644
(file)
--- a/
uip/rcvdist.c
+++ b/
uip/rcvdist.c
@@
-170,20
+170,16
@@
rcvdistout(FILE *inb, char *form, char *addrs)
cp = new_fs(form ? form : rcvdistcomps, NULL);
format_len = strlen(cp);
ncomps = fmt_compile(cp, &fmt) + 1;
cp = new_fs(form ? form : rcvdistcomps, NULL);
format_len = strlen(cp);
ncomps = fmt_compile(cp, &fmt) + 1;
- if (!(nxtbuf = compbuffers =
- (char **) mh_xcalloc((size_t) ncomps, sizeof(char *)))) {
- adios(EX_OSERR, NULL, "unable to allocate component buffers");
- }
- if (!(savecomp = used_buf =
+ nxtbuf = compbuffers =
+ (char **) mh_xcalloc((size_t) ncomps, sizeof(char *));
+ savecomp = used_buf =
(struct comp **) mh_xcalloc((size_t) (ncomps + 1),
(struct comp **) mh_xcalloc((size_t) (ncomps + 1),
- sizeof(struct comp *)))) {
- adios(EX_OSERR, NULL, "unable to allocate component buffer stack");
- }
+ sizeof(struct comp *));
savecomp += ncomps + 1;
*--savecomp = 0;
for (i = ncomps; i--;) {
savecomp += ncomps + 1;
*--savecomp = 0;
for (i = ncomps; i--;) {
- *nxtbuf++ = mh_xmalloc(SBUFSIZ);
+ *nxtbuf++ = mh_xcalloc(SBUFSIZ, sizeof(char));
}
nxtbuf = compbuffers;
tmpbuf = *nxtbuf++;
}
nxtbuf = compbuffers;
tmpbuf = *nxtbuf++;
@@
-256,7
+252,7
@@
rcvdistout(FILE *inb, char *form, char *addrs)
finished: ;
i = format_len + char_read + 256;
finished: ;
i = format_len + char_read + 256;
- scanl = mh_xmalloc((size_t) i + 2);
+ scanl = mh_xcalloc((size_t) i + 2, sizeof(char));
dat[0] = dat[1] = dat[2] = dat[4] = 0;
dat[3] = OUTPUTLINELEN;
fmt_scan(fmt, scanl, i, dat);
dat[0] = dat[1] = dat[2] = dat[4] = 0;
dat[3] = OUTPUTLINELEN;
fmt_scan(fmt, scanl, i, dat);