projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This is mmh-0.3
[mmh]
/
uip
/
ap.c
diff --git
a/uip/ap.c
b/uip/ap.c
index
46c3ff5
..
9d35601
100644
(file)
--- a/
uip/ap.c
+++ b/
uip/ap.c
@@
-9,6
+9,7
@@
#include <h/mh.h>
#include <h/addrsbr.h>
#include <h/fmt_scan.h>
#include <h/mh.h>
#include <h/addrsbr.h>
#include <h/fmt_scan.h>
+#include <h/utils.h>
#include <locale.h>
#include <sysexits.h>
#include <locale.h>
#include <sysexits.h>
@@
-137,15
+138,13
@@
process(char *arg, int norm)
(q = &pq)->pq_next = NULL;
while ((cp = getname(arg))) {
(q = &pq)->pq_next = NULL;
while ((cp = getname(arg))) {
- if ((p = (struct pqpair *)
- mh_xcalloc((size_t) 1, sizeof(*p))) == NULL)
- adios(EX_OSERR, NULL, "unable to allocate pqpair memory");
+ p = mh_xcalloc(1, sizeof(*p));
if ((mp = getm(cp, NULL, 0, norm, error)) == NULL) {
if ((mp = getm(cp, NULL, 0, norm, error)) == NULL) {
- p->pq_text = getcpy(cp);
- p->pq_error = getcpy(error);
+ p->pq_text = mh_xstrdup(cp);
+ p->pq_error = mh_xstrdup(error);
status++;
} else {
status++;
} else {
- p->pq_text = getcpy(mp->m_text);
+ p->pq_text = mh_xstrdup(mp->m_text);
mnfree(mp);
}
q = (q->pq_next = p);
mnfree(mp);
}
q = (q->pq_next = p);
@@
-162,11
+161,11
@@
process(char *arg, int norm)
fmt_scan(fmt, buffer, BUFSIZ, dat);
fputs(buffer, stdout);
fmt_scan(fmt, buffer, BUFSIZ, dat);
fputs(buffer, stdout);
- free(p->pq_text);
+ mh_free0(&(p->pq_text));
if (p->pq_error)
if (p->pq_error)
- free(p->pq_error);
+ mh_free0(&(p->pq_error));
q = p->pq_next;
q = p->pq_next;
- free((char *) p);
+ mh_free0(&p);
}
return status;
}
return status;