Replace `(char *)0' et al with `NULL'.

[nmh] / sbr / seq_read.c

diff --git a/sbr/seq_read.c b/sbr/seq_read.c
index 759dba491f89e6edfa0a8c1fc660b46ca40bd579..6f807c6505bd880959e39a069f7b3b15af75c4b7 100644 (file)
--- a/sbr/seq_read.c
+++ b/sbr/seq_read.c
@@ -88,16 +88,16 @@ seq_public (struct msgs *mp, int lockflag, int *failed_to_lock)
            case FLD: 
            case FLDPLUS:
                if (state == FLDPLUS) {
            case FLD: 
            case FLDPLUS:
                if (state == FLDPLUS) {

-                   cp = getcpy (field);
+                   cp = mh_xstrdup(field);

                    while (state == FLDPLUS) {
                        fieldsz = sizeof field;
                        state = m_getfld (&gstate, name, field, &fieldsz, fp);
                        cp = add (field, cp);
                    }
                    while (state == FLDPLUS) {
                        fieldsz = sizeof field;
                        state = m_getfld (&gstate, name, field, &fieldsz, fp);
                        cp = add (field, cp);
                    }

-                   seq_init (mp, getcpy (name), trimcpy (cp));
+                   seq_init (mp, mh_xstrdup(name), trimcpy (cp));

                    free (cp);
                } else {
                    free (cp);
                } else {

-                   seq_init (mp, getcpy (name), trimcpy (field));
+                   seq_init (mp, mh_xstrdup(name), trimcpy (field));

                }
                continue;
 
                }
                continue;
 


@@ -119,7 +119,7 @@ seq_public (struct msgs *mp, int lockflag, int *failed_to_lock)
 
     if (lockflag) {
        mp->seqhandle = fp;
 
     if (lockflag) {
        mp->seqhandle = fp;

-       mp->seqname = getcpy(seqfile);
+       mp->seqname = mh_xstrdup(seqfile);

     } else {
        lkfclosedata (fp, seqfile);
     }
     } else {
        lkfclosedata (fp, seqfile);
     }


@@ -150,7 +150,7 @@ 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) {
                && (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)
                make_seq_private (mp, i);
            *(cp + j - alen) = '\0';
            if ((i = seq_init (mp, cp, getcpy (np->n_field))) != -1)
                make_seq_private (mp, i);