use safer p_clear when possible.

[apps/madmutt.git] / pgpmicalg.c

diff --git a/pgpmicalg.c b/pgpmicalg.c
index db7056a..1b6ecc9 100644 (file)
--- a/pgpmicalg.c
+++ b/pgpmicalg.c
@@ -59,13 +59,13 @@ static const char *pgp_hash_to_micalg (short id)
 static void pgp_dearmor (FILE * in, FILE * out)
 {
   char line[HUGE_STRING];
-  LOFF_T start;
-  LOFF_T end;
+  off_t start;
+  off_t end;
   char *r;
 
   STATE state;
 
-  memset (&state, 0, sizeof (STATE));
+  p_clear(&state, 1);
   state.fpin = in;
   state.fpout = out;
 
@@ -106,7 +106,7 @@ static void pgp_dearmor (FILE * in, FILE * out)
     return;
   }
 
-  if ((end = ftello (in) - str_len (line)) < start) {
+  if ((end = ftello (in) - m_strlen(line)) < start) {
     debug_print (1, ("end < start???\n"));
     return;
   }