Apply changes from clang-format

Running:
clang-format -i -style=file src/*.[ch] src/lib/*.[ch] \
src/3rd_party/*.[ch] src/cmds/*.[ch] src/swupd_lib/*.[ch] \
src/verifytime/*.[ch]

with clang v15

Signed-off-by: William Douglas <[email protected]>

Author: William Douglas

src/3rd_party/3rd_party.c

@@ -17,8 +17,8 @@
  *
  */
 
-#include "swupd.h"
 #include "cmds/swupd_cmds.h"
+#include "swupd.h"
 
 #ifdef THIRDPARTY
 

src/3rd_party/3rd_party_add.c

@@ -22,8 +22,8 @@
 #include <unistd.h>
 
 #include "3rd_party_repos.h"
-#include "swupd_lib/signature.h"
 #include "swupd.h"
+#include "swupd_lib/signature.h"
 
 #ifdef THIRDPARTY
 

src/3rd_party/3rd_party_repos.c

@@ -18,8 +18,8 @@
  */
 
 #include "3rd_party_repos.h"
-#include "swupd_lib/signature.h"
 #include "swupd.h"
+#include "swupd_lib/signature.h"
 
 #include <errno.h>
 #include <fcntl.h>
@@ -260,7 +260,7 @@ int third_party_remove_repo_directory(const char *repo_name)
 	int ret = 0;
 	int ret_code = 0;
 
-	//TODO: use a global function to get this value
+	// TODO: use a global function to get this value
 	repo_dir = get_repo_content_path(repo_name);
 	ret = sys_rm_recursive(repo_dir);
 	if (ret < 0 && ret != -ENOENT) {

src/cmds/bundle_add.c

@@ -30,10 +30,10 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "swupd_lib/alias.h"
 #include "swupd.h"
-#include "swupd_lib/target_root.h"
+#include "swupd_lib/alias.h"
 #include "swupd_lib/heuristics.h"
+#include "swupd_lib/target_root.h"
 
 #define MODE_RW_O (S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)
 #define VERIFY_NOPICKY 0

src/cmds/bundle_list.c

@@ -329,10 +329,10 @@ static enum swupd_code show_included_bundles(char *bundle_name, int version)
 }
 
 /*
-* list_installable_bundles()
-* Parse the full manifest for the current version of the OS and print
-*   all available bundles.
-*/
+ * list_installable_bundles()
+ * Parse the full manifest for the current version of the OS and print
+ *   all available bundles.
+ */
 static enum swupd_code list_installable_bundles(int version)
 {
 	char *name;

src/cmds/check_update.c

@@ -36,7 +36,7 @@ static void print_help(void)
 	print("Checks whether an update is available and prints out the information if so\n\n");
 	print("Usage:\n");
 	print("   swupd check-update [OPTION...]\n\n");
-	//TODO: Add documentation explaining this command
+	// TODO: Add documentation explaining this command
 
 	global_print_help();
 }

src/cmds/clean.c

@@ -468,7 +468,7 @@ static int remove_irrelevant_file(const char *filename, const struct stat *st, i
 	relevant_path = statedir_get_cache_url_dir();
 	ret = str_starts_with(filename, relevant_path);
 	FREE(relevant_path);
-	if (ret == 0){
+	if (ret == 0) {
 		return 0;
 	}
 
@@ -482,7 +482,7 @@ static int remove_irrelevant_file(const char *filename, const struct stat *st, i
 		}
 	}
 	stats.files_removed++;
-	stats.bytes_removed+=long_to_ulong(st->st_size);
+	stats.bytes_removed += long_to_ulong(st->st_size);
 
 	return 0;
 }
@@ -493,7 +493,7 @@ static int count_file(const char *filename, const struct stat *st, int type __at
 		print("%s\n", filename);
 	}
 	stats.files_removed++;
