Fix inconsistent leading spaces

Changes:

* Fix spaces being used for indentation in some lines in C
* Remove leading spaces before some goto labels
* Remove leading spaces before the start of some multiline comments
* Change leading spaces to tabs in some multiline macros
* Add missing asterisk to some multiline comments (to match other
  multiline comments and because they are false positives in the
  commands below)

Note: Leading spaces can be used for alignment (such as in function
parameters and function arguments in C) and for line continuation (such
as in long commands in shell scripts).  However, in the above changes
the leading spaces are used for other reasons and do not seem to fit
with the style used.

Commands used to search for errors:

    $ git grep -In '^ [^*]' | grep -E -v \
        -e '(COPYING|README|RELNOTES|configure(.ac)?):' \
        -e '^[^:]+.(md|yml|py):' -e '(bash|zsh)_completion/' \
	-e '^contrib/syntax/' -e '^etc/templates/.*\.txt:' -e '^m4/' \
        -e '^platform/debian/' -e '^src/man/.*\.txt:' \
        -e '.*mkrpm.sh:' -e '.*extract_errnos.sh:'

20 files changed, 45 insertions, 44 deletions

diff --git a/src/fbuilder/main.c b/src/fbuilder/main.c
index ebb273f12..7fdf9af68 100644
--- a/src/fbuilder/main.c
+++ b/src/fbuilder/main.c
@@ -32,7 +32,7 @@ int main(int argc, char **argv) {
 system("cat /proc/self/status");
 int i;
 for (i = 0; i < argc; i++)
-        printf("*%s* ", argv[i]);
+        printf("*%s* ", argv[i]);
 printf("\n");
 }
 #endif
diff --git a/src/fcopy/main.c b/src/fcopy/main.c
index da24fb3f7..ce2efb295 100644
--- a/src/fcopy/main.c
+++ b/src/fcopy/main.c
@@ -92,7 +92,7 @@ static void selinux_relabel_path(const char *path, const char *inside_path) {
                         printf("Cannot relabel %s: %s\n", path, strerror(errno));
         }
         freecon(fcon);
- close:
+close:
         close(fd);
 #else
         (void) path;
diff --git a/src/firejail/appimage_size.c b/src/firejail/appimage_size.c
index c3f1620bc..60c4c0364 100644
--- a/src/firejail/appimage_size.c
+++ b/src/firejail/appimage_size.c
@@ -17,8 +17,9 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+
 /*
-    This code borrows heavily from src/libappimage_shared/elf.c in libappimage
+ * This code borrows heavily from src/libappimage_shared/elf.c in libappimage
  */
 /*
 Compile with:
diff --git a/src/firejail/dbus.c b/src/firejail/dbus.c
index a41071305..b2f9fe2d2 100644
--- a/src/firejail/dbus.c
+++ b/src/firejail/dbus.c
@@ -263,7 +263,7 @@ static char *find_user_socket_by_format(char *format) {
         if (!S_ISSOCK(s.st_mode))
                 goto fail;
         return dbus_user_socket;
- fail:
+fail:
         free(dbus_user_socket);
         return NULL;
 }
diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h
index 30c1b441c..824164c8a 100644
--- a/src/firejail/firejail.h
+++ b/src/firejail/firejail.h
@@ -266,7 +266,7 @@ static inline int any_ip6_dhcp(void) {
 }
 
 static inline int any_dhcp(void) {
-  return any_ip_dhcp() || any_ip6_dhcp();
+        return any_ip_dhcp() || any_ip6_dhcp();
 }
 
 extern int arg_private;         // mount private /home
diff --git a/src/firejail/main.c b/src/firejail/main.c
index ed31efb6c..9bd65dda5 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -47,8 +47,8 @@
 #endif
 
 #ifdef __ia64__
-/* clone(2) has a different interface on ia64, as it needs to know
-   the size of the stack */
+/* clone(2) has a different interface on ia64, as it needs to know the size of
+ * the stack */
 int __clone2(int (*fn)(void *),
              void *child_stack_base, size_t stack_size,
              int flags, void *arg, ...
diff --git a/src/firejail/selinux.c b/src/firejail/selinux.c
index 5beda294d..08f3b3122 100644
--- a/src/firejail/selinux.c
+++ b/src/firejail/selinux.c
@@ -78,7 +78,7 @@ void selinux_relabel_path(const char *path, const char *inside_path)
         }
 
         freecon(fcon);
- close:
+close:
         close(fd);
 #else
         (void) path;
