X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=globals.h;h=5e4aa1807d49c8dcbb26e5657ea0ce0978addd2c;hp=6fc4da30268524264da63223936e83fc7af4e151;hb=f4a82d92ca0d015424b203887579802f003cfac8;hpb=0d52617ab7fc6b2d78b5835ad5230edaf5aafa4f

diff --git a/globals.h b/globals.h
index 6fc4da3..5e4aa18 100644
--- a/globals.h
+++ b/globals.h
@@ -9,25 +9,17 @@
 #ifndef _GLOBALS_H
 #define _GLOBALS_H
 
-#include "alias.h"
+#include <lib-lib/lib-lib.h>
 
-#include <lib-lib/str.h>
-#include <lib-lib/date.h>
-#include <lib-lib/rx.h>
-
-#include "lib/list.h"
-
-WHERE void (*mutt_error) (const char *, ...);
-WHERE void (*mutt_message) (const char *, ...);
+WHERE void (*mutt_error) (const char *, ...) __attribute__((format(printf, 1, 2))) ;
+WHERE void (*mutt_message) (const char *, ...) __attribute__((format(printf, 1, 2))) ;
 
 WHERE CONTEXT *Context;
 
 WHERE char Errorbuf[STRING];
 WHERE char AttachmentMarker[STRING];
 
-WHERE char Quotebuf[SHORT_STRING];
-
-WHERE char *MuttDotlock;
+WHERE char Quotebuf[STRING];
 
 WHERE address_t *EnvFrom;
 WHERE address_t *From;
@@ -36,23 +28,18 @@ WHERE char *AssumedCharset;
 WHERE char *AttachSep;
 WHERE char *Attribution;
 WHERE char *AttachFormat;
-WHERE char *Charset;
 WHERE char *ComposeFormat;
 WHERE char *ConfigCharset;
 WHERE char *ContentType;
 WHERE char *DefaultHook;
 WHERE char *DateFmt;
 WHERE char *DisplayFilter;
-WHERE char *DsnNotify;
-WHERE char *DsnReturn;
-WHERE char *Editor;
 WHERE char *EditorHeaders;
 WHERE char *FileCharset;
 WHERE char *FolderFormat;
 WHERE char *ForwFmt;
 WHERE char *Fqdn;
 WHERE char *HdrFmt;
-WHERE char *Homedir;
 WHERE char *Hostname;
 
 WHERE char *ImapAuthenticators INITVAL (NULL);
@@ -91,10 +78,8 @@ WHERE char *Preconnect INITVAL (NULL);
 WHERE char *Tunnel INITVAL (NULL);
 WHERE short NetInc;
 
-#ifdef MIXMASTER
 WHERE char *Mixmaster;
 WHERE char *MixEntryFormat;
-#endif
 
 WHERE char *OperatingSystem INITVAL (NULL);
 
@@ -127,8 +112,6 @@ WHERE char *PrintCmd;
 WHERE char *QueryCmd;
 WHERE char *Realname;
 WHERE char *SendCharset;
-WHERE char *Sendmail;
-WHERE char *Shell;
 WHERE char *SidebarDelim;
 WHERE char *SidebarNumberFormat;
 WHERE char *SidebarBoundary;
@@ -162,10 +145,8 @@ WHERE char *SslCACertFile INITVAL (NULL);
 #endif
 WHERE char *StChars;
 WHERE char *Status;
-WHERE char *Tempdir;
 WHERE char *Tochars;
 WHERE char *TrashPath;
-WHERE char *Username;
 WHERE char *XtermTitle;
 WHERE char *XtermLeave;
 WHERE char *XtermIcon;
@@ -184,14 +165,14 @@ WHERE string_list_t *Ignore INITVAL (0);
 WHERE string_list_t *MimeLookupList INITVAL (0);
 WHERE string_list_t *UnIgnore INITVAL (0);
 
-WHERE list2_t *Alternates INITVAL (0);
-WHERE list2_t *UnAlternates INITVAL (0);
-WHERE list2_t *MailLists INITVAL (0);
-WHERE list2_t *UnMailLists INITVAL (0);
-WHERE list2_t *SubscribedLists INITVAL (0);
-WHERE list2_t *UnSubscribedLists INITVAL (0);
-WHERE SPAM_LIST *SpamList INITVAL (0);
-WHERE list2_t *NoSpamList INITVAL (0);
+WHERE rx_t *Alternates INITVAL (0);
+WHERE rx_t *UnAlternates INITVAL (0);
+WHERE rx_t *MailLists INITVAL (0);
+WHERE rx_t *UnMailLists INITVAL (0);
+WHERE rx_t *SubscribedLists INITVAL (0);
+WHERE rx_t *UnSubscribedLists INITVAL (0);
+WHERE rx_t *SpamList INITVAL (0);
+WHERE rx_t *NoSpamList INITVAL (0);
 
 /* bit vector for boolean variables */
 #ifdef MAIN_C
@@ -207,8 +188,6 @@ unsigned char QuadOptions[(OPT_MAX * 2 + 7) / 8];
 extern unsigned char QuadOptions[];
 #endif
 
-WHERE unsigned short Counter INITVAL (0);
-
 #ifdef USE_NNTP
 WHERE short NewsPollTimeout;
 WHERE short NntpContext;