[PATCH 1/2] imap-send: remove dead code
- From
Jeff King <peff@peff.net>
- Date
- Feb 6, 2012, 06:29 UTC
- Message-ID
- <20120206062937.GA9931@sigill.intra.peff.net>
- In-Reply-To
- <20120206062713.GA9699@sigill.intra.peff.net>
The imap-send code was adapted from another project, and still contains many unused bits of code. One of these bits contains a type "struct string_list" which bears no resemblence to the "struct string_list" we use elsewhere in git. This causes the compiler to complain if git's string_list ever becomes part of cache.h.
Let's just drop the dead code.
Signed-off-by: Jeff King <peff@peff.net> --- This is necessary for patch 2, which does include string-list.h in cache.h. If you read my cover letter, I think patch 2 might not be the best approach. However, I think it might be worth applying this just as a cleanup (e.g., even without the build problems, grepping for "struct string_list" turns up this useless cruft).
imap-send.c | 23 ----------------------- 1 files changed, 0 insertions(+), 23 deletions(-)
diff --git a/imap-send.c b/imap-send.c index e40125a..972ad62 100644 --- a/imap-send.c +++ b/imap-send.c @@ -42,28 +42,6 @@ struct store_conf { unsigned trash_remote_new:1, trash_only_new:1; }; -struct string_list { - struct string_list *next; - char string[1]; -}; - -struct channel_conf { - struct channel_conf *next; - char *name; - struct store_conf *master, *slave; - char *master_name, *slave_name; - char *sync_state; - struct string_list *patterns; - int mops, sops; - unsigned max_messages; /* for slave only */ -}; - -struct group_conf { - struct group_conf *next; - char *name; - struct string_list *channels; -}; - /* For message->status */ #define M_RECENT (1<<0) /* unsyncable flag; maildir_* depend on this being 1<<0 */ #define M_DEAD (1<<1) /* expunged */ @@ -71,7 +49,6 @@ struct group_conf { struct message { struct message *next; - /* struct string_list *keywords; */ size_t size; /* zero implies "not fetched" */ int uid; unsigned char flags, status;
-- 1.7.9.rc1.29.g43677