diff --git a/src/fldd/main.c b/src/fldd/main.c
index 390f7a1bc..4b645b1b3 100644
--- a/src/fldd/main.c
+++ b/src/fldd/main.c
@@ -193,9 +193,9 @@ static void parse_elf(const char *exe) {
         }
         goto close;
 
- error_close:
+error_close:
         perror("copy libs");
- close:
+close:
         if (base)
                 munmap(base, s.st_size);
 
@@ -295,7 +295,7 @@ int main(int argc, char **argv) {
 //system("cat /proc/self/status");
 int i;
 for (i = 0; i < argc; i++)
-        printf("*%s* ", argv[i]);
+        printf("*%s* ", argv[i]);
 printf("\n");
 }
 #endif
diff --git a/src/fnet/fnet.h b/src/fnet/fnet.h
index c9d40ec1d..f9b09d7ea 100644
--- a/src/fnet/fnet.h
+++ b/src/fnet/fnet.h
@@ -1,4 +1,4 @@
- /*
+/*
  * Copyright (C) 2014-2023 Firejail Authors
  *
  * This file is part of firejail project
diff --git a/src/fnet/interface.c b/src/fnet/interface.c
index 873252d40..ca7c744ed 100644
--- a/src/fnet/interface.c
+++ b/src/fnet/interface.c
@@ -1,4 +1,4 @@
- /*
+/*
  * Copyright (C) 2014-2023 Firejail Authors
  *
  * This file is part of firejail project
diff --git a/src/fnet/main.c b/src/fnet/main.c
index 1c48622a0..96c4f1478 100644
--- a/src/fnet/main.c
+++ b/src/fnet/main.c
@@ -1,4 +1,4 @@
- /*
+/*
  * Copyright (C) 2014-2023 Firejail Authors
  *
  * This file is part of firejail project
@@ -47,7 +47,7 @@ static void usage(void) {
         printf("\tfnet config mac addr\n");
         printf("\tfnet config ipv6 dev ip\n");
         printf("\tfnet ifup dev\n");
-  printf("\tfnet waitll dev\n");
+        printf("\tfnet waitll dev\n");
 }
 
 int main(int argc, char **argv) {
@@ -144,9 +144,9 @@ printf("\n");
         else if (argc == 5 && strcmp(argv[1], "config") == 0 && strcmp(argv[2], "ipv6") == 0) {
                 net_if_ip6(argv[3], argv[4]);
         }
-  else if (argc == 3 && strcmp(argv[1], "waitll") == 0) {
-    net_if_waitll(argv[2]);
-  }
+        else if (argc == 3 && strcmp(argv[1], "waitll") == 0) {
+                net_if_waitll(argv[2]);
+        }
         else {
                 fprintf(stderr, "Error fnet: invalid arguments\n");
                 return 1;
diff --git a/src/fnet/veth.c b/src/fnet/veth.c
index 2a23c6bd4..2111cfa56 100644
--- a/src/fnet/veth.c
+++ b/src/fnet/veth.c
@@ -24,8 +24,8 @@
  *
  * Authors:     Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
- */
- /*
+*/
+/*
  * Copyright (C) 2014-2023 Firejail Authors
  *
  * This file is part of firejail project
diff --git a/src/fnetfilter/main.c b/src/fnetfilter/main.c
index 978d145b3..8c0f6c297 100644
--- a/src/fnetfilter/main.c
+++ b/src/fnetfilter/main.c
@@ -1,4 +1,4 @@
- /*
+/*
  * Copyright (C) 2014-2023 Firejail Authors
  *
  * This file is part of firejail project
diff --git a/src/fsec-optimize/main.c b/src/fsec-optimize/main.c
index 0a9b7c9b9..0bc521c0d 100644
--- a/src/fsec-optimize/main.c
+++ b/src/fsec-optimize/main.c
@@ -33,7 +33,7 @@ int main(int argc, char **argv) {
 //system("cat /proc/self/status");
 int i;
 for (i = 0; i < argc; i++)
-        printf("*%s* ", argv[i]);
+        printf("*%s* ", argv[i]);
 printf("\n");
 }
 #endif
diff --git a/src/fsec-print/main.c b/src/fsec-print/main.c
index de93f260e..696c6bc0c 100644
--- a/src/fsec-print/main.c
+++ b/src/fsec-print/main.c
@@ -47,7 +47,7 @@ int main(int argc, char **argv) {
 //system("cat /proc/self/status");
 int i;
 for (i = 0; i < argc; i++)
-        printf("*%s* ", argv[i]);
+        printf("*%s* ", argv[i]);
 printf("\n");
 }
 #endif
diff --git a/src/fseccomp/main.c b/src/fseccomp/main.c
index 1edbad764..57a5a6d67 100644
--- a/src/fseccomp/main.c
+++ b/src/fseccomp/main.c
@@ -58,7 +58,7 @@ int main(int argc, char **argv) {
 //system("cat /proc/self/status");
 int i;
 for (i = 0; i < argc; i++)
-        printf("*%s* ", argv[i]);
+        printf("*%s* ", argv[i]);
 printf("\n");
 }
 #endif
diff --git a/src/include/gcov_wrapper.h b/src/include/gcov_wrapper.h
index b56b4e736..7c8f89d59 100644
--- a/src/include/gcov_wrapper.h
+++ b/src/include/gcov_wrapper.h
@@ -33,8 +33,8 @@
  */
 #if __GNUC__ > 11 || (__GNUC__ == 11 && __GNUC_MINOR__ >= 1)
 static void __gcov_flush(void) {
-       __gcov_dump();
-       __gcov_reset();
+        __gcov_dump();
+        __gcov_reset();
 }
 #endif
 #else
