Merge pull request #66 from pok-kernel/fix-style

Fix style
pok-kernel · Jan 18, 2024 · d818650 · d818650
2 parents 9055996 + 9c92ade
commit d818650
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 20 deletions.
diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
@@ -7,7 +7,7 @@ name: Non executable checks
 jobs:
   check-style:
     name: Check style and headers
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - run: sudo apt-get -y update
@@ -17,7 +17,7 @@ jobs:
 
   clean-compilation:
     name: Clean compilation
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - run: sudo apt-get -y update

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -7,7 +7,7 @@ name: Execution checks
 jobs:
   test-utils:
     name: Test utility programs
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - run: sudo apt-get -y update
@@ -17,7 +17,7 @@ jobs:
 
   unit-tests:
     name: Unit tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - run: sudo apt-get -y update

diff --git a/examples/case-study-ardupilot/flt-mgmt.c b/examples/case-study-ardupilot/flt-mgmt.c
@@ -106,8 +106,7 @@ int PID_altitude(int PID_set_Point, int PID_current_Point) {
   /* Computes the error */
 
   altitude_I += (float)PID_error * dt;
-  altitude_I =
-      constrain(altitude_I, 20, -20); /* Limit the PID integrator...  */
+  altitude_I = constrain(altitude_I, 20, -20); /* Limit the PID integrator... */
   /* Integratior part */
 
   altitude_D =

diff --git a/examples/case-study-ardupilot/originalcode-adaptation.c b/examples/case-study-ardupilot/originalcode-adaptation.c
@@ -854,8 +854,7 @@ int PID_altitude(int PID_set_Point, int PID_current_Point) {
   /* Computes the error */
 
   altitude_I += (float)PID_error * dt;
-  altitude_I =
-      constrain(altitude_I, 20, -20); /* Limit the PID integrator...  */
+  altitude_I = constrain(altitude_I, 20, -20); /* Limit the PID integrator... */
   /* Integratior part */
 
   altitude_D =

diff --git a/examples/case-study-ardupilot/user-functions.c b/examples/case-study-ardupilot/user-functions.c
@@ -121,8 +121,7 @@ int PID_altitude(int PID_set_Point, int PID_current_Point) {
   /* Computes the error */
 
   altitude_I += (float)PID_error * dt;
-  altitude_I =
-      constrain(altitude_I, 20, -20); /* Limit the PID integrator...  */
+  altitude_I = constrain(altitude_I, 20, -20); /* Limit the PID integrator... */
   /* Integratior part */
 
   altitude_D =

diff --git a/kernel/arch/x86/x86-qemu/debug.c b/kernel/arch/x86/x86-qemu/debug.c
@@ -14,7 +14,7 @@
 
 #if (defined POK_NEEDS_DEBUG) || (defined POK_NEEDS_USER_DEBUG)
 
-//#ifdef POK_NEEDS_DEBUG
+// #ifdef POK_NEEDS_DEBUG
 
 #include "../event.h"
 #include <libc.h>

diff --git a/libpok/libm/ilogb.c b/libpok/libm/ilogb.c
@@ -45,13 +45,13 @@ int ilogb(double x) {
     if ((hx | lx) == 0)
       return 0x80000001; /* ilogb(0) = 0x80000001 */
     else                 /* subnormal x */
-        if (hx == 0) {
-      for (ix = -1043; lx > 0; lx <<= 1)
-        ix -= 1;
-    } else {
-      for (ix = -1022, hx <<= 11; hx > 0; hx <<= 1)
-        ix -= 1;
-    }
+      if (hx == 0) {
+        for (ix = -1043; lx > 0; lx <<= 1)
+          ix -= 1;
+      } else {
+        for (ix = -1022, hx <<= 11; hx > 0; hx <<= 1)
+          ix -= 1;
+      }
     return ix;
   } else if (hx < 0x7ff00000)
     return (hx >> 20) - 1023;

diff --git a/libpok/protocols/blowfish/blowfish.h b/libpok/protocols/blowfish/blowfish.h
@@ -75,7 +75,7 @@
 #ifndef HEADER_BLOWFISH_H
 #define HEADER_BLOWFISH_H
 
-//#include <openssl/e_os2.h>
+// #include <openssl/e_os2.h>
 #include <types.h>
 
 #define BF_ENCRYPT 1

diff --git a/libpok/protocols/des/des_locl.h b/libpok/protocols/des/des_locl.h
@@ -126,7 +126,7 @@
 #include <libc/stdlib.h>
 #include <libc/string.h>
 #endif
-//#include <libm.h>
+// #include <libm.h>
 #endif
 #endif
 #include "des.h"

diff --git a/misc/fix-style b/misc/fix-style
@@ -10,6 +10,7 @@ set -e
 
 if [ "x$1" = "x--check" ]; then
   check="-n -Werror"
+  echo "Using $(clang-format --version)"
 fi
 
 git ls-files | grep '\.[ch]$' | xargs -n 100 clang-format -i $check