void
readconfig (struct node **npp, FILE *ib, const char *file, int ctx)
{
- register int state;
- register char *cp;
+ int state;
+ char *cp;
char name[NAMESZ], field[BUFSIZ];
- register struct node *np;
- register struct procstr *ps;
+ struct node *np;
+ struct procstr *ps;
m_getfld_state_t gstate = 0;
if (npp == NULL && (npp = opp) == NULL) {
switch (state = m_getfld (&gstate, name, field, &fieldsz, ib)) {
case FLD:
case FLDPLUS:
- np = (struct node *) mh_xmalloc (sizeof(*np));
+ NEW(np);
*npp = np;
*(npp = &np->n_next) = NULL;
- np->n_name = getcpy (name);
+ np->n_name = mh_xstrdup(name);
if (state == FLDPLUS) {
- cp = getcpy (field);
+ cp = mh_xstrdup(field);
while (state == FLDPLUS) {
fieldsz = sizeof field;
state = m_getfld (&gstate, name, field, &fieldsz, ib);
for (np = m_defs; np; np = np->n_next) {
/* Yes, this is O(N^2). The profile should be small enough so
that's not a performance problem. */
- if (strlen (np->n_name) > 0 && strcmp ("#", np->n_name)) {
+ if (*np->n_name && strcmp("#", np->n_name)) {
struct node *np2;
for (np2 = np->n_next; np2; np2 = np2->n_next) {
if (! strcasecmp (np->n_name, np2->n_name)) {
void
add_profile_entry (const char *key, const char *value) {
- struct node *newnode = (struct node *) mh_xmalloc (sizeof *newnode);
+ struct node *newnode;
/* This inserts the new node at the beginning of m_defs because
that doesn't require traversing it or checking to see if it's
empty. */
+ NEW(newnode);
newnode->n_name = getcpy (key);
newnode->n_field = getcpy (value);
newnode->n_context = 0;