switch indent to clang-format completely

diff --git a/Makefile b/Makefile
index 7bce4a6..a3d7fff 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -93,7 +93,6 @@ depend:
 
 indent:
        clang-format --style=WebKit -i -sort-includes *.c *.h $(SRCS_CXX)
-       indent -linux -l100 -lc100 *.c *.h; rm -f *~
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 

diff --git a/caps.c b/caps.c
index 9d51063..82c2352 100644 (file)
--- a/caps.c
+++ b/caps.c
@@ -40,7 +40,7 @@
 #define CAP_AUDIT_READ 37
 #endif                         /* !defined(CAP_AUDIT_READ) */
 
-/*  *INDENT-OFF* */
+// clang-format off
 static struct {
     const int val;
     const char* const name;
@@ -84,7 +84,7 @@ static struct {
     VALSTR_STRUCT(CAP_BLOCK_SUSPEND),
     VALSTR_STRUCT(CAP_AUDIT_READ),
 };
-/*  *INDENT-ON* */
+// clang-format on
 
 int capsNameToVal(const char *name)
 {

diff --git a/cmdline.c b/cmdline.c
index 9f2c090..5abcbc0 100644 (file)
--- a/cmdline.c
+++ b/cmdline.c
@@ -53,7 +53,7 @@ struct custom_option {
        const char *descr;
 };
 
-/* *INDENT-OFF* */
+// clang-format off
 struct custom_option custom_opts[] = {
     { { "help", no_argument, NULL, 'h' }, "Help plz.." },
     { { "mode", required_argument, NULL, 'M' },
@@ -138,7 +138,7 @@ struct custom_option deprecated_opts[] = {
     { { "iface_vs_nm", required_argument, NULL, 0x702 }, "Netmask of the 'vs' interface (e.g. \"255.255.255.0\")" },
     { { "iface_vs_gw", required_argument, NULL, 0x703 }, "Default GW for the 'vs' interface (e.g. \"192.168.0.1\")" },
 };
-/*  *INDENT-ON* */
+// clang-format on
 
 static const char *logYesNo(bool yes)
 {
@@ -307,7 +307,7 @@ static char *cmdlineSplitStrByColon(char *spec)
 
 bool cmdlineParse(int argc, char *argv[], struct nsjconf_t * nsjconf)
 {
-    /*  *INDENT-OFF* */
+// clang-format off
     (*nsjconf) = (const struct nsjconf_t){
         .exec_file = NULL,
         .hostname = "NSJAIL",
@@ -361,7 +361,7 @@ bool cmdlineParse(int argc, char *argv[], struct nsjconf_t * nsjconf)
         .kafel_string = NULL,
         .num_cpus = sysconf(_SC_NPROCESSORS_ONLN),
     };
-    /*  *INDENT-ON* */
+// clang-format on
 
        TAILQ_INIT(&nsjconf->pids);
        TAILQ_INIT(&nsjconf->mountpts);

diff --git a/mount.c b/mount.c
index 27fa415..65d5448 100644 (file)
--- a/mount.c
+++ b/mount.c
@@ -54,7 +54,7 @@ const char *mountFlagsToStr(uintptr_t flags)
        static __thread char mountFlagsStr[1024];
        mountFlagsStr[0] = '\0';
 
-    /*  *INDENT-OFF* */
+// clang-format off
     static struct {
         const uintptr_t flag;
         const char* const name;
@@ -84,7 +84,7 @@ const char *mountFlagsToStr(uintptr_t flags)
         VALSTR_STRUCT(MS_STRICTATIME),
         VALSTR_STRUCT(MS_LAZYTIME),
     };
-    /*  *INDENT-ON* */
+// clang-format on
 
        for (size_t i = 0; i < ARRAYSIZE(mountFlags); i++) {
                if (flags & mountFlags[i].flag) {

diff --git a/subproc.c b/subproc.c
index 68facec..3e9e51e 100644 (file)
--- a/subproc.c
+++ b/subproc.c
@@ -66,7 +66,7 @@ static const char *subprocCloneFlagsToStr(uintptr_t flags)
        static __thread char cloneFlagName[1024];
        cloneFlagName[0] = '\0';
 
-    /*  *INDENT-OFF* */
+// clang-format off
     static struct {
         const uintptr_t flag;
         const char* const name;
@@ -95,7 +95,7 @@ static const char *subprocCloneFlagsToStr(uintptr_t flags)
         VALSTR_STRUCT(CLONE_NEWNET),
         VALSTR_STRUCT(CLONE_IO),
     };
-    /*  *INDENT-ON* */
+// clang-format on
 
        for (size_t i = 0; i < ARRAYSIZE(cloneFlags); i++) {
                if (flags & cloneFlags[i].flag) {

diff --git a/util.c b/util.c
index 6b44cb5..18c1783 100644 (file)
--- a/util.c
+++ b/util.c
@@ -264,7 +264,7 @@ const char *utilSigName(int signo)
        static __thread char sigstr[32];
        sigstr[0] = '\0';
 
-    /*  *INDENT-OFF* */
+// clang-format off
     static struct {
         const int signo;
         const char* const name;
@@ -299,7 +299,7 @@ const char *utilSigName(int signo)
         VALSTR_STRUCT(SIGUSR2),
         VALSTR_STRUCT(SIGWINCH),
     };
-    /*  *INDENT-ON* */
+// clang-format on
 
        for (size_t i = 0; i < ARRAYSIZE(sigNames); i++) {
                if (signo == sigNames[i].signo) {