-	stats.bytes_removed+=long_to_ulong(st->st_size);
+	stats.bytes_removed += long_to_ulong(st->st_size);
 
 	return 0;
 }
@@ -534,7 +534,7 @@ static enum swupd_code remove_cache_directory(const char *dir)
 	enum swupd_code ret_code;
 	int ret;
 
-	if (!sys_is_dir(dir)){
+	if (!sys_is_dir(dir)) {
 		return SWUPD_OK;
 	}
 
@@ -678,13 +678,13 @@ enum swupd_code clean_cachedir(void)
 		}
 		ret_code = clean_staged_manifests(dir, options.dry_run, false);
 		FREE(dir);
-		if(ret_code) {
+		if (ret_code) {
 			return ret_code;
 		}
 
 		// remove all cache from other mirror URLs
 		ret_code = clean_irrelevant_cache();
-		if(ret_code) {
+		if (ret_code) {
 			return ret_code;
 		}
 	}

src/cmds/update.c

@@ -32,9 +32,9 @@
 #include <unistd.h>
 
 #include "swupd.h"
+#include "swupd_lib/heuristics.h"
 #include "swupd_lib/signature.h"
 #include "swupd_lib/target_root.h"
-#include "swupd_lib/heuristics.h"
 
 #define FLAG_DOWNLOAD_ONLY 2000
 #define FLAG_UPDATE_SEARCH_FILE_INDEX 2001
@@ -80,7 +80,7 @@ bool update_get_option_download_only(void)
 static void save_swupd_binary_path()
 {
 	/* we need to resolve the whole path to swupd first, proc/self/exe
-		 * is a symbolic link to the executable that is running the current process */
+	 * is a symbolic link to the executable that is running the current process */
 	ssize_t path_length;
 	path_length = readlink("/proc/self/exe", swupd_binary, sizeof(swupd_binary));
 	if (path_length <= 0 || path_length >= LINE_MAX) {

src/cmds/verify.c

@@ -33,9 +33,9 @@
 #include <unistd.h>
 
 #include "swupd.h"
+#include "swupd_lib/heuristics.h"
 #include "swupd_lib/signature.h"
 #include "swupd_lib/target_root.h"
-#include "swupd_lib/heuristics.h"
 
 #define FLAG_EXTRA_FILES_ONLY 2000
 #define FLAG_FILE 2001
@@ -299,7 +299,7 @@ static int get_required_files(struct manifest *official_manifest, struct list *r
  * Only called when a file has failed to be fixed during a verify or install.
  * If a low-space warning has been printed, don't check again,
  * but just warn the user and return.
-*/
+ */
 static void check_warn_freespace(struct file *file)
 {
 	long fs_free;
@@ -611,7 +611,7 @@ static void remove_orphaned_files(struct list *files_to_verify, bool repair)
 				if (errno != ENOTEMPTY) {
 					print(" -> not deleted (%s)\n", strerror(errno));
 				} else {
-					//FIXME: Add force removal option?
+					// FIXME: Add force removal option?
 					print(" -> not deleted (not empty)\n");
 				}
 			} else {
@@ -922,7 +922,7 @@ enum swupd_code execute_verify_extra(extra_proc_fn_t post_verify_fn)
 	bool invalid_bundle = false;
 
 	/* Unless we are installing a new bundle and the --skip-optional flag is not
-	* set we shoudn't include optional bundles to the bundle list */
+	 * set we shoudn't include optional bundles to the bundle list */
 	if (!cmdline_option_install || cmdline_option_skip_optional) {
 		globals.skip_optional_bundles = true;
 	}

src/lib/hashmap.c

@@ -121,7 +121,7 @@ static struct list *hashmap_get_internal(struct hashmap *hashmap, const void *ke
 		if (hashmap->equal(key, i->data)) {
 			void *data = i->data;
 			if (remove) {
-				//If it's the first element of the list, update head
+				// If it's the first element of the list, update head
 				if (i == *items) {
 					*items = i->next;
 				}