X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=globals.h;h=cf272135cfc04e37a82b97033aeb989111c0f8ce;hp=a115c196c9abee7a60aba8a1fa56c212f183947f;hb=892df7e70376da43374d834b8a825ea2d59efd06;hpb=fcaada9d60ee8f52bbc8503c06fe061ca9e2fa68

diff --git a/globals.h b/globals.h
index a115c19..cf27213 100644
--- a/globals.h
+++ b/globals.h
@@ -11,17 +11,15 @@
 
 #include <lib-lib/lib-lib.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,9 +34,6 @@ 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;
@@ -84,10 +79,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);
 
@@ -120,8 +113,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;