clang-format: update c/cc coding style

Update all cc code using .clang-format; please do so as well for future PRs
etc.; emacs has a handy 'clang-format' mode to make this automatic.

For comparing old changes with git blame, we can disregard this one using
--ignore-rev

(see https://www.moxio.com/blog/43/ignoring-bulk-change-commits-with-git-blame )
This commit is contained in:
Dirk-Jan C. Binnema
2021-10-20 12:18:15 +03:00
parent 09935cc4b3
commit 3dd721d5a3
111 changed files with 13851 additions and 14579 deletions

View File

@ -31,338 +31,327 @@
#include "mu-store.hh"
#include "mu-query.hh"
static gchar *CONTACTS_CACHE = NULL;
static gchar* CONTACTS_CACHE = NULL;
static gchar*
fill_contacts_cache (void)
fill_contacts_cache(void)
{
gchar *cmdline, *tmpdir;
GError *err;
gchar * cmdline, *tmpdir;
GError* err;
tmpdir = test_mu_common_get_random_tmpdir();
cmdline = g_strdup_printf (
"/bin/sh -c '"
"%s init --muhome=%s --maildir=%s --quiet; "
"%s index --muhome=%s --quiet'",
MU_PROGRAM, tmpdir, MU_TESTMAILDIR,
MU_PROGRAM, tmpdir);
tmpdir = test_mu_common_get_random_tmpdir();
cmdline = g_strdup_printf("/bin/sh -c '"
"%s init --muhome=%s --maildir=%s --quiet; "
"%s index --muhome=%s --quiet'",
MU_PROGRAM,
tmpdir,
MU_TESTMAILDIR,
MU_PROGRAM,
tmpdir);
if (g_test_verbose())
g_print ("%s\n", cmdline);
g_print("%s\n", cmdline);
err = NULL;
if (!g_spawn_command_line_sync (cmdline, NULL, NULL,
NULL, &err)) {
g_printerr ("Error: %s\n", err ? err->message : "?");
g_assert (0);
err = NULL;
if (!g_spawn_command_line_sync(cmdline, NULL, NULL, NULL, &err)) {
g_printerr("Error: %s\n", err ? err->message : "?");
g_assert(0);
}
g_free (cmdline);
g_free(cmdline);
return tmpdir;
}
static void
test_mu_cfind_plain (void)
test_mu_cfind_plain(void)
{
gchar *cmdline, *output, *erroutput;
cmdline = g_strdup_printf ("%s cfind --muhome=%s --format=plain "
"'testmu\\.xxx?'",
MU_PROGRAM, CONTACTS_CACHE);
cmdline = g_strdup_printf("%s cfind --muhome=%s --format=plain "
"'testmu\\.xxx?'",
MU_PROGRAM,
CONTACTS_CACHE);
if (g_test_verbose())
g_print ("%s\n", cmdline);
g_print("%s\n", cmdline);
output = erroutput = NULL;
g_assert (g_spawn_command_line_sync (cmdline, &output, &erroutput,
NULL, NULL));
g_assert(g_spawn_command_line_sync(cmdline, &output, &erroutput, NULL, NULL));
/* note, output order is unspecified */
g_assert (output);
g_assert(output);
if (output[0] == 'H')
g_assert_cmpstr (output,
==,
"Helmut Kröger hk@testmu.xxx\n"
"Mü testmu@testmu.xx\n");
g_assert_cmpstr(output,
==,
"Helmut Kröger hk@testmu.xxx\n"
"Mü testmu@testmu.xx\n");
else
g_assert_cmpstr (output,
==,
"Mü testmu@testmu.xx\n"
"Helmut Kröger hk@testmu.xxx\n");
g_free (cmdline);
g_free (output);
g_free (erroutput);
g_assert_cmpstr(output,
==,
"Mü testmu@testmu.xx\n"
"Helmut Kröger hk@testmu.xxx\n");
g_free(cmdline);
g_free(output);
g_free(erroutput);
}
static void
test_mu_cfind_bbdb (void)
test_mu_cfind_bbdb(void)
{
gchar *cmdline, *output, *erroutput, *expected;
gchar today[12];
struct tm *tmtoday;
time_t now;
const char *old_tz;
gchar * cmdline, *output, *erroutput, *expected;
gchar today[12];
struct tm* tmtoday;
time_t now;
const char* old_tz;
old_tz = set_tz ("Europe/Helsinki");
old_tz = set_tz("Europe/Helsinki");
cmdline = g_strdup_printf ("%s cfind --muhome=%s --format=bbdb "
"'testmu\\.xxx?'",
MU_PROGRAM, CONTACTS_CACHE);
cmdline = g_strdup_printf("%s cfind --muhome=%s --format=bbdb "
"'testmu\\.xxx?'",
MU_PROGRAM,
CONTACTS_CACHE);
output = erroutput = NULL;
g_assert (g_spawn_command_line_sync (cmdline, &output, &erroutput,
NULL, NULL));
g_assert(g_spawn_command_line_sync(cmdline, &output, &erroutput, NULL, NULL));
#define frm1 ";; -*-coding: utf-8-emacs;-*-\n" \
";;; file-version: 6\n" \
"[\"Helmut\" \"Kröger\" nil nil nil nil (\"hk@testmu.xxx\") " \
"((creation-date . \"%s\") " \
"(time-stamp . \"1970-01-01\")) nil]\n" \
"[\"Mü\" \"\" nil nil nil nil (\"testmu@testmu.xx\") " \
"((creation-date . \"%s\") " \
"(time-stamp . \"1970-01-01\")) nil]\n"
#define frm1 \
";; -*-coding: utf-8-emacs;-*-\n" \
";;; file-version: 6\n" \
"[\"Helmut\" \"Kröger\" nil nil nil nil (\"hk@testmu.xxx\") " \
"((creation-date . \"%s\") " \
"(time-stamp . \"1970-01-01\")) nil]\n" \
"[\"Mü\" \"\" nil nil nil nil (\"testmu@testmu.xx\") " \
"((creation-date . \"%s\") " \
"(time-stamp . \"1970-01-01\")) nil]\n"
#define frm2 \
";; -*-coding: utf-8-emacs;-*-\n" \
";;; file-version: 6\n" \
"[\"Mü\" \"\" nil nil nil nil (\"testmu@testmu.xx\") " \
"((creation-date . \"%s\") " \
"(time-stamp . \"1970-01-01\")) nil]\n" \
"[\"Helmut\" \"Kröger\" nil nil nil nil (\"hk@testmu.xxx\") " \
"((creation-date . \"%s\") " \
"(time-stamp . \"1970-01-01\")) nil]\n"
#define frm2 ";; -*-coding: utf-8-emacs;-*-\n" \
";;; file-version: 6\n" \
"[\"Mü\" \"\" nil nil nil nil (\"testmu@testmu.xx\") " \
"((creation-date . \"%s\") " \
"(time-stamp . \"1970-01-01\")) nil]\n" \
"[\"Helmut\" \"Kröger\" nil nil nil nil (\"hk@testmu.xxx\") " \
"((creation-date . \"%s\") " \
"(time-stamp . \"1970-01-01\")) nil]\n"
g_assert(output);
g_assert (output);
now = time(NULL);
now = time(NULL);
tmtoday = localtime(&now);
strftime(today,sizeof(today),"%Y-%m-%d", tmtoday);
strftime(today, sizeof(today), "%Y-%m-%d", tmtoday);
expected = g_strdup_printf (output[52] == 'H' ? frm1 : frm2,
today, today);
expected = g_strdup_printf(output[52] == 'H' ? frm1 : frm2, today, today);
/* g_print ("\n%s\n", output); */
g_assert_cmpstr (output, ==, expected);
g_assert_cmpstr(output, ==, expected);
g_free (cmdline);
g_free (output);
g_free (erroutput);
g_free (expected);
g_free(cmdline);
g_free(output);
g_free(erroutput);
g_free(expected);
set_tz (old_tz);
set_tz(old_tz);
}
static void
test_mu_cfind_wl (void)
test_mu_cfind_wl(void)
{
gchar *cmdline, *output, *erroutput;
cmdline = g_strdup_printf ("%s cfind --muhome=%s --format=wl "
"'testmu\\.xxx?'",
MU_PROGRAM, CONTACTS_CACHE);
cmdline = g_strdup_printf("%s cfind --muhome=%s --format=wl "
"'testmu\\.xxx?'",
MU_PROGRAM,
CONTACTS_CACHE);
output = erroutput = NULL;
g_assert (g_spawn_command_line_sync (cmdline, &output, &erroutput,
NULL, NULL));
g_assert(g_spawn_command_line_sync(cmdline, &output, &erroutput, NULL, NULL));
g_assert (output);
g_assert(output);
if (output[0] == 'h')
g_assert_cmpstr (output,
==,
"hk@testmu.xxx \"HelmutK\" \"Helmut Kröger\"\n"
"testmu@testmu.xx \"\" \"\"\n");
g_assert_cmpstr(output,
==,
"hk@testmu.xxx \"HelmutK\" \"Helmut Kröger\"\n"
"testmu@testmu.xx \"\" \"\"\n");
else
g_assert_cmpstr (output,
==,
"testmu@testmu.xx \"\" \"\"\n"
"hk@testmu.xxx \"HelmutK\" \"Helmut Kröger\"\n");
g_assert_cmpstr(output,
==,
"testmu@testmu.xx \"\" \"\"\n"
"hk@testmu.xxx \"HelmutK\" \"Helmut Kröger\"\n");
g_free (cmdline);
g_free (output);
g_free (erroutput);
g_free(cmdline);
g_free(output);
g_free(erroutput);
}
static void
test_mu_cfind_mutt_alias (void)
test_mu_cfind_mutt_alias(void)
{
gchar *cmdline, *output, *erroutput;
cmdline = g_strdup_printf ("%s cfind --muhome=%s --format=mutt-alias "
"'testmu\\.xxx?'",
MU_PROGRAM, CONTACTS_CACHE);
cmdline = g_strdup_printf("%s cfind --muhome=%s --format=mutt-alias "
"'testmu\\.xxx?'",
MU_PROGRAM,
CONTACTS_CACHE);
output = erroutput = NULL;
g_assert (g_spawn_command_line_sync (cmdline, &output, &erroutput,
NULL, NULL));
g_assert(g_spawn_command_line_sync(cmdline, &output, &erroutput, NULL, NULL));
/* both orders are possible... */
g_assert (output);
g_assert(output);
if (output[6] == 'H')
g_assert_cmpstr (output,
==,
"alias HelmutK Helmut Kröger <hk@testmu.xxx>\n"
"alias Mü Mü <testmu@testmu.xx>\n");
g_assert_cmpstr(output,
==,
"alias HelmutK Helmut Kröger <hk@testmu.xxx>\n"
"alias Mü Mü <testmu@testmu.xx>\n");
else
g_assert_cmpstr (output,
==,
"alias Mü Mü <testmu@testmu.xx>\n"
"alias HelmutK Helmut Kröger <hk@testmu.xxx>\n");
g_assert_cmpstr(output,
==,
"alias Mü Mü <testmu@testmu.xx>\n"
"alias HelmutK Helmut Kröger <hk@testmu.xxx>\n");
g_free (cmdline);
g_free (output);
g_free (erroutput);
g_free(cmdline);
g_free(output);
g_free(erroutput);
}
static void
test_mu_cfind_mutt_ab (void)
test_mu_cfind_mutt_ab(void)
{
gchar *cmdline, *output, *erroutput;
cmdline = g_strdup_printf ("%s cfind --muhome=%s --format=mutt-ab "
"'testmu\\.xxx?'",
MU_PROGRAM, CONTACTS_CACHE);
cmdline = g_strdup_printf("%s cfind --muhome=%s --format=mutt-ab "
"'testmu\\.xxx?'",
MU_PROGRAM,
CONTACTS_CACHE);
if (g_test_verbose())
g_print("%s\n", cmdline);
output = erroutput = NULL;
g_assert (g_spawn_command_line_sync (cmdline, &output, &erroutput,
NULL, NULL));
g_assert (output);
g_assert(g_spawn_command_line_sync(cmdline, &output, &erroutput, NULL, NULL));
g_assert(output);
if (output[39] == 'h')
g_assert_cmpstr (output,
==,
"Matching addresses in the mu database:\n"
"hk@testmu.xxx\tHelmut Kröger\t\n"
"testmu@testmu.xx\t\t\n");
g_assert_cmpstr(output,
==,
"Matching addresses in the mu database:\n"
"hk@testmu.xxx\tHelmut Kröger\t\n"
"testmu@testmu.xx\t\t\n");
else
g_assert_cmpstr (output,
==,
"Matching addresses in the mu database:\n"
"testmu@testmu.xx\t\t\n"
"hk@testmu.xxx\tHelmut Kröger\t\n");
g_assert_cmpstr(output,
==,
"Matching addresses in the mu database:\n"
"testmu@testmu.xx\t\t\n"
"hk@testmu.xxx\tHelmut Kröger\t\n");
g_free (cmdline);
g_free (output);
g_free (erroutput);
g_free(cmdline);
g_free(output);
g_free(erroutput);
}
static void
test_mu_cfind_org_contact (void)
{
gchar*cmdline, *output, *erroutput;
cmdline = g_strdup_printf ("%s cfind --muhome=%s --format=org-contact "
"'testmu\\.xxx?'",
MU_PROGRAM, CONTACTS_CACHE);
output = erroutput = NULL;
g_assert (g_spawn_command_line_sync (cmdline, &output, &erroutput,
NULL, NULL));
g_assert (output);
if (output[2] == 'H')
g_assert_cmpstr (output,
==,
"* Helmut Kröger\n"
":PROPERTIES:\n"
":EMAIL: hk@testmu.xxx\n"
":END:\n\n"
"* Mü\n"
":PROPERTIES:\n"
":EMAIL: testmu@testmu.xx\n"
":END:\n\n");
else
g_assert_cmpstr (output,
==,
"* Mü\n"
":PROPERTIES:\n"
":EMAIL: testmu@testmu.xx\n"
":END:\n\n"
"* Helmut Kröger\n"
":PROPERTIES:\n"
":EMAIL: hk@testmu.xxx\n"
":END:\n\n");
g_free (cmdline);
g_free (output);
g_free (erroutput);
}
static void
test_mu_cfind_csv (void)
test_mu_cfind_org_contact(void)
{
gchar *cmdline, *output, *erroutput;
cmdline = g_strdup_printf ("%s cfind --muhome=%s --format=csv "
"'testmu\\.xxx?'",
MU_PROGRAM, CONTACTS_CACHE);
cmdline = g_strdup_printf("%s cfind --muhome=%s --format=org-contact "
"'testmu\\.xxx?'",
MU_PROGRAM,
CONTACTS_CACHE);
output = erroutput = NULL;
g_assert(g_spawn_command_line_sync(cmdline, &output, &erroutput, NULL, NULL));
g_assert(output);
if (output[2] == 'H')
g_assert_cmpstr(output,
==,
"* Helmut Kröger\n"
":PROPERTIES:\n"
":EMAIL: hk@testmu.xxx\n"
":END:\n\n"
"* Mü\n"
":PROPERTIES:\n"
":EMAIL: testmu@testmu.xx\n"
":END:\n\n");
else
g_assert_cmpstr(output,
==,
"* Mü\n"
":PROPERTIES:\n"
":EMAIL: testmu@testmu.xx\n"
":END:\n\n"
"* Helmut Kröger\n"
":PROPERTIES:\n"
":EMAIL: hk@testmu.xxx\n"
":END:\n\n");
g_free(cmdline);
g_free(output);
g_free(erroutput);
}
static void
test_mu_cfind_csv(void)
{
gchar *cmdline, *output, *erroutput;
cmdline = g_strdup_printf("%s cfind --muhome=%s --format=csv "
"'testmu\\.xxx?'",
MU_PROGRAM,
CONTACTS_CACHE);
if (g_test_verbose())
g_print("%s\n", cmdline);
output = erroutput = NULL;
g_assert (g_spawn_command_line_sync (cmdline, &output, &erroutput,
NULL, NULL));
g_assert (output);
g_assert(g_spawn_command_line_sync(cmdline, &output, &erroutput, NULL, NULL));
g_assert(output);
if (output[1] == 'H')
g_assert_cmpstr (output,
==,
"\"Helmut Kröger\",\"hk@testmu.xxx\"\n"
"\"\",\"testmu@testmu.xx\"\n");
g_assert_cmpstr(output,
==,
"\"Helmut Kröger\",\"hk@testmu.xxx\"\n"
"\"\",\"testmu@testmu.xx\"\n");
else
g_assert_cmpstr (output,
==,
"\"\",\"testmu@testmu.xx\"\n"
"\"Helmut Kröger\",\"hk@testmu.xxx\"\n");
g_free (cmdline);
g_free (output);
g_free (erroutput);
g_assert_cmpstr(output,
==,
"\"\",\"testmu@testmu.xx\"\n"
"\"Helmut Kröger\",\"hk@testmu.xxx\"\n");
g_free(cmdline);
g_free(output);
g_free(erroutput);
}
int
main (int argc, char *argv[])
main(int argc, char* argv[])
{
int rv;
g_test_init (&argc, &argv, NULL);
g_test_init(&argc, &argv, NULL);
if (!set_en_us_utf8_locale())
return 0; /* don't error out... */
CONTACTS_CACHE = fill_contacts_cache ();
CONTACTS_CACHE = fill_contacts_cache();
g_test_add_func ("/mu-cmd-cfind/test-mu-cfind-plain", test_mu_cfind_plain);
g_test_add_func ("/mu-cmd-cfind/test-mu-cfind-bbdb", test_mu_cfind_bbdb);
g_test_add_func ("/mu-cmd-cfind/test-mu-cfind-wl", test_mu_cfind_wl);
g_test_add_func ("/mu-cmd-cfind/test-mu-cfind-mutt-alias",
test_mu_cfind_mutt_alias);
g_test_add_func ("/mu-cmd-cfind/test-mu-cfind-mutt-ab",
test_mu_cfind_mutt_ab);
g_test_add_func ("/mu-cmd-cfind/test-mu-cfind-org-contact",
test_mu_cfind_org_contact);
g_test_add_func ("/mu-cmd-cfind/test-mu-cfind-csv",
test_mu_cfind_csv);
g_test_add_func("/mu-cmd-cfind/test-mu-cfind-plain", test_mu_cfind_plain);
g_test_add_func("/mu-cmd-cfind/test-mu-cfind-bbdb", test_mu_cfind_bbdb);
g_test_add_func("/mu-cmd-cfind/test-mu-cfind-wl", test_mu_cfind_wl);
g_test_add_func("/mu-cmd-cfind/test-mu-cfind-mutt-alias", test_mu_cfind_mutt_alias);
g_test_add_func("/mu-cmd-cfind/test-mu-cfind-mutt-ab", test_mu_cfind_mutt_ab);
g_test_add_func("/mu-cmd-cfind/test-mu-cfind-org-contact", test_mu_cfind_org_contact);
g_test_add_func("/mu-cmd-cfind/test-mu-cfind-csv", test_mu_cfind_csv);
g_log_set_handler (NULL,
(GLogLevelFlags)(
G_LOG_LEVEL_MASK | G_LOG_LEVEL_WARNING|
G_LOG_FLAG_FATAL| G_LOG_FLAG_RECURSION),
(GLogFunc)black_hole, NULL);
g_log_set_handler(NULL,
(GLogLevelFlags)(G_LOG_LEVEL_MASK | G_LOG_LEVEL_WARNING |
G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION),
(GLogFunc)black_hole,
NULL);
rv = g_test_run ();
rv = g_test_run();
g_free (CONTACTS_CACHE);
g_free(CONTACTS_CACHE);
CONTACTS_CACHE = NULL;
return rv;