From c9d7706cc6644bd775f055e51d2642d8ef1c4cfc Mon Sep 17 00:00:00 2001
From: Rocco Rutte <pdmef@gmx.net>
Date: Tue, 17 Mar 2009 20:04:56 +0100
Subject: [PATCH] Fix some warnings with -W about missing initializers in
 structs

---
 addrbook.c   | 2 +-
 browser.c    | 2 +-
 compose.c    | 2 +-
 curs_main.c  | 2 +-
 imap/auth.c  | 2 +-
 mx.c         | 2 +-
 pattern.c    | 2 +-
 pop_auth.c   | 2 +-
 postpone.c   | 2 +-
 query.c      | 2 +-
 recvattach.c | 2 +-
 remailer.c   | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/addrbook.c b/addrbook.c
index a6a0326ee..7d82cf578 100644
--- a/addrbook.c
+++ b/addrbook.c
@@ -39,7 +39,7 @@ static struct mapping_t AliasHelp[] = {
   { N_("Undel"),  OP_UNDELETE },
   { N_("Select"), OP_GENERIC_SELECT_ENTRY },
   { N_("Help"),   OP_HELP },
-  { NULL }
+  { NULL,	  0 }
 };
 
 static const char *
diff --git a/browser.c b/browser.c
index e9c6390ae..2214984ba 100644
--- a/browser.c
+++ b/browser.c
@@ -46,7 +46,7 @@ static struct mapping_t FolderHelp[] = {
   { N_("Chdir"), OP_CHANGE_DIRECTORY },
   { N_("Mask"),  OP_ENTER_MASK },
   { N_("Help"),  OP_HELP },
-  { NULL }
+  { NULL,	 0 }
 };
 
 typedef struct folder_t
diff --git a/compose.c b/compose.c
index d500f07e0..5db4c92ef 100644
--- a/compose.c
+++ b/compose.c
@@ -94,7 +94,7 @@ static struct mapping_t ComposeHelp[] = {
   { N_("Attach file"),  OP_COMPOSE_ATTACH_FILE },
   { N_("Descrip"), OP_COMPOSE_EDIT_DESCRIPTION },
   { N_("Help"),    OP_HELP },
-  { NULL }
+  { NULL,	0 }
 };
 
 static void snd_entry (char *b, size_t blen, MUTTMENU *menu, int num)
diff --git a/curs_main.c b/curs_main.c
index cf8cd9dc2..b898298a1 100644
--- a/curs_main.c
+++ b/curs_main.c
@@ -410,7 +410,7 @@ static struct mapping_t IndexHelp[] = {
   { N_("Reply"), OP_REPLY },
   { N_("Group"), OP_GROUP_REPLY },
   { N_("Help"),  OP_HELP },
-  { NULL }
+  { NULL,	 0 }
 };
 
 /* This function handles the message index window as well as commands returned
diff --git a/imap/auth.c b/imap/auth.c
index c61237d92..6ac292517 100644
--- a/imap/auth.c
+++ b/imap/auth.c
@@ -43,7 +43,7 @@ static imap_auth_t imap_authenticators[] = {
 #endif
   { imap_auth_login, "login" },
 
-  { NULL }
+  { NULL, NULL }
 };
 
 /* imap_authenticate: Attempt to authenticate using either user-specified
diff --git a/mx.c b/mx.c
index d1355769e..1aa49051d 100644
--- a/mx.c
+++ b/mx.c
@@ -251,7 +251,7 @@ int mx_lock_file (const char *path, int fd, int excl, int dot, int timeout)
 int mx_unlock_file (const char *path, int fd, int dot)
 {
 #ifdef USE_FCNTL
-  struct flock unlockit = { F_UNLCK, 0, 0, 0 };
+  struct flock unlockit = { F_UNLCK, 0, 0, 0, 0 };
 
   memset (&unlockit, 0, sizeof (struct flock));
   unlockit.l_type = F_UNLCK;
diff --git a/pattern.c b/pattern.c
index e693c02f6..22ff36911 100644
--- a/pattern.c
+++ b/pattern.c
@@ -97,7 +97,7 @@ Flags[] =
   { 'z', M_SIZE,		0,		eat_range },
   { '=', M_DUPLICATED,		0,		NULL },
   { '$', M_UNREFERENCED,	0,		NULL },
-  { 0 }
+  { 0,   0,			0,		NULL }
 };
 
 static pattern_t *SearchPattern = NULL; /* current search pattern */
diff --git a/pop_auth.c b/pop_auth.c
index 997199662..d2873d436 100644
--- a/pop_auth.c
+++ b/pop_auth.c
@@ -283,7 +283,7 @@ static pop_auth_t pop_authenticators[] = {
 #endif
   { pop_auth_apop, "apop" },
   { pop_auth_user, "user" },
-  { NULL }
+  { NULL,	   NULL }
 };
 
 /*
diff --git a/postpone.c b/postpone.c
index dae696442..e826ffa31 100644
--- a/postpone.c
+++ b/postpone.c
@@ -42,7 +42,7 @@ static struct mapping_t PostponeHelp[] = {
   { N_("Del"),   OP_DELETE },
   { N_("Undel"), OP_UNDELETE },
   { N_("Help"),  OP_HELP },
-  { NULL }
+  { NULL,        0 }
 };
 
 
diff --git a/query.c b/query.c
index 19dbc19ae..6a3ca0790 100644
--- a/query.c
+++ b/query.c
@@ -51,7 +51,7 @@ static struct mapping_t QueryHelp[] = {
   { N_("Make Alias"), OP_CREATE_ALIAS },
   { N_("Search"), OP_SEARCH },
   { N_("Help"),   OP_HELP },
-  { NULL }
+  { NULL,	  0 }
 };
 
 static void query_menu (char *buf, size_t buflen, QUERY *results, int retbuf);
diff --git a/recvattach.c b/recvattach.c
index 04ab50c27..398a416e1 100644
--- a/recvattach.c
+++ b/recvattach.c
@@ -55,7 +55,7 @@ static struct mapping_t AttachHelp[] = {
   { N_("Pipe"),  OP_PIPE },
   { N_("Print"), OP_PRINT },
   { N_("Help"),  OP_HELP },
-  { NULL }
+  { NULL,        0 }
 };
 
 void mutt_update_tree (ATTACHPTR **idx, short idxlen)
diff --git a/remailer.c b/remailer.c
index 3696e4803..3354540fb 100644
--- a/remailer.c
+++ b/remailer.c
@@ -487,7 +487,7 @@ static struct mapping_t RemailerHelp[] =
   { N_("Delete"), OP_MIX_DELETE },
   { N_("Abort"),  OP_EXIT       },
   { N_("OK"),     OP_MIX_USE    },
-  { NULL }
+  { NULL,         0 }
 };
   
 
-- 
2.40.0