make compliant fixups

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

Author: William Douglas

src/swupd_build_variant.h

@@ -26,7 +26,7 @@
 
 #ifdef SWUPD_TAR_SELINUX
 #define TAR_XATTR_ARGS "--xattrs --xattrs-include='*' --selinux"
-#else /* SWUPD_TAR_SELINUX */
+#else  /* SWUPD_TAR_SELINUX */
 #define TAR_XATTR_ARGS "--xattrs --xattrs-include='*'"
 #endif /* SWUPD_TAR_SELINUX */
 

src/swupd_lib/curl_async.c

@@ -79,10 +79,10 @@
 #define HASH_TO_KEY(hash) (HASH_VALUE(hash[0]) << 4 | HASH_VALUE(hash[1]))
 
 struct swupd_curl_parallel_handle {
-	int retry_delay;	     /* Retry delay */
-	size_t mcurl_size, max_xfer; /* hysteresis parameters */
+	int retry_delay;		    /* Retry delay */
+	size_t mcurl_size, max_xfer;	    /* hysteresis parameters */
 	bool resume_failed;
-	int last_retry; /* keep the largest retry number so far */
+	int last_retry;			    /* keep the largest retry number so far */
 
 	CURLM *mcurl;			    /* Curl handle */
 	struct list *failed;		    /* List of failed downloads */
@@ -108,8 +108,8 @@ struct multi_curl_file {
 	const char *hash;		/* Unique identifier of this file. */
 	swupd_curl_success_cb callback; /* Holds original success callback to be wrapped */
 
-	void *data;	/* user's data */
-	bool cb_retval; /* return value from callback */
+	void *data;			/* user's data */
+	bool cb_retval;			/* return value from callback */
 	struct file_progress *progress;
 };
 

src/swupd_lib/filedesc.c

@@ -98,7 +98,7 @@ static void dump_file_descriptor_leaks_int(int n, void *a)
 	char *filename;
 	char buffer[PATH_MAX + 1];
 	ssize_t size;
-	a = a; /* Silence warning */
+	a = a;		/* Silence warning */
 	if (FD_ISSET(n, &open_fds)) {
 		return; /* Was already open */
 	}

src/swupd_lib/globals.c

@@ -30,8 +30,8 @@
 #include <unistd.h>
 
 #include "lib/log.h"
-#include "swupd.h"
 #include "manifest.h"
+#include "swupd.h"
 
 /* These defines have to be different from the local options
  * so they don't interfere with each other */

src/swupd_lib/manifest.h

@@ -22,12 +22,12 @@ extern "C" {
 #define AVX2 1 << 0
 #define AVX512 1 << 1
 
-#define SSE_0    0
-#define SSE_1    1
-#define SSE_2    2
-#define SSE_3    3
-#define AVX2_1   4
-#define AVX2_3   5
+#define SSE_0 0
+#define SSE_1 1
+#define SSE_2 2
+#define SSE_3 3
+#define AVX2_1 4
+#define AVX2_3 5
 #define AVX512_2 6
 #define AVX512_3 7
 

src/swupd_lib/manifest_parser.c

@@ -71,26 +71,27 @@ static uint64_t LOOKUP_OPTIMIZED_BITMASKS[256] = {
 /* some CPUs support avx512 but it's not helpful for performance ... skip avx512 there */
 int avx512_is_unhelpful(void)
 {
-        uint32_t eax = 0, ebx = 0, ecx = 0, edx = 0;
-        uint32_t model;
-
-        /* currently only Intel cpus are on the list */
-        if (!__builtin_cpu_is("intel"))
-                return 0;
-
-        __cpuid(1, eax, ebx, ecx, edx);
-        model =  (eax >> 4) & 0xf;
-        model += ((eax >> (16-4)) & 0xf0);
-
-        /* tigerlake */
-        if (model == 0x8C) {
-                return 1;
-        }
-        if (model == 0x8D) {
-                return 1;
-        }
-
-        return 0;
+	uint32_t eax = 0, ebx = 0, ecx = 0, edx = 0;
+	uint32_t model;
+
+	/* currently only Intel cpus are on the list */
+	if (!__builtin_cpu_is("intel")) {
+		return 0;
+	}
+
+	__cpuid(1, eax, ebx, ecx, edx);
+	model = (eax >> 4) & 0xf;
+	model += ((eax >> (16 - 4)) & 0xf0);
+
+	/* tigerlake */
+	if (model == 0x8C) {
+		return 1;
+	}
+	if (model == 0x8D) {
+		return 1;
+	}
+
+	return 0;
 }
 
 uint64_t get_opt_level_mask(void)
@@ -104,8 +105,7 @@ uint64_t get_opt_level_mask(void)
 
 	if (__builtin_cpu_supports("avx512vl")) {
 		opt_level_mask = (AVX512 << 8) | AVX512 | AVX2 | SSE;
-	}
-	else if (__builtin_cpu_supports("avx2") && __builtin_cpu_supports("fma") ) {
+	} else if (__builtin_cpu_supports("avx2") && __builtin_cpu_supports("fma")) {
 		opt_level_mask = (AVX2 << 8) | AVX2 | SSE;
 	} else {
 		/* SSE is zero but keep the same logic as others */
@@ -130,7 +130,7 @@ uint64_t get_opt_level_mask(void)
 			opt_level_mask = (SSE << 8) | SSE;
 		} else {
 			/* Otherwise just remove AVX2 support from the flags */
-			opt_level_mask &= (uint64_t)~(1 << AVX2);
+			opt_level_mask &= (uint64_t) ~(1 << AVX2);
 		}
 	}