From 24ef47f40cab645c2e3ec126c40c427282dfa608 Mon Sep 17 00:00:00 2001 From: William Douglas Date: Wed, 16 Mar 2016 18:40:55 +0000 Subject: [PATCH] Fixups for clang-format v3.8.0 --- src/analyze_fs.c | 18 +++++++++--------- src/chroot.c | 9 ++++----- src/config.c | 4 ++-- src/delta.c | 14 ++++++-------- src/fullfiles.c | 18 ++++++++---------- src/globals.c | 6 +++--- src/groups.c | 4 ++-- src/helpers.c | 13 ++++++------- src/heuristics.c | 7 +++---- src/log.c | 9 ++++----- src/main.c | 12 ++++++------ src/make_fullfiles.c | 7 +++---- src/make_packs.c | 18 ++++++++---------- src/manifest.c | 18 ++++++++---------- src/pack.c | 19 ++++++++----------- src/rename.c | 12 ++++++------ src/signature.c | 2 +- src/stats.c | 7 +++---- src/versions.c | 13 ++++++------- src/xattrs.c | 10 +++++----- 20 files changed, 101 insertions(+), 119 deletions(-) diff --git a/src/analyze_fs.c b/src/analyze_fs.c index d487c45..de8c4db 100644 --- a/src/analyze_fs.c +++ b/src/analyze_fs.c @@ -23,19 +23,19 @@ */ #define _GNU_SOURCE -#include -#include -#include -#include #include +#include #include #include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include +#include #include "swupd.h" #include "xattrs.h" diff --git a/src/chroot.c b/src/chroot.c index b1473bb..7fc2c72 100644 --- a/src/chroot.c +++ b/src/chroot.c @@ -21,15 +21,14 @@ */ #define _GNU_SOURCE +#include +#include #include #include -#include #include -#include -#include #include - -#include +#include +#include #include "swupd.h" diff --git a/src/config.c b/src/config.c index ac2f2b3..b0ce166 100644 --- a/src/config.c +++ b/src/config.c @@ -20,11 +20,11 @@ * */ +#include +#include #include #include #include -#include -#include #include "swupd.h" diff --git a/src/delta.c b/src/delta.c index 219ef06..6b66198 100644 --- a/src/delta.c +++ b/src/delta.c @@ -21,18 +21,16 @@ */ #define _GNU_SOURCE +#include +#include +#include +#include #include #include -#include #include -#include -#include #include -#include - -#include - -#include +#include +#include #include "swupd.h" #include "xattrs.h" diff --git a/src/fullfiles.c b/src/fullfiles.c index 58cd7c0..3af8d87 100644 --- a/src/fullfiles.c +++ b/src/fullfiles.c @@ -22,18 +22,17 @@ */ #define _GNU_SOURCE +#include +#include +#include +#include +#include #include #include -#include #include -#include -#include #include -#include -#include -#include - -#include +#include +#include #include "swupd.h" @@ -92,8 +91,7 @@ static void create_fullfile(struct file *file) assert(0); } - string_or_die(&tarcommand, TAR_COMMAND " -C %s " TAR_PERM_ATTR_ARGS " -cf - --exclude='%s/?*' './%s' 2> /dev/null | " - TAR_COMMAND " -C %s " TAR_PERM_ATTR_ARGS " -xf - 2> /dev/null", + string_or_die(&tarcommand, TAR_COMMAND " -C %s " TAR_PERM_ATTR_ARGS " -cf - --exclude='%s/?*' './%s' 2> /dev/null | " TAR_COMMAND " -C %s " TAR_PERM_ATTR_ARGS " -xf - 2> /dev/null", dir, base, base, rename_tmpdir); if (system(tarcommand) != 0) { LOG(NULL, "Failed to run command:", "%s", tarcommand); diff --git a/src/globals.c b/src/globals.c index 9f7ce6e..5edf8e1 100644 --- a/src/globals.c +++ b/src/globals.c @@ -21,13 +21,13 @@ */ #define _GNU_SOURCE +#include +#include #include #include #include -#include #include -#include -#include +#include #include "swupd.h" diff --git a/src/groups.c b/src/groups.c index af8c3f4..abfdb60 100644 --- a/src/groups.c +++ b/src/groups.c @@ -23,11 +23,11 @@ * */ +#include +#include #include #include #include -#include -#include #include "swupd.h" diff --git a/src/helpers.c b/src/helpers.c index b7fe0af..a84f7fb 100644 --- a/src/helpers.c +++ b/src/helpers.c @@ -21,19 +21,18 @@ */ #define _GNU_SOURCE +#include +#include +#include +#include #include #include -#include #include -#include -#include #include #include +#include #include -#include -#include - -#include +#include #include "swupd.h" diff --git a/src/heuristics.c b/src/heuristics.c index 797e158..94eee53 100644 --- a/src/heuristics.c +++ b/src/heuristics.c @@ -21,13 +21,12 @@ */ #define _GNU_SOURCE +#include +#include #include #include -#include #include -#include - -#include +#include #include "swupd.h" diff --git a/src/log.c b/src/log.c index 10e641d..e8bf9c3 100644 --- a/src/log.c +++ b/src/log.c @@ -22,15 +22,14 @@ */ #define _GNU_SOURCE +#include +#include +#include #include #include -#include #include -#include -#include #include - -#include +#include #include "swupd.h" diff --git a/src/main.c b/src/main.c index 5a9c7a3..3ffe045 100644 --- a/src/main.c +++ b/src/main.c @@ -25,17 +25,17 @@ */ #define _GNU_SOURCE +#include +#include +#include +#include #include #include -#include #include -#include -#include -#include #include -#include #include -#include +#include +#include #include "swupd.h" diff --git a/src/make_fullfiles.c b/src/make_fullfiles.c index 1ae9be3..4ea2f01 100644 --- a/src/make_fullfiles.c +++ b/src/make_fullfiles.c @@ -21,13 +21,12 @@ */ #define _GNU_SOURCE +#include +#include #include #include -#include #include -#include - -#include +#include #include "swupd.h" diff --git a/src/make_packs.c b/src/make_packs.c index 5c26443..4002cd9 100644 --- a/src/make_packs.c +++ b/src/make_packs.c @@ -21,20 +21,18 @@ */ #define _GNU_SOURCE +#include +#include +#include +#include +#include +#include #include #include -#include #include -#include -#include -#include #include -#include -#include - -#include - -#include +#include +#include #include "swupd.h" diff --git a/src/manifest.c b/src/manifest.c index a274c3b..e508652 100644 --- a/src/manifest.c +++ b/src/manifest.c @@ -23,19 +23,17 @@ */ #define _GNU_SOURCE +#include +#include +#include +#include +#include #include #include -#include #include -#include -#include -#include #include #include - -#include - -#include +#include #include "swupd.h" #include "xattrs.h" @@ -747,12 +745,12 @@ static int write_manifest_tar(struct manifest *manifest) /* and put the signature of the plain manifest into the archive, too */ if (enable_signing) { string_or_die(&tarcmd, TAR_COMMAND " --directory=%s/%i " TAR_PERM_ATTR_ARGS " -Jcf " - "%s/%i/Manifest.%s.tar Manifest.%s Manifest.%s.signed", + "%s/%i/Manifest.%s.tar Manifest.%s Manifest.%s.signed", conf, manifest->version, conf, manifest->version, manifest->component, manifest->component, manifest->component); } else { string_or_die(&tarcmd, TAR_COMMAND " --directory=%s/%i " TAR_PERM_ATTR_ARGS " -Jcf " - "%s/%i/Manifest.%s.tar Manifest.%s", + "%s/%i/Manifest.%s.tar Manifest.%s", conf, manifest->version, conf, manifest->version, manifest->component, manifest->component); } diff --git a/src/pack.c b/src/pack.c index e00426d..c64ba81 100644 --- a/src/pack.c +++ b/src/pack.c @@ -24,18 +24,17 @@ */ #define _GNU_SOURCE +#include +#include +#include +#include #include #include #include -#include #include -#include -#include -#include #include -#include - -#include +#include +#include #include "swupd.h" @@ -118,8 +117,7 @@ static void explode_pack_stage(int from_version, int to_version, char *module) * the resulting pack is slightly smaller, and in addition, we're saving CPU * time on the client... */ - string_or_die(&tar, TAR_COMMAND " --directory=%s/%s/%i_to_%i/staged " TAR_WARN_ARGS " " - TAR_PERM_ATTR_ARGS " -xf %s", + string_or_die(&tar, TAR_COMMAND " --directory=%s/%s/%i_to_%i/staged " TAR_WARN_ARGS " " TAR_PERM_ATTR_ARGS " -xf %s", packstage_dir, module, from_version, to_version, path); ret = system(tar); if (!ret) { @@ -454,7 +452,6 @@ static int make_final_pack(struct packdata *pack) create_manifest_delta(pack->from, pack->to, pack->module); } - string_or_die(&to, "%s/%s/%i_to_%i/Manifest-%s-delta-from-%i", packstage_dir, pack->module, pack->from, pack->to, pack->module, pack->from); @@ -495,7 +492,7 @@ static int make_final_pack(struct packdata *pack) /* tar the staging directory up */ LOG(NULL, "starting tar for pack", "%s: %i to %i", pack->module, pack->from, pack->to); string_or_die(&tar, TAR_COMMAND " " TAR_PERM_ATTR_ARGS " --directory=%s/%s/%i_to_%i/ " - "--numeric-owner -Jcf %s/%i/pack-%s-from-%i.tar delta staged", + "--numeric-owner -Jcf %s/%i/pack-%s-from-%i.tar delta staged", packstage_dir, pack->module, pack->from, pack->to, staging_dir, pack->to, pack->module, pack->from); ret = system(tar); diff --git a/src/rename.c b/src/rename.c index 719742c..b4335f0 100644 --- a/src/rename.c +++ b/src/rename.c @@ -22,16 +22,16 @@ */ #define _GNU_SOURCE -#include -#include -#include -#include #include #include -#include -#include #include #include +#include +#include +#include +#include +#include +#include #include "swupd.h" diff --git a/src/signature.c b/src/signature.c index b8e0b82..21bbb77 100644 --- a/src/signature.c +++ b/src/signature.c @@ -21,6 +21,7 @@ */ #define _GNU_SOURCE +#include #include #include #include @@ -29,7 +30,6 @@ #include #include #include -#include #include "swupd.h" diff --git a/src/stats.c b/src/stats.c index ae40c08..e8cc033 100644 --- a/src/stats.c +++ b/src/stats.c @@ -22,13 +22,12 @@ */ #define _GNU_SOURCE +#include +#include #include #include -#include #include -#include - -#include +#include #include "swupd.h" diff --git a/src/versions.c b/src/versions.c index 6affa87..5589752 100644 --- a/src/versions.c +++ b/src/versions.c @@ -23,17 +23,16 @@ #define _GNU_SOURCE -#include -#include -#include -#include -#include #include -#include #include #include - +#include #include +#include +#include +#include +#include +#include #include "swupd.h" diff --git a/src/xattrs.c b/src/xattrs.c index 62ad0c8..79e31db 100644 --- a/src/xattrs.c +++ b/src/xattrs.c @@ -20,15 +20,15 @@ * */ +#include +#include +#include #include #include #include -#include -#include -#include -#include #include -#include +#include +#include #include "swupd.h" #include "xattrs.h"