From 68e8c25f906e7353269502d2292c8e99aa8c6605 Mon Sep 17 00:00:00 2001 From: David Levine Date: Sun, 3 Aug 2014 20:10:45 -0500 Subject: [PATCH 1/1] Removed m_eomsbr() from m_getfld.c, and its scan_eom_action() wrapper. It was only used by msh, which was removed by commit e6917522a770cf2dba9997ca047977bc55fac061. --- h/prototypes.h | 2 -- sbr/m_getfld.c | 22 +--------------------- uip/scansbr.c | 5 ----- 3 files changed, 1 insertion(+), 28 deletions(-) diff --git a/h/prototypes.h b/h/prototypes.h index a21a7180..4c5c3bb1 100644 --- a/h/prototypes.h +++ b/h/prototypes.h @@ -214,7 +214,6 @@ int m_atoi (char *); char *m_backup (char *); int m_convert (struct msgs *, char *); char *m_draft (char *, char *, int, int *); -void m_eomsbr (m_getfld_state_t, int (*)(int)); void m_getfld_state_reset (m_getfld_state_t *); void m_getfld_state_destroy (m_getfld_state_t *); void m_getfld_track_filepos (m_getfld_state_t *, FILE *); @@ -293,7 +292,6 @@ void ruserpass (char *, char **, char **); int remdir (char *); void scan_detect_mbox_style (FILE *); void scan_finished (); -void scan_eom_action (int (*)()); void scan_reset_m_getfld_state (); int seq_addmsg (struct msgs *, char *, int, int, int); int seq_addsel (struct msgs *, char *, int, int); diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c index 63b3fda2..fa651835 100644 --- a/sbr/m_getfld.c +++ b/sbr/m_getfld.c @@ -41,12 +41,9 @@ state to FLD. void m_unknown(FILE *iob): Determines the message delimiter string - for the maildrop. Called by inc, scan, and msh when reading from a + for the maildrop. Called by inc and scan when reading from a maildrop file. - void m_eomsbr (int (*action)(int)): Sets the hook to check for end - of message in a maildrop. Called only by msh. - State variables =============== m_getfld() retains state internally between calls in the @@ -850,23 +847,6 @@ m_unknown(m_getfld_state_t *gstate, FILE *iob) } -void -m_eomsbr (m_getfld_state_t s, int (*action)(int)) -{ - if ((s->eom_action = action)) { - s->msg_style = MS_MSH; - *s->msg_delim = 0; - s->fdelimlen = 1; - s->delimend = s->fdelim; - } else { - s->msg_style = MS_MMDF; - s->msg_delim = s->fdelim + 1; - s->fdelimlen = strlen (s->fdelim); - s->delimend = s->msg_delim + s->edelimlen; - } -} - - /* * test for msg delimiter string */ diff --git a/uip/scansbr.c b/uip/scansbr.c index a07889e4..abcb4962 100644 --- a/uip/scansbr.c +++ b/uip/scansbr.c @@ -391,11 +391,6 @@ scan_detect_mbox_style (FILE *f) { m_unknown (&gstate, f); } -void -scan_eom_action (int (*action)()) { - m_eomsbr (gstate, action); -} - void scan_reset_m_getfld_state () { m_getfld_state_reset (&gstate); -- 2.48.1