From 2c24a43211c0dde4e728eae873e1e17188515f74 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Mon, 23 May 2011 08:16:09 +0300 Subject: [PATCH] * cosmetics --- .gitignore | 1 + NEWS | 6 +++--- configure.ac | 12 +++++++++--- src/mu-cmd-find.c | 2 ++ src/mu-cmd-index.c | 5 ++++- src/mu-cmd.h | 4 +++- src/mu-msg-priv.h | 10 ++++++---- src/mu-output.c | 6 +++++- src/mu-output.h | 2 ++ src/mu-str.c | 10 +++++----- 10 files changed, 40 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index b03ab496..04c59335 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ mug2 .desktop *html +/contrib/gmime-test diff --git a/NEWS b/NEWS index e1330f21..86eb79e1 100644 --- a/NEWS +++ b/NEWS @@ -2,9 +2,9 @@ ** Release 0.9.6 < not yet > - - FreeBSD build fix + - FreeBSD build fix - fix matching for mu cfind to be as expected - - wildcard searches for all fields (except for path/maildir) + - wildcard searches ('*') for fields (except for path/maildir) - search for attachment file names (with 'a:'/'attach:') -- also works with wildcards - remove --xquery completely; use --output=xquery instead @@ -110,4 +110,4 @@ # Local Variables: # mode: org; org-startup-folded: nil -# End +# End: diff --git a/configure.ac b/configure.ac index a856f3f4..cf773443 100644 --- a/configure.ac +++ b/configure.ac @@ -14,14 +14,14 @@ ## along with this program; if not, write to the Free Software Foundation, ## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -AC_INIT([mu],[0.9.6],[http://code.google.com/p/mu0/issues/list]) +AC_INIT([mu],[0.9.6],[http://code.google.com/p/mu0/issues/list],[mu]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_SRCDIR([src/mu.cc]) -AM_INIT_AUTOMAKE([dist-bzip2]) - # libtoolize wants to put some stuff in here; if you have an old # autotools/libtool setup. you can try to comment this out AC_CONFIG_MACRO_DIR([m4]) +AM_INIT_AUTOMAKE([dist-bzip2]) + # silent build if we have a new enough automake m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) @@ -36,10 +36,16 @@ AS_IF([test x$prefix = xNONE],[ AC_SUBST(prefix) AC_PROG_CC +AC_PROG_CC_C_O AC_PROG_CC_STDC +AC_PROG_INSTALL AC_PROG_CXX AC_HEADER_STDC +# use the 64-bit versions +AC_SYS_LARGEFILE + + # we need some special tricks for filesystems that don't have d_type; # e.g. Solaris. See mu-maildir.c. Explicitly disabling it is for # testing purposes only diff --git a/src/mu-cmd-find.c b/src/mu-cmd-find.c index faf9eafa..068fa654 100644 --- a/src/mu-cmd-find.c +++ b/src/mu-cmd-find.c @@ -1,3 +1,5 @@ +/* -*-mode: c; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-*/ + /* ** Copyright (C) 2008-2011 Dirk-Jan C. Binnema ** diff --git a/src/mu-cmd-index.c b/src/mu-cmd-index.c index 7ec81410..c9500ac8 100644 --- a/src/mu-cmd-index.c +++ b/src/mu-cmd-index.c @@ -1,3 +1,5 @@ +/* -*-mode: c; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-*/ + /* ** Copyright (C) 2008-2011 Dirk-Jan C. Binnema ** @@ -107,7 +109,8 @@ static gboolean check_maildir (const char *maildir) { if (!maildir) { - g_warning ("no maildir to work on; use --maildir= to set it explicitly"); + g_warning ("no maildir to work on; " + "use --maildir= to set it explicitly"); return FALSE; } diff --git a/src/mu-cmd.h b/src/mu-cmd.h index 11e0e1f0..891813ab 100644 --- a/src/mu-cmd.h +++ b/src/mu-cmd.h @@ -1,5 +1,7 @@ +/* -*-mode: c; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-*/ + /* -** Copyright (C) 2008-2010 Dirk-Jan C. Binnema +** Copyright (C) 2008-2011 Dirk-Jan C. Binnema ** ** This program is free software; you can redistribute it and/or modify it ** under the terms of the GNU General Public License as published by the diff --git a/src/mu-msg-priv.h b/src/mu-msg-priv.h index ac199c0d..862b497e 100644 --- a/src/mu-msg-priv.h +++ b/src/mu-msg-priv.h @@ -1,3 +1,5 @@ +/* -*-mode: c; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-*/ + /* ** Copyright (C) 2008-2011 Dirk-Jan C. Binnema ** @@ -23,10 +25,10 @@ #include #include -#include "mu-msg.h" -#include "mu-msg-file.h" -#include "mu-msg-doc.h" -#include "mu-msg-cache.h" +#include +#include +#include +#include G_BEGIN_DECLS diff --git a/src/mu-output.c b/src/mu-output.c index 549b7ea6..279222e1 100644 --- a/src/mu-output.c +++ b/src/mu-output.c @@ -1,3 +1,5 @@ +/* -*-mode: c; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-*/ + /* ** Copyright (C) 2008-2011 Dirk-Jan C. Binnema ** @@ -51,6 +53,7 @@ create_linksdir_maybe (const char *linksdir, gboolean clearlinks) } else if (clearlinks) if (!mu_maildir_clear_links (linksdir, &err)) goto fail; + return TRUE; fail: @@ -79,7 +82,8 @@ link_message (const char *src, const char *destdir) err = NULL; if (!mu_maildir_link (src, destdir, &err)) { if (err) { - g_warning ("%s", err->message ? err->message : "unknown error"); + g_warning ("%s", err->message ? + err->message : "unknown error"); g_error_free (err); } return FALSE; diff --git a/src/mu-output.h b/src/mu-output.h index 2620850b..5eddf057 100644 --- a/src/mu-output.h +++ b/src/mu-output.h @@ -1,3 +1,5 @@ +/* -*-mode: c; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-*/ + /* ** Copyright (C) 2008-2011 Dirk-Jan C. Binnema ** diff --git a/src/mu-str.c b/src/mu-str.c index af717a00..14ab3a83 100644 --- a/src/mu-str.c +++ b/src/mu-str.c @@ -253,9 +253,9 @@ each_check_prefix (MuMsgFieldId mfid, CheckPrefix *cpfx) } } -/* colon is a position inside q pointing at a ':' character. function - * determines whether the prefix is a registered prefix (like - * 'subject' or 'from' or 's') */ +/* 'colon' points at a position inside q pointing at a ':' + * character. function determines whether the prefix is a registered + * prefix (like 'subject' or 'from' or 's') */ static gboolean is_xapian_prefix (const char *q, const char *colon) { @@ -312,9 +312,9 @@ mu_str_date_parse_hdwmy (const char* str) delta = num * 24 * 60 * 60; break; case 'w': /* week */ delta = num * 7 * 24 * 60 * 60; break; - case 'm': + case 'm': /* month */ delta = num * 30 * 24 * 60 * 60; break; - case 'y': + case 'y': /* year */ delta = num * 365 * 24 * 60 * 60; break; default: return never;