projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix 2fb1dd2271e5be9d0b0c9cbd4e7d6d5d51aaecb9
[mmh]
/
uip
/
pick.c
diff --git
a/uip/pick.c
b/uip/pick.c
index
993527b
..
5df2861
100644
(file)
--- a/
uip/pick.c
+++ b/
uip/pick.c
@@
-197,7
+197,7
@@
main(int argc, char **argv)
if (folder)
adios(EX_USAGE, NULL, "only one folder at a time!");
else
if (folder)
adios(EX_USAGE, NULL, "only one folder at a time!");
else
- folder = getcpy(expandfol(cp));
+ folder = mh_xstrdup(expandfol(cp));
} else
app_msgarg(&msgs, cp);
}
} else
app_msgarg(&msgs, cp);
}
@@
-731,7
+731,7
@@
pattern: ;
padvise(NULL, "pattern error in %s %s", argp[-2], cp);
return NULL;
}
padvise(NULL, "pattern error in %s %s", argp[-2], cp);
return NULL;
}
- n->n_patbuf = getcpy(dp);
+ n->n_patbuf = mh_xstrdup(dp);
return n;
case PROTHR:
return n;
case PROTHR:
@@
-768,7
+768,7
@@
newnexus(int (*action)())
{
struct nexus *p;
{
struct nexus *p;
- p = (struct nexus *) mh_xcalloc((size_t) 1, sizeof *p);
+ p = mh_xcalloc(1, sizeof *p);
p->n_action = action;
return p;
p->n_action = action;
return p;
@@
-1251,10
+1251,9
@@
plist
switch (state = m_getfld2(state, &f, fp)) {
case FLD2:
if (bp) {
switch (state = m_getfld2(state, &f, fp)) {
case FLD2:
if (bp) {
- free(bp);
- bp = NULL;
+ mh_free0(&bp);
}
}
- bp = getcpy(f.value);
+ bp = mh_xstrdup(f.value);
if (mh_strcasecmp(f.name, n->n_datef)==0) {
break;
}
if (mh_strcasecmp(f.name, n->n_datef)==0) {
break;
}
@@
-1268,9
+1267,7
@@
plist
case BODY2:
case FILEEOF2:
case BODY2:
case FILEEOF2:
- if (bp) {
- free(bp);
- }
+ mh_free0(&bp);
return 0;
default:
return 0;
default:
@@
-1287,6
+1284,6
@@
plist
: (twsort(tw, &n->n_tws) < 0);
if (bp != NULL)
: (twsort(tw, &n->n_tws) < 0);
if (bp != NULL)
- free(bp);
+ mh_free0(&bp);
return state;
}
return state;
}