Changeset 25ee7ec5 in mainline

Timestamp:

2025-03-06T14:35:33Z (3 days ago)

Author:

Matěj Volf <git@…>

Children:

af28af6

Parents:

7064e71

git-author:

Matěj Volf <git@…> (2025-03-05 23:13:58)

git-committer:

Matěj Volf <git@…> (2025-03-06 14:35:33)

Message:

fix ccheck

Location:

uspace/lib

Files:

• c/test/fibril/exit_hook.c (modified) (1 diff)
• posix/src/pthread/keys.c (modified) (4 diffs)

uspace/lib/c/test/fibril/exit_hook.c

@@ -36 +36 @@
 static int value;
 
-static void exit_hook(void) {
-    value = 5;
+static void exit_hook(void)
+{
+        value = 5;
 }
 
-static errno_t fibril_basic(void* _arg) {
-    fibril_add_exit_hook(exit_hook);
-    return EOK;
+static errno_t fibril_basic(void *_arg)
+{
+        fibril_add_exit_hook(exit_hook);
+        return EOK;
 }
 
-PCUT_TEST(exit_hook_basic) {
-    value = 0;
-    fid_t other = fibril_create(fibril_basic, NULL);
-    fibril_start(other);
+PCUT_TEST(exit_hook_basic)
+{
+        value = 0;
+        fid_t other = fibril_create(fibril_basic, NULL);
+        fibril_start(other);
 
-    fibril_yield();
+        fibril_yield();
 
-    PCUT_ASSERT_INT_EQUALS(5, value);
+        PCUT_ASSERT_INT_EQUALS(5, value);
 }
 
 /*
-static errno_t fibril_to_be_killed(void* _arg) {
-    fibril_add_exit_hook(exit_hook);
-
-    while (true)
-        firbil_yield();
-
-    assert(0 && "unreachable");
-}
-
-PCUT_TEST(exit_hook_kill) {
-    value = 0;
-    fid_t other = fibril_create(fibril_to_be_killed, NULL);
-    fibril_start(other);
-
-    fibril_yield();
-
-    fibril_kill(other); // anything like this doesn't exist yet
-
-    PCUT_ASSERT_INT_EQUALS(5, value);
-}
-*/
-
+ * static errno_t fibril_to_be_killed(void* _arg) {
+ *     fibril_add_exit_hook(exit_hook);
+ *
+ *     while (true)
+ *         firbil_yield();
+ *
+ *     assert(0 && "unreachable");
+ * }
+ *
+ * PCUT_TEST(exit_hook_kill) {
+ *     value = 0;
+ *     fid_t other = fibril_create(fibril_to_be_killed, NULL);
+ *     fibril_start(other);
+ *
+ *     fibril_yield();
+ *
+ *     fibril_kill(other); // anything like this doesn't exist yet
+ *
+ *     PCUT_ASSERT_INT_EQUALS(5, value);
+ * }
+ */
 
 PCUT_EXPORT(fibril_exit_hook);

uspace/lib/posix/src/pthread/keys.c

@@ -58 +58 @@
 {
         // initialization is done in setspecific -> if not initialized, nothing was set yet
-        if (!fibril_initialized) return NULL;
+        if (!fibril_initialized)
+                return NULL;
 
         assert(key < PTHREAD_KEYS_MAX);
@@ -67 +68 @@
 }
 
-static void pthread_key_on_fibril_exit(void) {
-        if (!fibril_initialized) return;
+static void pthread_key_on_fibril_exit(void)
+{
+        if (!fibril_initialized)
+                return;
 
         for (unsigned i = 0; i < PTHREAD_KEYS_MAX; i++) {
@@ -78 +81 @@
                  */
                 if (key_data[i] != NULL && destructors[i] != NULL)
-                                destructors[i](key_data[i]);
+                        destructors[i](key_data[i]);
         }
 }
@@ -87 +90 @@
                 DPRINTF("initializing pthread keys\n");
                 errno_t res = fibril_add_exit_hook(pthread_key_on_fibril_exit);
-                if (res != EOK) return res;
+                if (res != EOK)
+                        return res;
+
                 for (unsigned i = 0; i < PTHREAD_KEYS_MAX; i++) {
                         key_data[i] = NULL;