From a4dbe199c1f678c329401d573797a2376626fe99 Mon Sep 17 00:00:00 2001 From: Pietro Cerutti Date: Thu, 1 Feb 2018 16:07:14 +0000 Subject: [PATCH] Move parameter.[ch] to mutt/ --- Makefile.autosetup | 15 ++++++----- attach.c | 1 - body.c | 1 - commands.c | 1 - handler.c | 1 - hcache/hcache.c | 1 - mbox.c | 1 - mutt/mutt.h | 48 +++++++++++++++++---------------- parameter.c => mutt/parameter.c | 0 parameter.h => mutt/parameter.h | 0 muttlib.c | 1 - ncrypt/crypt.c | 1 - ncrypt/crypt_gpgme.c | 1 - ncrypt/pgp.c | 1 - ncrypt/smime.c | 1 - parse.c | 1 - postpone.c | 1 - rfc1524.c | 1 - rfc2231.c | 2 -- rfc3676.c | 1 - send.c | 1 - sendlib.c | 1 - 22 files changed, 34 insertions(+), 48 deletions(-) rename parameter.c => mutt/parameter.c (100%) rename parameter.h => mutt/parameter.h (100%) diff --git a/Makefile.autosetup b/Makefile.autosetup index 67154f16a..1e6e8c8c0 100644 --- a/Makefile.autosetup +++ b/Makefile.autosetup @@ -62,7 +62,7 @@ NEOMUTTOBJS= mutt_account.o addrbook.o alias.o attach.o bcache.o body.o \ header.o help.o history.o hook.o init.o keymap.o main.o \ mbox.o menu.o mh.o muttlib.o mutt_address.o \ mutt_socket.o tags.o mx.o \ - newsrc.o nntp.o pager.o parameter.o parse.o pattern.o pop.o \ + newsrc.o nntp.o pager.o parse.o pattern.o pop.o \ pop_auth.o pop_lib.o postpone.o query.o recvattach.o recvcmd.o \ rfc1524.o rfc2047.o rfc2231.o rfc3676.o address.o \ safe_asprintf.o score.o send.o sendlib.o sidebar.o mutt_signal.o \ @@ -91,9 +91,12 @@ ALLOBJS+= $(NEOMUTTOBJS) ############################################################################### # libmutt LIBMUTT= libmutt.a -LIBMUTTOBJS= mutt/base64.o mutt/buffer.o mutt/charset.o mutt/date.o mutt/debug.o mutt/exit.o \ - mutt/file.o mutt/hash.o mutt/idna.o mutt/list.o mutt/mapping.o mutt/mbyte.o mutt/md5.o \ - mutt/memory.o mutt/message.o mutt/mime.o mutt/regex.o mutt/sha1.o mutt/signal.o mutt/string.o \ +LIBMUTTOBJS= mutt/base64.o mutt/buffer.o mutt/charset.o mutt/date.o \ + mutt/debug.o mutt/exit.o \ + mutt/file.o mutt/hash.o mutt/idna.o mutt/list.o \ + mutt/mapping.o mutt/mbyte.o mutt/md5.o \ + mutt/memory.o mutt/message.o mutt/mime.o mutt/parameter.o \ + mutt/regex.o mutt/sha1.o mutt/signal.o mutt/string.o \ mutt/rfc2047.o CLEANFILES+= $(LIBMUTT) $(LIBMUTTOBJS) MUTTLIBS+= $(LIBMUTT) @@ -270,13 +273,13 @@ git_ver.h: $(ALL_FILES) hcache/hcversion.h: $(SRCDIR)/mutt.h $(SRCDIR)/address.h \ $(SRCDIR)/mutt/list.h $(SRCDIR)/mutt/buffer.h \ - $(SRCDIR)/parameter.h $(SRCDIR)/body.h \ + $(SRCDIR)/mutt/parameter.h $(SRCDIR)/body.h \ $(SRCDIR)/envelope.h $(SRCDIR)/header.h \ $(SRCDIR)/hcache/hcachever.sh \ $(PWD)/hcache ( echo '#include "config.h"'; echo '#include "mutt.h"'; \ echo '#include "address.h"'; echo '#include "mutt/list.h"'; \ - echo '#include "mutt/buffer.h"'; echo '#include "parameter.h"'; \ + echo '#include "mutt/buffer.h"'; echo '#include "mutt/parameter.h"'; \ echo '#include "body.h"'; echo '#include "envelope.h"'; \ echo '#include "header.h"';) | $(CPP) $(CFLAGS) - | \ sh $(SRCDIR)/hcache/hcachever.sh hcache/hcversion.h diff --git a/attach.c b/attach.c index 149dfc67e..c0aad8e95 100644 --- a/attach.c +++ b/attach.c @@ -43,7 +43,6 @@ #include "ncrypt/ncrypt.h" #include "options.h" #include "pager.h" -#include "parameter.h" #include "protos.h" #include "rfc1524.h" #include "state.h" diff --git a/body.c b/body.c index 1e5d58509..2308d8ea0 100644 --- a/body.c +++ b/body.c @@ -27,7 +27,6 @@ #include "mutt/mutt.h" #include "body.h" #include "header.h" -#include "parameter.h" #include "protos.h" struct Body *mutt_new_body(void) diff --git a/commands.c b/commands.c index ba6ccecab..1168d2b9a 100644 --- a/commands.c +++ b/commands.c @@ -51,7 +51,6 @@ #include "ncrypt/ncrypt.h" #include "options.h" #include "pager.h" -#include "parameter.h" #include "protos.h" #include "sort.h" #ifdef USE_IMAP diff --git a/handler.c b/handler.c index b06bf4bb3..da1ee1668 100644 --- a/handler.c +++ b/handler.c @@ -45,7 +45,6 @@ #include "ncrypt/ncrypt.h" #include "opcodes.h" #include "options.h" -#include "parameter.h" #include "protos.h" #include "rfc1524.h" #include "rfc3676.h" diff --git a/hcache/hcache.c b/hcache/hcache.c index bf8617126..5fd98777e 100644 --- a/hcache/hcache.c +++ b/hcache/hcache.c @@ -56,7 +56,6 @@ #include "hcache.h" #include "hcache/hcversion.h" #include "header.h" -#include "parameter.h" #include "protos.h" #include "tags.h" diff --git a/mbox.c b/mbox.c index 4911da945..e00b27b50 100644 --- a/mbox.c +++ b/mbox.c @@ -46,7 +46,6 @@ #include "mutt_curses.h" #include "mx.h" #include "options.h" -#include "parameter.h" #include "protos.h" #include "sort.h" #include "thread.h" diff --git a/mutt/mutt.h b/mutt/mutt.h index 5d4e5a7e8..4c9abe47d 100644 --- a/mutt/mutt.h +++ b/mutt/mutt.h @@ -25,29 +25,30 @@ * * Each source file in the library provides a group of related functions. * - * | File | Description | - * | :------------- | :--------------- | - * | mutt/base64.c | @subpage base64 | - * | mutt/buffer.c | @subpage buffer | - * | mutt/charset.c | @subpage charset | - * | mutt/date.c | @subpage date | - * | mutt/debug.c | @subpage debug | - * | mutt/exit.c | @subpage exit | - * | mutt/file.c | @subpage file | - * | mutt/hash.c | @subpage hash | - * | mutt/idna.c | @subpage idna | - * | mutt/list.c | @subpage list | - * | mutt/mapping.c | @subpage mapping | - * | mutt/mbyte.c | @subpage mbyte | - * | mutt/md5.c | @subpage md5 | - * | mutt/memory.c | @subpage memory | - * | mutt/message.c | @subpage message | - * | mutt/mime.c | @subpage mime | - * | mutt/regex.c | @subpage regex | - * | mutt/rfc2047.c | @subpage rfc2047 | - * | mutt/sha1.c | @subpage sha1 | - * | mutt/signal.c | @subpage signal | - * | mutt/string.c | @subpage string | + * | File | Description | + * | :--------------- | :----------------- | + * | mutt/base64.c | @subpage base64 | + * | mutt/buffer.c | @subpage buffer | + * | mutt/charset.c | @subpage charset | + * | mutt/date.c | @subpage date | + * | mutt/debug.c | @subpage debug | + * | mutt/exit.c | @subpage exit | + * | mutt/file.c | @subpage file | + * | mutt/hash.c | @subpage hash | + * | mutt/idna.c | @subpage idna | + * | mutt/list.c | @subpage list | + * | mutt/mapping.c | @subpage mapping | + * | mutt/mbyte.c | @subpage mbyte | + * | mutt/md5.c | @subpage md5 | + * | mutt/memory.c | @subpage memory | + * | mutt/message.c | @subpage message | + * | mutt/mime.c | @subpage mime | + * | mutt/parameter.c | @subpage parameter | + * | mutt/regex.c | @subpage regex | + * | mutt/rfc2047.c | @subpage rfc2047 | + * | mutt/sha1.c | @subpage sha1 | + * | mutt/signal.c | @subpage signal | + * | mutt/string.c | @subpage string | * * @note The library is self-contained -- some files may depend on others in * the library, but none depends on source from outside. @@ -72,6 +73,7 @@ #include "memory.h" #include "message.h" #include "mime.h" +#include "parameter.h" #include "regex3.h" #include "rfc2047.h" #include "sha1.h" diff --git a/parameter.c b/mutt/parameter.c similarity index 100% rename from parameter.c rename to mutt/parameter.c diff --git a/parameter.h b/mutt/parameter.h similarity index 100% rename from parameter.h rename to mutt/parameter.h diff --git a/muttlib.c b/muttlib.c index a412b1eda..4b8dcebcc 100644 --- a/muttlib.c +++ b/muttlib.c @@ -55,7 +55,6 @@ #include "mx.h" #include "ncrypt/ncrypt.h" #include "options.h" -#include "parameter.h" #include "protos.h" #include "tags.h" #include "url.h" diff --git a/ncrypt/crypt.c b/ncrypt/crypt.c index b34baa157..2e1eefa86 100644 --- a/ncrypt/crypt.c +++ b/ncrypt/crypt.c @@ -47,7 +47,6 @@ #include "mutt_curses.h" #include "ncrypt.h" #include "options.h" -#include "parameter.h" #include "protos.h" #include "state.h" diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c index 7186551e1..2bf3b9f20 100644 --- a/ncrypt/crypt_gpgme.c +++ b/ncrypt/crypt_gpgme.c @@ -59,7 +59,6 @@ #include "opcodes.h" #include "options.h" #include "pager.h" -#include "parameter.h" #include "protos.h" #include "sort.h" #include "state.h" diff --git a/ncrypt/pgp.c b/ncrypt/pgp.c index 973a35e2d..96dfe77d1 100644 --- a/ncrypt/pgp.c +++ b/ncrypt/pgp.c @@ -53,7 +53,6 @@ #include "mutt_curses.h" #include "ncrypt.h" #include "options.h" -#include "parameter.h" #include "pgpinvoke.h" #include "pgplib.h" #include "pgpmicalg.h" diff --git a/ncrypt/smime.c b/ncrypt/smime.c index cc861adac..5b5931828 100644 --- a/ncrypt/smime.c +++ b/ncrypt/smime.c @@ -49,7 +49,6 @@ #include "ncrypt.h" #include "opcodes.h" #include "options.h" -#include "parameter.h" #include "protos.h" #include "state.h" diff --git a/parse.c b/parse.c index 96211cd4e..49397e4ae 100644 --- a/parse.c +++ b/parse.c @@ -38,7 +38,6 @@ #include "mailbox.h" #include "ncrypt/ncrypt.h" #include "options.h" -#include "parameter.h" #include "protos.h" #include "rfc2047.h" #include "rfc2231.h" diff --git a/postpone.c b/postpone.c index 4ef981f3e..fceacf193 100644 --- a/postpone.c +++ b/postpone.c @@ -44,7 +44,6 @@ #include "ncrypt/ncrypt.h" #include "opcodes.h" #include "options.h" -#include "parameter.h" #include "protos.h" #include "sort.h" #include "state.h" diff --git a/rfc1524.c b/rfc1524.c index b5277f255..c1a7ffeaa 100644 --- a/rfc1524.c +++ b/rfc1524.c @@ -40,7 +40,6 @@ #include "body.h" #include "globals.h" #include "options.h" -#include "parameter.h" #include "protos.h" /** diff --git a/rfc2231.c b/rfc2231.c index b02e952c4..d5bf7e123 100644 --- a/rfc2231.c +++ b/rfc2231.c @@ -39,8 +39,6 @@ #include "rfc2231.h" #include "globals.h" #include "options.h" -#include "parameter.h" -#include "rfc2047.h" /** * struct Rfc2231Parameter - MIME section parameter diff --git a/rfc3676.c b/rfc3676.c index 938358494..5ebc8e6cb 100644 --- a/rfc3676.c +++ b/rfc3676.c @@ -35,7 +35,6 @@ #include "header.h" #include "mutt_curses.h" #include "options.h" -#include "parameter.h" #include "protos.h" #include "state.h" diff --git a/send.c b/send.c index ef37e2974..3863429b1 100644 --- a/send.c +++ b/send.c @@ -46,7 +46,6 @@ #include "mutt_curses.h" #include "ncrypt/ncrypt.h" #include "options.h" -#include "parameter.h" #include "pattern.h" #include "protos.h" #include "rfc2047.h" diff --git a/sendlib.c b/sendlib.c index a5f30c5b6..ed4176e5c 100644 --- a/sendlib.c +++ b/sendlib.c @@ -54,7 +54,6 @@ #include "ncrypt/ncrypt.h" #include "options.h" #include "pager.h" -#include "parameter.h" #include "protos.h" #include "rfc2047.h" #include "rfc2231.h" -- 2.40.0