diff options
author | Matthew Leeds <matthew.leeds@endlessm.com> | 2019-02-22 17:54:40 -0800 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2019-02-25 18:12:30 +0000 |
commit | e8816b766304a58fca6c7cd59edb140e272778f9 (patch) | |
tree | 1611d4ba5d67694c254f7995b25be92627662f3f /common/flatpak-related-ref.c | |
parent | a0d3d65476888a8a73238c686d660205b0c95ed4 (diff) | |
download | flatpak-e8816b766304a58fca6c7cd59edb140e272778f9.tar.gz |
Remove extra newlines in variable definiton blocks
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
Diffstat (limited to 'common/flatpak-related-ref.c')
-rw-r--r-- | common/flatpak-related-ref.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/common/flatpak-related-ref.c b/common/flatpak-related-ref.c index ec4c6860..27f52f3f 100644 --- a/common/flatpak-related-ref.c +++ b/common/flatpak-related-ref.c @@ -277,7 +277,6 @@ flatpak_related_ref_new (const char *collection_id, { FlatpakRefKind kind = FLATPAK_REF_KIND_APP; FlatpakRelatedRef *ref; - g_auto(GStrv) parts = NULL; parts = g_strsplit (full_ref, "/", -1); |