light tidy of format functions

diff --git a/compose.c b/compose.c
index 71711989b6006279f9c6f655fdb40a81dde211f0..b1dd75d71c52b300c397e155076e32f99d377a4d 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -739,8 +739,7 @@ static const char *compose_format_str(char *buf, size_t buflen, size_t col, int
       break;
 
     case 'v':
-      snprintf(fmt, sizeof(fmt), "NeoMutt %%s%%s");
-      snprintf(buf, buflen, fmt, PACKAGE_VERSION, GitVer);
+      snprintf(buf, buflen, "NeoMutt %s%s", PACKAGE_VERSION, GitVer);
       break;
 
     case 0:

diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index 6abf5ada7b493d0406625c628dcc6187d4aa2fd9..e02d48bb23412116a0122f5c7be94e2ac0f2ad27 100644 (file)
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -2932,7 +2932,7 @@ static const char *crypt_format_str(char *buf, size_t buflen, size_t col, int co
                                     const char *if_str, const char *else_str,
                                     unsigned long data, enum FormatFlag flags)
 {
-  char fmt[16];
+  char fmt[SHORT_STRING];
   struct CryptEntry *entry = NULL;
   struct CryptKeyInfo *key = NULL;
   int kflags = 0;

diff --git a/ncrypt/pgpinvoke.c b/ncrypt/pgpinvoke.c
index df7108438dac464e1d2920a2699384f11a861abf..89e801586634e64e8a5fc5a1450376a035f8ae4f 100644 (file)
--- a/ncrypt/pgpinvoke.c
+++ b/ncrypt/pgpinvoke.c
@@ -62,7 +62,7 @@ static const char *fmt_pgp_command(char *buf, size_t buflen, size_t col, int col
                                    const char *if_str, const char *else_str,
                                    unsigned long data, enum FormatFlag flags)
 {
-  char fmt[16];
+  char fmt[SHORT_STRING];
   struct PgpCommandContext *cctx = (struct PgpCommandContext *) data;
   int optional = (flags & MUTT_FORMAT_OPTIONAL);
 

diff --git a/ncrypt/pgpkey.c b/ncrypt/pgpkey.c
index d141559ba2a1d4736d1408fc6d285b62d4c3a015..3c2dff4e175f9bdef0171b4d638f8a6e2bc4e80d 100644 (file)
--- a/ncrypt/pgpkey.c
+++ b/ncrypt/pgpkey.c
@@ -144,7 +144,7 @@ static const char *pgp_entry_fmt(char *buf, size_t buflen, size_t col, int cols,
                                  const char *if_str, const char *else_str,
                                  unsigned long data, enum FormatFlag flags)
 {
-  char fmt[16];
+  char fmt[SHORT_STRING];
   struct PgpEntry *entry = NULL;
   struct PgpUid *uid = NULL;
   struct PgpKeyInfo *key = NULL, *pkey = NULL;

diff --git a/ncrypt/smime.c b/ncrypt/smime.c
index 99dc61198ee29337ceaf749d491f634203260a34..7528116d5eb0861c39158a92a325a0b02cab1205 100644 (file)
--- a/ncrypt/smime.c
+++ b/ncrypt/smime.c
@@ -164,7 +164,7 @@ static const char *fmt_smime_command(char *buf, size_t buflen, size_t col, int c
                                      const char *if_str, const char *else_str,
                                      unsigned long data, enum FormatFlag flags)
 {
-  char fmt[16];
+  char fmt[SHORT_STRING];
   struct SmimeCommandContext *cctx = (struct SmimeCommandContext *) data;
   int optional = (flags & MUTT_FORMAT_OPTIONAL);
 

diff --git a/recvattach.c b/recvattach.c
index 8437953bf7b52708ca9d803009f866829ad424fe..2ec2603a7029ec64ac8674e0926f065659e26e11 100644 (file)
--- a/recvattach.c
+++ b/recvattach.c
@@ -181,7 +181,7 @@ const char *attach_format_str(char *buf, size_t buflen, size_t col, int cols,
                               const char *if_str, const char *else_str,
                               unsigned long data, enum FormatFlag flags)
 {
-  char fmt[16];
+  char fmt[SHORT_STRING];
   char tmp[SHORT_STRING];
   char charset[SHORT_STRING];
   struct AttachPtr *aptr = (struct AttachPtr *) data;

diff --git a/remailer.c b/remailer.c
index 5f62ba07cb06221848cfd2bbfb51ea65cb32c508..65b7def5444a58deea664ed2fbdbad157c2f4758 100644 (file)
--- a/remailer.c
+++ b/remailer.c
@@ -378,7 +378,7 @@ static const char *mix_format_str(char *buf, size_t buflen, size_t col, int cols
                                   const char *if_str, const char *else_str,
                                   unsigned long data, enum FormatFlag flags)
 {
-  char fmt[16];
+  char fmt[SHORT_STRING];
   struct Remailer *remailer = (struct Remailer *) data;
   int optional = (flags & MUTT_FORMAT_OPTIONAL);