Use good m_ functions, because it smell like a flower, version 2.

[apps/madmutt.git] / pgppubring.c

diff --git a/pgppubring.c b/pgppubring.c
index 7b297ed..d7e5612 100644 (file)
--- a/pgppubring.c
+++ b/pgppubring.c
@@ -22,26 +22,16 @@
  *
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
 #include <lib-hash/hash.h>
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <time.h>
 #ifdef HAVE_GETOPT_H
 # include <getopt.h>
 #else
 extern char *optarg;
 extern int optind;
 #endif
-#include <errno.h>
 
 short Umask;   /* dirty hack because we need Umask in lib.c but don't want globals.h there */
 
@@ -783,9 +773,7 @@ static void pgpring_find_candidates (char *ringfile, const char *hints[],
 
     FGETPOS (rfp, pos);
   }
-
-  fclose (rfp);
-
+  m_fclose(&rfp);
 }
 
 static void print_userid (const char *id)
@@ -908,13 +896,3 @@ static void pgpring_dump_keyblock (pgp_key_t p)
     }
   }
 }
-
-/*
- * The mutt_gettext () defined in gettext.c requires iconv,
- * so we do without charset conversion here.
- */
-
-char *mutt_gettext (const char *message)
-{
-  return (char *) message;
-}