diff options
| author | Přemysl Eric Janouch <p@janouch.name> | 2021-10-29 08:16:49 +0200 |
|---|---|---|
| committer | Přemysl Eric Janouch <p@janouch.name> | 2021-10-30 03:02:33 +0200 |
| commit | e383a50af724b229115abb927521b4480cf41265 (patch) | |
| tree | 9adf075322944305f25e14658de88d027cd9ce7c | |
| parent | ed26259e6dba4600c8d4ad0423e3e700312ab4be (diff) | |
| download | tdv-e383a50af724b229115abb927521b4480cf41265.tar.gz tdv-e383a50af724b229115abb927521b4480cf41265.tar.xz tdv-e383a50af724b229115abb927521b4480cf41265.zip | |
Add clang-format configuration, clean up
| -rw-r--r-- | .clang-format | 32 | ||||
| -rw-r--r-- | src/sdgui.c | 1 | ||||
| -rw-r--r-- | src/sdtui.c | 2 |
3 files changed, 33 insertions, 2 deletions
diff --git a/.clang-format b/.clang-format new file mode 100644 index 0000000..0be3dd2 --- /dev/null +++ b/.clang-format @@ -0,0 +1,32 @@ +# clang-format is fairly limited, and these rules are approximate: +# - array initializers can get terribly mangled with clang-format 12.0, +# - sometimes it still aligns with space characters, +# - struct name NL { NL ... NL } NL name; is unachievable. +BasedOnStyle: GNU +ColumnLimit: 80 +IndentWidth: 4 +TabWidth: 4 +UseTab: ForContinuationAndIndentation +BreakBeforeBraces: Allman +SpaceAfterCStyleCast: true +AlignAfterOpenBracket: DontAlign +AlignEscapedNewlines: DontAlign +AlignOperands: DontAlign +AlignConsecutiveMacros: Consecutive +AllowAllArgumentsOnNextLine: false +AllowAllParametersOfDeclarationOnNextLine: false +IndentGotoLabels: false +MaxEmptyLinesToKeep: 2 + +# IncludeCategories has some potential, but it may also break the build. +# Note that the documentation says the value should be "Never". +SortIncludes: false + +# Must be kept synchronized with gi18n.h and make-template.sh. +WhitespaceSensitiveMacros: ['_', 'Q_', 'N_', 'C_', 'NC_'] + +# This is a compromise, it generally works out aesthetically better. +BinPackArguments: false + +# Unfortunately, this can't be told to align to column 40 or so. +SpacesBeforeTrailingComments: 2 diff --git a/src/sdgui.c b/src/sdgui.c index 9589fa9..d0e9fc9 100644 --- a/src/sdgui.c +++ b/src/sdgui.c @@ -305,7 +305,6 @@ on_open (G_GNUC_UNUSED GtkMenuItem *item, G_GNUC_UNUSED gpointer data) Dictionary *dict = g_malloc0 (sizeof *dict); dict->filename = iter->data; g_ptr_array_add (new_dictionaries, dict); - } g_slist_free (paths); } diff --git a/src/sdtui.c b/src/sdtui.c index f7cdb02..eae9b69 100644 --- a/src/sdtui.c +++ b/src/sdtui.c @@ -67,7 +67,7 @@ unichar_width (gunichar ch) void update_curses_terminal_size (void) { -#if defined (HAVE_RESIZETERM) && defined (TIOCGWINSZ) +#if defined HAVE_RESIZETERM && defined TIOCGWINSZ struct winsize size; if (!ioctl (STDOUT_FILENO, TIOCGWINSZ, (char *) &size)) { |