X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fseq_read.c;fp=sbr%2Fseq_read.c;h=e76bcc6a9dd2d7338f356286ada76afab6516430;hp=1ceb42163e912b36c9ff8f3def6bee3496259aa0;hb=9cf6132a6ea29968131a000bc2fb6860affac45e;hpb=d4c34b4439a9dbd89664de460ed37ecddc260fb1 diff --git a/sbr/seq_read.c b/sbr/seq_read.c index 1ceb421..e76bcc6 100644 --- a/sbr/seq_read.c +++ b/sbr/seq_read.c @@ -32,7 +32,7 @@ seq_read(struct msgs *mp) ** Initialize the list of sequence names. Go ahead and ** add the cur sequence to the list of sequences. */ - mp->msgattrs[0] = getcpy(seq_cur); + mp->msgattrs[0] = mh_xstrdup(seq_cur); mp->msgattrs[1] = NULL; make_all_public(mp); /* initially, make all public */ @@ -80,16 +80,16 @@ seq_public(struct msgs *mp) case FLD: case FLDPLUS: if (state == FLDPLUS) { - cp = getcpy(field); + cp = mh_xstrdup(field); while (state == FLDPLUS) { state = m_getfld(state, name, field, sizeof(field), fp); cp = add(field, cp); } - seq_init(mp, getcpy(name), trimcpy(cp)); + seq_init(mp, mh_xstrdup(name), trimcpy(cp)); mh_free0(&cp); } else { - seq_init(mp, getcpy(name), trimcpy(field)); + seq_init(mp, mh_xstrdup(name), trimcpy(field)); } continue; @@ -133,9 +133,9 @@ seq_private(struct msgs *mp) (j = strlen(np->n_name) - plen) > alen && *(np->n_name + j) == '-' && strcmp(mp->foldpath, np->n_name + j + 1)==0) { - cp = getcpy(np->n_name + alen); + cp = mh_xstrdup(np->n_name + alen); *(cp + j - alen) = '\0'; - if ((i = seq_init(mp, cp, getcpy(np->n_field))) != -1) + if ((i = seq_init(mp, cp, mh_xstrdup(np->n_field))) != -1) make_seq_private(mp, i); } }