Don't cast void pointer return value of malloc() et al.

[nmh] / sbr / context_read.c

diff --git a/sbr/context_read.c b/sbr/context_read.c
index cf52ebbbce9a9961f892753a46abf14eae278707..a8d142021f002916d01282fd670a1a9d5fe2631e 100644 (file)
--- a/sbr/context_read.c
+++ b/sbr/context_read.c
@@ -22,6 +22,9 @@
  */
 
 #include <h/mh.h>                              /* mh internals */
+#include "lock_file.h"
+#include "m_maildir.h"
+#include "makedir.h"
 #include <pwd.h>                               /* structure for getpwuid() results */
 
 void
@@ -36,7 +39,7 @@ context_read (void)
     int failed_to_lock = 0;
 
     /*
-     *  If this routine _is_ called again (despite the wanings in the
+     *  If this routine _is_ called again (despite the warnings in the
      *  comments above), return immediately.
      */
     if ( m_defs != 0 )
@@ -50,8 +53,7 @@ context_read (void)
     if ((mypath = getenv("HOME")) == NULL) {
        if ((pw = getpwuid(getuid())) == NULL || *pw->pw_dir == '\0')
            adios(NULL, "cannot determine your home directory");
-       else
-           mypath = pw->pw_dir;
+        mypath = pw->pw_dir;
     }
 
     /*
@@ -128,7 +130,7 @@ context_read (void)
 
     /* context is NULL if context_foil() was called to disable use of context
      * We also support users setting explicitly setting MHCONTEXT to /dev/null.
-     * (if this wasn't specialcased then the locking would be liable to fail)
+     * (if this wasn't special-cased then the locking would be liable to fail)
      */
     if (!cp || (strcmp(cp,"/dev/null") == 0)) {
        ctxpath = NULL;
@@ -138,9 +140,7 @@ context_read (void)
     ctxpath = getcpy (m_maildir (cp));
 
     if ((ib = lkfopendata (ctxpath, "r", &failed_to_lock))) {
-       readconfig ((struct node **) 0, ib, cp, 1);
+       readconfig(NULL, ib, cp, 1);
        lkfclosedata (ib, ctxpath);
     }
-
-    return;
 }