dtmail: resolve 'deference before null check' errors related to if(!NULL) checks...

[oweals/cde.git] / cde / programs / dtmail / dtmailpr / utils.C

diff --git a/cde/programs/dtmail/dtmailpr/utils.C b/cde/programs/dtmail/dtmailpr/utils.C
index 2246321c72af525ef24f6de938cbc8c7a421aa94..9ce88c081032897249b4070d7ce5da2cb824d5f4 100644 (file)
--- a/cde/programs/dtmail/dtmailpr/utils.C
+++ b/cde/programs/dtmail/dtmailpr/utils.C
@@ -122,7 +122,7 @@ formatHeader (DtMailHeaderLine &info, enum DmxHeaderType htype)
        {
                case MSGLIST:
                        sprintf (fbuf,
-                       "%-18.18s %-16.16s %4ld/%-5s %-.25s",
+                       "%-18.18s %-16.16s %4d/%-5s %-.25s",
                                dispname (header [DMXFROM]),
                                header [DMXDATE],
                                atoi (header [DMXCLENGTH]) / 40,
@@ -190,16 +190,16 @@ dispname(const char *hdr)
 
        if (hdr == 0)
                return 0;
-       if (((cp = strchr(hdr, '<')) != 0) && (cp > hdr)) {
+       if (((cp = const_cast <char *> (strchr(hdr, '<'))) != 0) && (cp > hdr)) {
                *cp = 0;
-               if ((*hdr == '"') && ((cp = strrchr(++hdr, '"')) != 0))
+               if ((*hdr == '"') && ((cp = const_cast <char *> (strrchr(++hdr, '"'))) != 0))
                        *cp = 0;
                return (char *)hdr;
-       } else if ((cp = strchr(hdr, '(')) != 0) {
+       } else if ((cp = const_cast <char *> (strchr(hdr, '('))) != 0) {
                hdr = ++cp;
-               if ((cp = strchr(hdr, '+')) != 0)
+               if ((cp = const_cast <char *> (strchr(hdr, '+'))) != 0)
                        *cp = 0;
-               if ((cp = strrchr(hdr, ')')) != 0)
+               if ((cp = const_cast <char *> (strrchr(hdr, ')'))) != 0)
                        *cp = 0;
                return (char *)hdr;
        }