rename enter_state functions

diff --git a/curs_lib.c b/curs_lib.c
index 9c1695efa3c0669444242f7097e3bf3d5b3d5270..50244f29cb74ac011f2c022425bf3f1ae1ba0558 100644 (file)
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -175,7 +175,7 @@ int mutt_get_field_full(const char *field, char *buf, size_t buflen,
   int ret;
   int x;
 
-  struct EnterState *es = mutt_new_enter_state();
+  struct EnterState *es = mutt_enter_state_new();
 
   do
   {
@@ -195,7 +195,7 @@ int mutt_get_field_full(const char *field, char *buf, size_t buflen,
     ret = mutt_enter_string_full(buf, buflen, x, complete, multiple, files, numfiles, es);
   } while (ret == 1);
   mutt_window_clearline(MuttMessageWindow, 0);
-  mutt_free_enter_state(&es);
+  mutt_enter_state_free(&es);
 
   return ret;
 }

diff --git a/enter.c b/enter.c
index bcf639ac8440e52c364c31279206da2ff344b203..86cd2f146c048c29648de33d68d98119918fe632 100644 (file)
--- a/enter.c
+++ b/enter.c
@@ -115,7 +115,7 @@ static void replace_part(struct EnterState *state, size_t from, char *buf)
 int mutt_enter_string(char *buf, size_t buflen, int col, int flags)
 {
   int rc;
-  struct EnterState *es = mutt_new_enter_state();
+  struct EnterState *es = mutt_enter_state_new();
   do
   {
     if (SigWinch)
@@ -126,7 +126,7 @@ int mutt_enter_string(char *buf, size_t buflen, int col, int flags)
     }
     rc = mutt_enter_string_full(buf, buflen, col, flags, 0, NULL, NULL, es);
   } while (rc == 1);
-  mutt_free_enter_state(&es);
+  mutt_enter_state_free(&es);
   return rc;
 }
 
@@ -758,7 +758,7 @@ bye:
   return rc;
 }
 
-void mutt_free_enter_state(struct EnterState **esp)
+void mutt_enter_state_free(struct EnterState **esp)
 {
   if (!esp)
     return;

diff --git a/enter_state.h b/enter_state.h
index b52d45ba043dcc176563b23ec637a94ef3fcd820..8e4e551b67b4f97684c5f9927fb654f4386e8891 100644 (file)
--- a/enter_state.h
+++ b/enter_state.h
@@ -39,7 +39,9 @@ struct EnterState
   int tabs;
 };
 
-static inline struct EnterState *mutt_new_enter_state(void)
+void mutt_enter_state_free(struct EnterState **esp);
+
+static inline struct EnterState *mutt_enter_state_new(void)
 {
   return mutt_mem_calloc(1, sizeof(struct EnterState));
 }

diff --git a/protos.h b/protos.h
index fd3fbe5bb2eebda1b182b9d4a339b30b61fbc05a..514cb1532934b2f2006d928ee88013dd93c011e5 100644 (file)
--- a/protos.h
+++ b/protos.h
@@ -178,7 +178,6 @@ void mutt_format_s_tree(char *buf, size_t buflen, const char *prec, const char *
 void mutt_forward_intro(struct Context *ctx, struct Header *cur, FILE *fp);
 void mutt_forward_trailer(struct Context *ctx, struct Header *cur, FILE *fp);
 void mutt_free_color(int fg, int bg);
-void mutt_free_enter_state(struct EnterState **esp);
 void mutt_help(int menu);
 void mutt_check_lookup_list(struct Body *b, char *type, size_t len);
 void mutt_make_attribution(struct Context *ctx, struct Header *cur, FILE *out);