mirror of
https://github.com/flatpak/flatpak.git
synced 2026-01-30 02:21:17 -05:00
e8816b7663
Uncrustify has an option "nl_func_var_def_blk" which is supposed to ensure there's a newline character between the block of variable definitions and the rest of the function body, but it gets confused and thinks that the first instance of "g_autoptr" or "g_auto" being used on a variable is the start of the function body. So this commit removes those extra newline characters and removes that option in uncrustify.cfg so they don't get re-added the next time uncrustify is run. Here's the command I used: perl -0777 -i -pe 's/\n(\n\s*g_auto\()/\1/g' `git ls-tree --name-only -r HEAD | grep \\\.[ch]$ | grep -v common/valgrind-private.h | grep -v app/flatpak-polkit-agent-text-listener\\\.[ch]` I ran it again with "g_autoptr" in place of "g_auto", and made a few manual edits to add back the newline when the g_auto* was in the middle of a function body rather than at the top. Closes: #2715 Approved by: matthiasclasen