From 321e747882f97a82b4365ca01171b0ca27a136ed Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Tue, 3 Aug 2021 12:47:20 +0300 Subject: [PATCH] update (c) year And some whitespace cleanup. The (c) year doesn't matter too much, but let's close the ticket. Fixes: #2075. --- configure.ac | 2 +- mu/mu.cc | 118 +++++++++++++++++++++++++-------------------------- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/configure.ac b/configure.ac index 66d75595..b540584d 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ AC_PREREQ([2.68]) AC_INIT([mu],[1.6.1],[https://github.com/djcb/mu/issues],[mu]) -AC_COPYRIGHT([Copyright (C) 2008-2020 Dirk-Jan C. Binnema]) +AC_COPYRIGHT([Copyright (C) 2008-2021 Dirk-Jan C. Binnema]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_SRCDIR([mu/mu.cc]) # libtoolize wants to put some stuff in here; if you have an old diff --git a/mu/mu.cc b/mu/mu.cc index 9dff2aee..fb907a05 100644 --- a/mu/mu.cc +++ b/mu/mu.cc @@ -1,5 +1,5 @@ /* -** Copyright (C) 2008-2020 Dirk-Jan C. Binnema +** Copyright (C) 2008-2021 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 @@ -33,16 +33,16 @@ using namespace Mu; static void show_version (void) { - const char* blurb = - "mu (mail indexer/searcher) version " VERSION "\n" - "Copyright (C) 2008-2020 Dirk-Jan C. Binnema\n" - "License GPLv3+: GNU GPL version 3 or later " - ".\n" - "This is free software: you are free to change " - "and redistribute it.\n" - "There is NO WARRANTY, to the extent permitted by law."; + const char* blurb = + "mu (mail indexer/searcher) version " VERSION "\n" + "Copyright (C) 2008-2021 Dirk-Jan C. Binnema\n" + "License GPLv3+: GNU GPL version 3 or later " + ".\n" + "This is free software: you are free to change " + "and redistribute it.\n" + "There is NO WARRANTY, to the extent permitted by law."; - g_print ("%s\n", blurb); + g_print ("%s\n", blurb); } @@ -50,12 +50,12 @@ static void handle_error (MuConfig *conf, MuError merr, GError **err) { if (!(err && *err)) - return; + return; using Color = MaybeAnsi::Color; MaybeAnsi col{conf ? !conf->nocolor : false}; - if (*err) + if (*err) std::cerr << col.fg(Color::Red) << "error" << col.reset() << ": " << col.fg(Color::BrightYellow) << ((*err) ? (*err)->message : "something when wrong") @@ -63,35 +63,35 @@ handle_error (MuConfig *conf, MuError merr, GError **err) std::cerr << col.fg(Color::Green); - switch ((*err)->code) { - case MU_ERROR_XAPIAN_CANNOT_GET_WRITELOCK: - std::cerr << "Maybe mu is already running?\n"; - break; + switch ((*err)->code) { + case MU_ERROR_XAPIAN_CANNOT_GET_WRITELOCK: + std::cerr << "Maybe mu is already running?\n"; + break; case MU_ERROR_XAPIAN_NEEDS_REINDEX: std::cerr << "Database needs (re)indexing.\n" << "try 'mu index' " << "(see mu-index(1) for details)\n"; - return; - case MU_ERROR_IN_PARAMETERS: - if (conf && mu_config_cmd_is_valid(conf->cmd)) - mu_config_show_help (conf->cmd); - break; - case MU_ERROR_SCRIPT_NOT_FOUND: - std::cerr << "See the mu manpage for commands, or " + return; + case MU_ERROR_IN_PARAMETERS: + if (conf && mu_config_cmd_is_valid(conf->cmd)) + mu_config_show_help (conf->cmd); + break; + case MU_ERROR_SCRIPT_NOT_FOUND: + std::cerr << "See the mu manpage for commands, or " << "'mu script' for the scripts\n"; - break; - case MU_ERROR_XAPIAN_CANNOT_OPEN: - std::cerr << "Please (re)initialize mu with 'mu init' " + break; + case MU_ERROR_XAPIAN_CANNOT_OPEN: + std::cerr << "Please (re)initialize mu with 'mu init' " << "see mu-init(1) for details\n"; - return; - case MU_ERROR_XAPIAN_SCHEMA_MISMATCH: - std::cerr << "Please (re)initialize mu with 'mu init' " + return; + case MU_ERROR_XAPIAN_SCHEMA_MISMATCH: + std::cerr << "Please (re)initialize mu with 'mu init' " << "see mu-init(1) for details\n"; - return; - default: - break; /* nothing to do */ - } + return; + default: + break; /* nothing to do */ + } std::cerr << col.reset(); } @@ -100,41 +100,41 @@ handle_error (MuConfig *conf, MuError merr, GError **err) int main (int argc, char *argv[]) { - GError *err; - MuError rv; - MuConfig *conf; + GError *err; + MuError rv; + MuConfig *conf; - setlocale (LC_ALL, ""); + setlocale (LC_ALL, ""); - err = NULL; - rv = MU_OK; + err = NULL; + rv = MU_OK; - conf = mu_config_init (&argc, &argv, &err); - if (!conf) { - rv = err ? (MuError)err->code : MU_ERROR; - goto cleanup; - } else if (conf->version) { - show_version (); - goto cleanup; - } + conf = mu_config_init (&argc, &argv, &err); + if (!conf) { + rv = err ? (MuError)err->code : MU_ERROR; + goto cleanup; + } else if (conf->version) { + show_version (); + goto cleanup; + } - /* nothing to do */ - if (conf->cmd == MU_CONFIG_CMD_NONE) - return 0; + /* nothing to do */ + if (conf->cmd == MU_CONFIG_CMD_NONE) + return 0; - if (!mu_runtime_init (conf->muhome, PACKAGE_NAME, conf->debug)) { - mu_config_uninit (conf); - return 1; - } + if (!mu_runtime_init (conf->muhome, PACKAGE_NAME, conf->debug)) { + mu_config_uninit (conf); + return 1; + } - rv = mu_cmd_execute (conf, &err); + rv = mu_cmd_execute (conf, &err); cleanup: handle_error (conf, rv, &err); - g_clear_error (&err); + g_clear_error (&err); - mu_config_uninit (conf); - mu_runtime_uninit (); + mu_config_uninit (conf); + mu_runtime_uninit (); - return rv; + return rv; }