lock_file.c: close(2) file descriptor on failure, avoiding leak.

[nmh] / h / aliasbr.h

diff --git a/h/aliasbr.h b/h/aliasbr.h
index 655422056bd8c4d3686bf8ae3e46b0b69e8c740d..6e7a5a320641f506fca46017180d4ea8ff4e3a7f 100644 (file)
--- a/h/aliasbr.h
+++ b/h/aliasbr.h
@@ -8,7 +8,7 @@ struct aka {
     char *ak_name;             /* name to match against             */
     struct adr *ak_addr;       /* list of addresses that it maps to */
     struct aka *ak_next;       /* next aka in list                  */
-    char ak_visible;           /* should be visible in headers      */
+    bool ak_visible;           /* should be visible in headers      */
 };
 
 struct adr {
@@ -17,25 +17,11 @@ struct adr {
     char ad_local;             /* text is local (check for expansion) */
 };
 
-/*
- * in-core version of /etc/passwd
- */
-struct home {
-    char *h_name;              /* user name                             */
-    uid_t h_uid;               /* user id                               */
-    gid_t h_gid;               /* user's group                          */
-    char *h_home;              /* user's home directory                 */
-    char *h_shell;             /* user's shell                          */
-    int        h_ngrps;                /* number of groups this user belongs to */
-    struct home *h_next;       /* next home in list                     */
-};
-
 /*
  * prototypes
  */
 int alias (char *);
-int akvisible (void);
-void init_pw (void);
+int akvisible (void) PURE;
 char *akresult (struct aka *);
 char *akvalue (char *);
 char *akerror (int);
@@ -46,4 +32,3 @@ char *akerror (int);
 #define        AK_NOFILE       1       /* couldn't read file    */
 #define        AK_ERROR        2       /* error parsing file    */
 #define        AK_LIMIT        3       /* memory limit exceeded */
-#define        AK_NOGROUP      4       /* no such group         */