syntax-check: Remove empty lines at the end of file

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

63 files changed, 1 insertions, 64 deletions

diff --git a/.gitignore b/.gitignore
index 0372303d..f0a66791 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,4 +73,3 @@ test*.test
 *.tar.xz
 *.src.rpm
 packaging/*.spec
-
diff --git a/Makefile-boot.am b/Makefile-boot.am
index 5c8a7a55..01ed7470 100644
--- a/Makefile-boot.am
+++ b/Makefile-boot.am
@@ -55,4 +55,3 @@ EXTRA_DIST += src/boot/dracut/module-setup.sh \
 	src/boot/ostree-prepare-root.service \
 	src/boot/ostree-remount.service \
 	$(NULL)
-
diff --git a/cfg.mk b/cfg.mk
index ba235868..4f787eaa 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -20,7 +20,6 @@ local-checks-to-skip = \
     \
     sc_program_name \
     sc_bindtextdomain	 \
-    sc_prohibit_empty_lines_at_EOF \
     sc_prohibit_path_max_allocation \
     sc_trailing_blank \
 
@@ -28,4 +27,4 @@ local-checks-to-skip = \
 show-vc-list-except:
 	@$(VC_LIST_EXCEPT)
 
-VC_LIST_ALWAYS_EXCLUDE_REGEX = ^ABOUT-NLS|maint.mk$$
+VC_LIST_ALWAYS_EXCLUDE_REGEX = ^ABOUT-NLS|maint.mk|*.gpg$$
diff --git a/doc/ostree-sections.txt b/doc/ostree-sections.txt
index ceb1fa39..61b3f01c 100644
--- a/doc/ostree-sections.txt
+++ b/doc/ostree-sections.txt
@@ -388,4 +388,3 @@ OSTREE_TYPE_SYSROOT_UPGRADER
 ostree_sysroot_upgrader_get_type
 ostree_sysroot_upgrader_flags_get_type
 </SECTION>
-
diff --git a/src/boot/dracut/module-setup.sh b/src/boot/dracut/module-setup.sh
index a976991a..d8ee05ba 100755
--- a/src/boot/dracut/module-setup.sh
+++ b/src/boot/dracut/module-setup.sh
@@ -38,4 +38,3 @@ install() {
     ln_r "${systemdsystemunitdir}/ostree-prepare-root.service" \
         "${systemdsystemconfdir}/initrd-switch-root.target.wants/ostree-prepare-root.service"
 }
-
diff --git a/src/libostree/README-deltas.md b/src/libostree/README-deltas.md
index 28ebcc1e..9e09e45a 100644
--- a/src/libostree/README-deltas.md
+++ b/src/libostree/README-deltas.md
@@ -156,4 +156,3 @@ $ ostree --repo=/path/to/repo gendelta --from=gnome-ostree/3.10/x86_64-runtime -
 
 This is an obvious one - generate a delta from the last stable release
 to the current development head.
-
diff --git a/src/libostree/ostree-async-progress.h b/src/libostree/ostree-async-progress.h
index 66430139..81ed5ef6 100644
--- a/src/libostree/ostree-async-progress.h
+++ b/src/libostree/ostree-async-progress.h
@@ -67,4 +67,3 @@ void ostree_async_progress_set_uint64 (OstreeAsyncProgress       *self,
 void ostree_async_progress_finish (OstreeAsyncProgress *self);
 
 G_END_DECLS
-
diff --git a/src/libostree/ostree-bootconfig-parser.h b/src/libostree/ostree-bootconfig-parser.h
index 629d1718..7d1cffbb 100644
--- a/src/libostree/ostree-bootconfig-parser.h
+++ b/src/libostree/ostree-bootconfig-parser.h
@@ -55,4 +55,3 @@ const char *ostree_bootconfig_parser_get (OstreeBootconfigParser  *self,
 
 
 G_END_DECLS
-
diff --git a/src/libostree/ostree-bootloader-grub2.h b/src/libostree/ostree-bootloader-grub2.h
index dfea1837..8936aaa1 100644
--- a/src/libostree/ostree-bootloader-grub2.h
+++ b/src/libostree/ostree-bootloader-grub2.h
@@ -37,4 +37,3 @@ OstreeBootloaderGrub2 * _ostree_bootloader_grub2_new (OstreeSysroot *sysroot);
 gboolean _ostree_bootloader_grub2_generate_config (OstreeSysroot *sysroot, int bootversion, int target_fd, GCancellable *cancellable, GError **error);
 
 G_END_DECLS
-
diff --git a/src/libostree/ostree-bootloader-syslinux.h b/src/libostree/ostree-bootloader-syslinux.h
index 1023bbef..a20b0d0a 100644
--- a/src/libostree/ostree-bootloader-syslinux.h
+++ b/src/libostree/ostree-bootloader-syslinux.h
@@ -35,4 +35,3 @@ GType _ostree_bootloader_syslinux_get_type (void) G_GNUC_CONST;
 OstreeBootloaderSyslinux * _ostree_bootloader_syslinux_new (OstreeSysroot *sysroot);
 
 G_END_DECLS
-
diff --git a/src/libostree/ostree-bootloader.h b/src/libostree/ostree-bootloader.h
index cbb25aac..eb044300 100644
--- a/src/libostree/ostree-bootloader.h
+++ b/src/libostree/ostree-bootloader.h
@@ -66,4 +66,3 @@ gboolean _ostree_bootloader_write_config (OstreeBootloader  *self,
 gboolean _ostree_bootloader_is_atomic (OstreeBootloader  *self);
 
 G_END_DECLS
-
diff --git a/src/libostree/ostree-checksum-input-stream.h b/src/libostree/ostree-checksum-input-stream.h
index 88b1a0a2..2ec8e0c7 100644
--- a/src/libostree/ostree-checksum-input-stream.h
+++ b/src/libostree/ostree-checksum-input-stream.h
@@ -63,4 +63,3 @@ OstreeChecksumInputStream * ostree_checksum_input_stream_new          (GInputStr
                                                                        GChecksum      *checksum);
 
 G_END_DECLS
-
diff --git a/src/libostree/ostree-cmdprivate.c b/src/libostree/ostree-cmdprivate.c
index 9c2ac3bf..ea122434 100644
--- a/src/libostree/ostree-cmdprivate.c
+++ b/src/libostree/ostree-cmdprivate.c
@@ -47,4 +47,3 @@ ostree_cmd__private__ (void)
 
   return &table;
 }
-
diff --git a/src/libostree/ostree-cmdprivate.h b/src/libostree/ostree-cmdprivate.h
index c1a48fea..317a7592 100644
--- a/src/libostree/ostree-cmdprivate.h
+++ b/src/libostree/ostree-cmdprivate.h
@@ -32,4 +32,3 @@ const OstreeCmdPrivateVTable *
 ostree_cmd__private__ (void);
 
 G_END_DECLS
-
diff --git a/src/libostree/ostree-core-private.h b/src/libostree/ostree-core-private.h
index b5cf1ad6..402cc5d7 100644
--- a/src/libostree/ostree-core-private.h
+++ b/src/libostree/ostree-core-private.h
@@ -125,4 +125,3 @@ _ostree_detached_metadata_append_gpg_sig (GVariant   *existing_metadata,
                                           GBytes     *signature_bytes);
 
 G_END_DECLS
-
diff --git a/src/libostree/ostree-core.c b/src/libostree/ostree-core.c
index 08e0ea22..4858b14c 100644
--- a/src/libostree/ostree-core.c
+++ b/src/libostree/ostree-core.c
@@ -1854,4 +1854,3 @@ _ostree_detached_metadata_append_gpg_sig (GVariant   *existing_metadata,
   
   return g_variant_ref_sink (g_variant_builder_end (builder));
 }
-
diff --git a/src/libostree/ostree-deployment.h b/src/libostree/ostree-deployment.h
index daaa90d1..0dbe6f1b 100644
--- a/src/libostree/ostree-deployment.h
+++ b/src/libostree/ostree-deployment.h
@@ -60,4 +60,3 @@ OstreeDeployment *ostree_deployment_clone (OstreeDeployment *self);
 
 
 G_END_DECLS
-
diff --git a/src/libostree/ostree-diff.h b/src/libostree/ostree-diff.h
index 6a56e3ab..ea6db03d 100644
--- a/src/libostree/ostree-diff.h
+++ b/src/libostree/ostree-diff.h
@@ -68,4 +68,3 @@ void ostree_diff_print (GFile          *a,
                         GPtrArray      *added);
 
 G_END_DECLS
-
diff --git a/src/libostree/ostree-kernel-args.h b/src/libostree/ostree-kernel-args.h
index 30170e99..18710d78 100644
--- a/src/libostree/ostree-kernel-args.h
+++ b/src/libostree/ostree-kernel-args.h
@@ -55,4 +55,3 @@ char ** _ostree_kernel_args_to_strv (OstreeKernelArgs *kargs);
 char * _ostree_kernel_args_to_string (OstreeKernelArgs *kargs);
 
 G_END_DECLS
-
diff --git a/src/libostree/ostree-libarchive-input-stream.c b/src/libostree/ostree-libarchive-input-stream.c
index 0b81c355..d087946a 100644
--- a/src/libostree/ostree-libarchive-input-stream.c
+++ b/src/libostree/ostree-libarchive-input-stream.c
@@ -184,4 +184,3 @@ ostree_libarchive_input_stream_close (GInputStream  *stream,
 {
   return TRUE;
 }
-
diff --git a/src/libostree/ostree-libarchive-input-stream.h b/src/libostree/ostree-libarchive-input-stream.h
index ce6c0a2a..bcfc7bd2 100644
--- a/src/libostree/ostree-libarchive-input-stream.h
+++ b/src/libostree/ostree-libarchive-input-stream.h
@@ -63,4 +63,3 @@ GType          _ostree_libarchive_input_stream_get_type     (void) G_GNUC_CONST;
 GInputStream * _ostree_libarchive_input_stream_new          (struct archive  *a);
 
 G_END_DECLS
-
diff --git a/src/libostree/ostree-linuxfsutil.c b/src/libostree/ostree-linuxfsutil.c
index 2bfc92f2..8bae852f 100644
--- a/src/libostree/ostree-linuxfsutil.c
+++ b/src/libostree/ostree-linuxfsutil.c
@@ -134,4 +134,3 @@ _ostree_linuxfs_alter_immutable_flag (GFile         *path,
     (void) close (fd);
   return ret;
 }
-
diff --git a/src/libostree/ostree-linuxfsutil.h b/src/libostree/ostree-linuxfsutil.h
index 566717c5..9c74b8a9 100644
--- a/src/libostree/ostree-linuxfsutil.h
+++ b/src/libostree/ostree-linuxfsutil.h
@@ -37,4 +37,3 @@ _ostree_linuxfs_alter_immutable_flag (GFile         *path,
                                       GError       **error);
 
 G_END_DECLS
-
diff --git a/src/libostree/ostree-lzma-common.c b/src/libostree/ostree-lzma-common.c
index 6993643c..3600efd3 100644
--- a/src/libostree/ostree-lzma-common.c
+++ b/src/libostree/ostree-lzma-common.c
@@ -68,4 +68,3 @@ _ostree_lzma_return (lzma_ret   res,
       return G_CONVERTER_ERROR;
     }
 }
-
diff --git a/src/libostree/ostree-mutable-tree.h b/src/libostree/ostree-mutable-tree.h
index a288b1a1..bc8539cd 100644
--- a/src/libostree/ostree-mutable-tree.h
+++ b/src/libostree/ostree-mutable-tree.h
@@ -92,4 +92,3 @@ GHashTable * ostree_mutable_tree_get_subdirs (OstreeMutableTree *self);
 GHashTable * ostree_mutable_tree_get_files (OstreeMutableTree *self);
 
 G_END_DECLS
-
diff --git a/src/libostree/ostree-repo-file-enumerator.h b/src/libostree/ostree-repo-file-enumerator.h
index 6acf1006..e4f95b10 100644
--- a/src/libostree/ostree-repo-file-enumerator.h
+++ b/src/libostree/ostree-repo-file-enumerator.h
@@ -52,4 +52,3 @@ GFileEnumerator * _ostree_repo_file_enumerator_new      (OstreeRepoFile       *d
 							 GError              **error);
 
 G_END_DECLS
-
diff --git a/src/libostree/ostree-repo-file.h b/src/libostree/ostree-repo-file.h
index 094ae2cf..925a502c 100644
--- a/src/libostree/ostree-repo-file.h
+++ b/src/libostree/ostree-repo-file.h
@@ -81,4 +81,3 @@ gboolean ostree_repo_file_tree_query_child (OstreeRepoFile  *self,
                                              GError         **error);
 
 G_END_DECLS
-
diff --git a/src/libostree/ostree-repo-private.h b/src/libostree/ostree-repo-private.h
index b7f926d8..f38db570 100644
--- a/src/libostree/ostree-repo-private.h
+++ b/src/libostree/ostree-repo-private.h
@@ -194,4 +194,3 @@ _ostree_repo_gpg_verify_file_with_metadata (OstreeRepo          *self,
                                             GError             **error);
 
 G_END_DECLS
-
diff --git a/src/libostree/ostree-repo-static-delta-core.c b/src/libostree/ostree-repo-static-delta-core.c
index 3424086d..a0230016 100644
--- a/src/libostree/ostree-repo-static-delta-core.c
+++ b/src/libostree/ostree-repo-static-delta-core.c
@@ -322,4 +322,3 @@ ostree_repo_static_delta_execute_offline (OstreeRepo                    *self,
  out:
   return ret;
 }
-
diff --git a/src/libostree/ostree-repo-static-delta-private.h b/src/libostree/ostree-repo-static-delta-private.h
index a6f85834..67458b0b 100644
--- a/src/libostree/ostree-repo-static-delta-private.h
+++ b/src/libostree/ostree-repo-static-delta-private.h
@@ -149,4 +149,3 @@ _ostree_repo_static_delta_part_have_all_objects (OstreeRepo             *repo,
                                                  GCancellable           *cancellable,
                                                  GError                **error);
 G_END_DECLS
-
diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index d98ea0b7..1fc9ed17 100644
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -3429,4 +3429,3 @@ ostree_repo_regenerate_summary (OstreeRepo     *self,
     g_list_free (ordered_keys);
   return ret;
 }
-
diff --git a/src/libostree/ostree-repo.h b/src/libostree/ostree-repo.h
index 9154b431..0ecf9bde 100644
--- a/src/libostree/ostree-repo.h
+++ b/src/libostree/ostree-repo.h
@@ -630,4 +630,3 @@ gboolean ostree_repo_regenerate_summary (OstreeRepo     *self,
 
 
 G_END_DECLS
-
diff --git a/src/libostree/ostree-sepolicy.h b/src/libostree/ostree-sepolicy.h
index 0c5d215e..ac8a0e9c 100644
--- a/src/libostree/ostree-sepolicy.h
+++ b/src/libostree/ostree-sepolicy.h
@@ -72,4 +72,3 @@ void ostree_sepolicy_fscreatecon_cleanup (void **unused);
 #define ostree_cleanup_sepolicy_fscreatecon __attribute__ ((cleanup(ostree_sepolicy_fscreatecon_cleanup)))
 
 G_END_DECLS
-
diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
index f7c8dcf1..7052beb1 100644
--- a/src/libostree/ostree-sysroot-deploy.c
+++ b/src/libostree/ostree-sysroot-deploy.c
@@ -2015,4 +2015,3 @@ ostree_sysroot_deployment_set_kargs (OstreeSysroot     *self,
  out:
   return ret;
 }
-
diff --git a/src/libostree/ostree-sysroot-private.h b/src/libostree/ostree-sysroot-private.h
index 97aa9e8a..e7dcef20 100644
--- a/src/libostree/ostree-sysroot-private.h
+++ b/src/libostree/ostree-sysroot-private.h
@@ -83,4 +83,3 @@ gboolean _ostree_sysroot_query_bootloader (OstreeSysroot     *sysroot,
                                            GError           **error);
 
 G_END_DECLS
-
diff --git a/src/libostree/ostree-sysroot-upgrader.h b/src/libostree/ostree-sysroot-upgrader.h
index a3b664b1..edac5a3d 100644
--- a/src/libostree/ostree-sysroot-upgrader.h
+++ b/src/libostree/ostree-sysroot-upgrader.h
@@ -99,4 +99,3 @@ gboolean ostree_sysroot_upgrader_deploy (OstreeSysrootUpgrader  *self,
                                          GError                **error);
 
 G_END_DECLS
-
diff --git a/src/libostree/ostree-sysroot.c b/src/libostree/ostree-sysroot.c
index d415008d..315c89f6 100644
--- a/src/libostree/ostree-sysroot.c
+++ b/src/libostree/ostree-sysroot.c
@@ -1129,4 +1129,3 @@ ostree_sysroot_simple_write_deployment (OstreeSysroot      *sysroot,
  out:
   return ret;
 }
-
diff --git a/src/libostree/ostree-sysroot.h b/src/libostree/ostree-sysroot.h
index 2044b923..b18a1d3f 100644
--- a/src/libostree/ostree-sysroot.h
+++ b/src/libostree/ostree-sysroot.h
@@ -114,4 +114,3 @@ gboolean ostree_sysroot_simple_write_deployment (OstreeSysroot      *sysroot,
                                                  GError            **error);
 
 G_END_DECLS
-
diff --git a/src/libostree/ostree-types.h b/src/libostree/ostree-types.h
index 533d3b10..639b71ff 100644
--- a/src/libostree/ostree-types.h
+++ b/src/libostree/ostree-types.h
@@ -34,4 +34,3 @@ typedef struct OstreeMutableTree OstreeMutableTree;
 typedef struct OstreeRepoFile OstreeRepoFile;
 
 G_END_DECLS
-
diff --git a/src/libostree/ostree-varint.c b/src/libostree/ostree-varint.c
index 800aaa6d..3f1c7ead 100644
--- a/src/libostree/ostree-varint.c
+++ b/src/libostree/ostree-varint.c
@@ -183,4 +183,3 @@ _ostree_write_varuint64 (GString *buf, guint64 n)
   for (i = 0; i < size; i++)
     g_string_append_c (buf, target[i]);
 }
-
diff --git a/src/libostree/ostree-varint.h b/src/libostree/ostree-varint.h
index ae1152b8..0f0f06de 100644
--- a/src/libostree/ostree-varint.h
+++ b/src/libostree/ostree-varint.h
@@ -32,4 +32,3 @@ gboolean _ostree_read_varuint64 (const guint8   *buf,
 void _ostree_write_varuint64 (GString *buf, guint64 n);
 
 G_END_DECLS
-
diff --git a/src/libotutil/ot-checksum-utils.c b/src/libotutil/ot-checksum-utils.c
index c1335fa2..290eda75 100644
--- a/src/libotutil/ot-checksum-utils.c
+++ b/src/libotutil/ot-checksum-utils.c
@@ -207,4 +207,3 @@ ot_gio_checksum_stream_finish (GInputStream   *in,
   g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == ot_gio_checksum_stream_async);
   return g_memdup (g_simple_async_result_get_op_res_gpointer (simple), 32);
 }
-
diff --git a/src/libotutil/ot-fs-utils.h b/src/libotutil/ot-fs-utils.h
index 41389df2..0113da46 100644
--- a/src/libotutil/ot-fs-utils.h
+++ b/src/libotutil/ot-fs-utils.h
@@ -58,4 +58,3 @@ gboolean ot_openat_read_stream (int             dfd,
                                 GError        **error);
 
 G_END_DECLS
-
diff --git a/src/libotutil/ot-gio-utils.h b/src/libotutil/ot-gio-utils.h
index b3cb1f82..d108a44b 100644
--- a/src/libotutil/ot-gio-utils.h
+++ b/src/libotutil/ot-gio-utils.h
@@ -92,4 +92,3 @@ gboolean ot_util_fsync_directory (GFile         *dir,
                                   GError       **error);
 
 G_END_DECLS
-
diff --git a/src/libotutil/ot-keyfile-utils.h b/src/libotutil/ot-keyfile-utils.h
index 576785ac..a5600a3e 100644
--- a/src/libotutil/ot-keyfile-utils.h
+++ b/src/libotutil/ot-keyfile-utils.h
@@ -49,4 +49,3 @@ ot_keyfile_copy_group (GKeyFile   *source_keyfile,
                        const char *group_name);
 
 G_END_DECLS
-
diff --git a/src/libotutil/ot-opt-utils.h b/src/libotutil/ot-opt-utils.h
index d538d529..ab2e0767 100644
--- a/src/libotutil/ot-opt-utils.h
+++ b/src/libotutil/ot-opt-utils.h
@@ -29,4 +29,3 @@ G_BEGIN_DECLS
 void ot_util_usage_error (GOptionContext *context, const char *message, GError **error);
 
 G_END_DECLS
-
diff --git a/src/libotutil/ot-spawn-utils.h b/src/libotutil/ot-spawn-utils.h
index 158bd261..76ea24e3 100644
--- a/src/libotutil/ot-spawn-utils.h
+++ b/src/libotutil/ot-spawn-utils.h
@@ -31,4 +31,3 @@ GThreadPool * ot_thread_pool_new_nproc (GFunc     func,
                                         
 
 G_END_DECLS
-
diff --git a/src/libotutil/ot-unix-utils.h b/src/libotutil/ot-unix-utils.h
index 5f7011d8..0547a54e 100644
--- a/src/libotutil/ot-unix-utils.h
+++ b/src/libotutil/ot-unix-utils.h
@@ -45,4 +45,3 @@ gboolean ot_util_filename_validate (const char *name, GError **error);
 gboolean ot_util_path_split_validate (const char *path, GPtrArray **out_components, GError **error);
 
 G_END_DECLS
-
diff --git a/src/libotutil/ot-variant-utils.h b/src/libotutil/ot-variant-utils.h
index 6cf37da5..56fb60e8 100644
--- a/src/libotutil/ot-variant-utils.h
+++ b/src/libotutil/ot-variant-utils.h
@@ -78,4 +78,3 @@ ot_variant_bsearch_str (GVariant   *array,
                         int        *out_pos);
 
 G_END_DECLS
-
diff --git a/src/libotutil/ot-waitable-queue.h b/src/libotutil/ot-waitable-queue.h
index 9f23c8f8..29b81548 100644
--- a/src/libotutil/ot-waitable-queue.h
+++ b/src/libotutil/ot-waitable-queue.h
@@ -42,4 +42,3 @@ void ot_waitable_queue_ref (OtWaitableQueue *queue);
 void ot_waitable_queue_unref (OtWaitableQueue *queue);
 
 G_END_DECLS
-
diff --git a/src/ostree/ot-admin-builtins.h b/src/ostree/ot-admin-builtins.h
index 5918aa2c..1a3c1264 100644
--- a/src/ostree/ot-admin-builtins.h
+++ b/src/ostree/ot-admin-builtins.h
@@ -41,4 +41,3 @@ gboolean ot_admin_builtin_switch (int argc, char **argv, GCancellable *cancellab
 gboolean ot_admin_builtin_upgrade (int argc, char **argv, GCancellable *cancellable, GError **error);
 
 G_END_DECLS
-
diff --git a/src/ostree/ot-admin-functions.c b/src/ostree/ot-admin-functions.c
index 0c8c28f2..36b96616 100644
--- a/src/ostree/ot-admin-functions.c
+++ b/src/ostree/ot-admin-functions.c
@@ -97,4 +97,3 @@ ot_admin_get_indexed_deployment (OstreeSysroot  *sysroot,
   
   return g_object_ref (current_deployments->pdata[index]);
 }
-
diff --git a/src/ostree/ot-admin-functions.h b/src/ostree/ot-admin-functions.h
index 21e4a7d7..49b7039d 100644
--- a/src/ostree/ot-admin-functions.h
+++ b/src/ostree/ot-admin-functions.h
@@ -43,4 +43,3 @@ ot_admin_get_indexed_deployment (OstreeSysroot  *sysroot,
 
 
 G_END_DECLS
-
diff --git a/src/ostree/ot-admin-instutil-builtins.h b/src/ostree/ot-admin-instutil-builtins.h
index 16abe424..b11336ac 100644
--- a/src/ostree/ot-admin-instutil-builtins.h
+++ b/src/ostree/ot-admin-instutil-builtins.h
@@ -29,4 +29,3 @@ gboolean ot_admin_instutil_builtin_set_kargs (int argc, char **argv, GCancellabl
 gboolean ot_admin_instutil_builtin_grub2_generate (int argc, char **argv, GCancellable *cancellable, GError **error);
 
 G_END_DECLS
-
diff --git a/src/ostree/ot-builtin-remote.c b/src/ostree/ot-builtin-remote.c
index 8cc4ad38..6db92260 100644
--- a/src/ostree/ot-builtin-remote.c
+++ b/src/ostree/ot-builtin-remote.c
@@ -378,4 +378,3 @@ ostree_builtin_remote (int argc, char **argv, GCancellable *cancellable, GError
  out:
   return ret;
 }
-
diff --git a/src/ostree/ot-builtins.h b/src/ostree/ot-builtins.h
index d423a3a0..099b2bc4 100644
--- a/src/ostree/ot-builtins.h
+++ b/src/ostree/ot-builtins.h
@@ -55,4 +55,3 @@ BUILTINPROTO(trivial_httpd);
 #undef BUILTINPROTO
 
 G_END_DECLS
-
diff --git a/src/ostree/ot-main.c b/src/ostree/ot-main.c
index 43e09a3f..a69927d4 100644
--- a/src/ostree/ot-main.c
+++ b/src/ostree/ot-main.c
@@ -358,4 +358,3 @@ ostree_admin_option_context_parse (GOptionContext *context,
 out:
   return success;
 }
-
diff --git a/src/ostree/ot-tool-util.h b/src/ostree/ot-tool-util.h
index 5070dae9..db409221 100644
--- a/src/ostree/ot-tool-util.h
+++ b/src/ostree/ot-tool-util.h
@@ -37,4 +37,3 @@ ot_parse_keyvalue (const char  *keyvalue,
                    GError     **error);
 
 G_END_DECLS
-
diff --git a/src/switchroot/ostree-mount-util.h b/src/switchroot/ostree-mount-util.h
index a149d525..63e90c67 100644
--- a/src/switchroot/ostree-mount-util.h
+++ b/src/switchroot/ostree-mount-util.h
@@ -22,4 +22,3 @@
 #pragma once
 
 int perrorv (const char *format, ...) __attribute__ ((format (printf, 1, 2)));
-
diff --git a/src/switchroot/ostree-prepare-root.c b/src/switchroot/ostree-prepare-root.c
index f92d15a0..13320d85 100644
--- a/src/switchroot/ostree-prepare-root.c
+++ b/src/switchroot/ostree-prepare-root.c
@@ -218,4 +218,3 @@ main(int argc, char *argv[])
   
   exit (EXIT_SUCCESS);
 }
-
diff --git a/src/switchroot/ostree-remount.c b/src/switchroot/ostree-remount.c
index 32062c44..b8d3a963 100644
--- a/src/switchroot/ostree-remount.c
+++ b/src/switchroot/ostree-remount.c
@@ -119,4 +119,3 @@ main(int argc, char *argv[])
 
   exit (EXIT_SUCCESS);
 }
-
diff --git a/tests/test-pull-metalink.sh b/tests/test-pull-metalink.sh
index 3cd425b3..3aa648c0 100755
--- a/tests/test-pull-metalink.sh
+++ b/tests/test-pull-metalink.sh
@@ -117,4 +117,3 @@ cd ${test_tmpdir}
 echo bacon > metalink-data/metalink.xml
 test_metalink_pull_error "Document must begin with an element"
 echo "ok metalink err malformed"
-
diff --git a/tests/test-remote-add.sh b/tests/test-remote-add.sh
index cf9720d7..392dda54 100755
--- a/tests/test-remote-add.sh
+++ b/tests/test-remote-add.sh
@@ -92,4 +92,3 @@ assert_not_file_has_content list.txt "origin"
 # Can't grep for 'another' because of 'another-noexist'
 assert_file_has_content list.txt "another-noexist"
 echo "ok remote list remaining"
-