diff --git a/src/include/seccomp.h b/src/include/seccomp.h
index ef3fe6c3a..fc07b75ce 100644
--- a/src/include/seccomp.h
+++ b/src/include/seccomp.h
@@ -194,24 +194,24 @@
 #endif
 
 #define VALIDATE_ARCHITECTURE \
-     BPF_STMT(BPF_LD+BPF_W+BPF_ABS, (offsetof(struct seccomp_data, arch))), \
-     BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, ARCH_NR, 1, 0), \
-     BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW)
+        BPF_STMT(BPF_LD+BPF_W+BPF_ABS, (offsetof(struct seccomp_data, arch))), \
+        BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, ARCH_NR, 1, 0), \
+        BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW)
 
 #define VALIDATE_ARCHITECTURE_KILL \
-     BPF_STMT(BPF_LD+BPF_W+BPF_ABS, (offsetof(struct seccomp_data, arch))), \
-     BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, ARCH_NR, 1, 0), \
-     KILL_OR_RETURN_ERRNO
+        BPF_STMT(BPF_LD+BPF_W+BPF_ABS, (offsetof(struct seccomp_data, arch))), \
+        BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, ARCH_NR, 1, 0), \
+        KILL_OR_RETURN_ERRNO
 
 #define VALIDATE_ARCHITECTURE_64 \
-     BPF_STMT(BPF_LD+BPF_W+BPF_ABS, (offsetof(struct seccomp_data, arch))), \
-     BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, ARCH_64, 1, 0), \
-     BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW)
+        BPF_STMT(BPF_LD+BPF_W+BPF_ABS, (offsetof(struct seccomp_data, arch))), \
+        BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, ARCH_64, 1, 0), \
+        BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW)
 
 #define VALIDATE_ARCHITECTURE_32 \
-     BPF_STMT(BPF_LD+BPF_W+BPF_ABS, (offsetof(struct seccomp_data, arch))), \
-     BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, ARCH_32, 1, 0), \
-     BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW)
+        BPF_STMT(BPF_LD+BPF_W+BPF_ABS, (offsetof(struct seccomp_data, arch))), \
+        BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, ARCH_32, 1, 0), \
+        BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW)
 
 #ifndef X32_SYSCALL_BIT
 #define X32_SYSCALL_BIT 0x40000000
diff --git a/src/libtrace/libtrace.c b/src/libtrace/libtrace.c
index 231e09882..25f0cc12e 100644
--- a/src/libtrace/libtrace.c
+++ b/src/libtrace/libtrace.c
@@ -35,11 +35,11 @@
 #include "../include/rundefs.h"
 
 #define tprintf(fp, args...) \
-    do { \
-        if (!fp)\
-            init(); \
-        fprintf(fp, args); \
-    } while(0)
+        do { \
+                if (!fp)\
+                        init(); \
+                fprintf(fp, args); \
+        } while(0)
 
 // break recursivity on fopen call
 typedef FILE *(*orig_fopen_t)(const char *pathname, const char *mode);
diff --git a/src/profstats/main.c b/src/profstats/main.c
index 491cec736..d5e57e7cc 100644
--- a/src/profstats/main.c
+++ b/src/profstats/main.c
@@ -1,4 +1,4 @@
- /*
+/*
  * Copyright (C) 2014-2023 Firejail Authors
  *
  * This file is part of firejail project