Changeset 18b6a88 in mainline for uspace/lib

Timestamp:

2018-04-15T09:35:04Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c1f44ca

Parents:

8ebe212

Message:

More ccheck fixes, sometimes with manual intervention.

Location:

uspace/lib

Files:

• bithenge/src/transform.c (modified) (3 diffs)
• c/arch/mips32/include/libarch/tls.h (modified) (1 diff)
• c/arch/sparc64/include/libarch/syscall.h (modified) (1 diff)
• c/generic/adt/odict.c (modified) (3 diffs)
• c/generic/fibril_synch.c (modified) (1 diff)
• c/include/assert.h (modified) (2 diffs)
• ieee80211/include/ieee80211.h (modified) (1 diff)
• ieee80211/include/ieee80211_private.h (modified) (3 diffs)
• ieee80211/src/ieee80211.c (modified) (2 diffs)
• softrend/filter.c (modified) (1 diff)

uspace/lib/bithenge/src/transform.c

@@ -382 +382 @@
  * @param node The value to store in the parameter.
  * @return EOK on success or an error code from errno.h. */
-errno_t bithenge_scope_set_param( bithenge_scope_t *scope, int i,
+errno_t bithenge_scope_set_param(bithenge_scope_t *scope, int i,
     bithenge_node_t *node)
 {
@@ -919 +919 @@
         }
 
-MAKE_UINT_TRANSFORM(uint8   , uint8_t,  uint8_t_identity, prefix_length_1);
+MAKE_UINT_TRANSFORM(uint8,    uint8_t,  uint8_t_identity, prefix_length_1);
 MAKE_UINT_TRANSFORM(uint16le, uint16_t, uint16_t_le2host, prefix_length_2);
 MAKE_UINT_TRANSFORM(uint16be, uint16_t, uint16_t_be2host, prefix_length_2);
@@ -1058 +1058 @@
 
 static bithenge_named_transform_t primitive_transforms[] = {
-        {"ascii", &bithenge_ascii_transform},
-        {"bit", &bithenge_bit_transform},
-        {"bits_be", &bithenge_bits_be_transform},
-        {"bits_le", &bithenge_bits_le_transform},
-        {"known_length", &bithenge_known_length_transform},
-        {"nonzero_boolean", &bithenge_nonzero_boolean_transform},
-        {"uint8", &bithenge_uint8_transform},
-        {"uint16be", &bithenge_uint16be_transform},
-        {"uint16le", &bithenge_uint16le_transform},
-        {"uint32be", &bithenge_uint32be_transform},
-        {"uint32le", &bithenge_uint32le_transform},
-        {"uint64be", &bithenge_uint64be_transform},
-        {"uint64le", &bithenge_uint64le_transform},
-        {"uint_be", &bithenge_uint_be_transform},
-        {"uint_le", &bithenge_uint_le_transform},
-        {"zero_terminated", &bithenge_zero_terminated_transform},
-        {NULL, NULL}
+        { "ascii", &bithenge_ascii_transform },
+        { "bit", &bithenge_bit_transform },
+        { "bits_be", &bithenge_bits_be_transform },
+        { "bits_le", &bithenge_bits_le_transform },
+        { "known_length", &bithenge_known_length_transform },
+        { "nonzero_boolean", &bithenge_nonzero_boolean_transform },
+        { "uint8", &bithenge_uint8_transform },
+        { "uint16be", &bithenge_uint16be_transform },
+        { "uint16le", &bithenge_uint16le_transform },
+        { "uint32be", &bithenge_uint32be_transform },
+        { "uint32le", &bithenge_uint32le_transform },
+        { "uint64be", &bithenge_uint64be_transform },
+        { "uint64le", &bithenge_uint64le_transform },
+        { "uint_be", &bithenge_uint_be_transform },
+        { "uint_le", &bithenge_uint_le_transform },
+        { "zero_terminated", &bithenge_zero_terminated_transform },
+        { NULL, NULL }
 };
 

uspace/lib/c/arch/mips32/include/libarch/tls.h

@@ -69 +69 @@
         tp += MIPS_TP_OFFSET + sizeof(tcb_t);
 
-        asm volatile ("add $27, %0, $0" : : "r"(tp)); /* Move tls to K1 */
+        asm volatile ("add $27, %0, $0" : : "r" (tp)); /* Move tls to K1 */
 }
 
-static inline tcb_t * __tcb_get(void)
+static inline tcb_t *__tcb_get(void)
 {
-        void * retval;
+        void *retval;
 
-        asm volatile("add %0, $27, $0" : "=r"(retval));
+        asm volatile ("add %0, $27, $0" : "=r" (retval));
 
         return (tcb_t *)(retval - MIPS_TP_OFFSET - sizeof(tcb_t));

uspace/lib/c/arch/sparc64/include/libarch/syscall.h

@@ -60 +60 @@
 
         asm volatile (
-                "ta %7\n"
-                : "=r" (a1)
-                : "r" (a1), "r" (a2), "r" (a3), "r" (a4), "r" (a5), "r" (a6),
-                  "i" (id)
-                : "memory"
+            "ta %7\n"
+            : "=r" (a1)
+            : "r" (a1), "r" (a2), "r" (a3), "r" (a4), "r" (a5), "r" (a6),
+              "i" (id)
+            : "memory"
         );
 

uspace/lib/c/generic/adt/odict.c

@@ -75 +75 @@
         printf("[%p/%c", cur, cur->color == odc_red ? 'r' : 'b');
         if (cur->a != NULL || cur->b != NULL) {
-                putchar(' ' );
+                putchar(' ');
                 odict_print_tree(cur->a);
                 putchar(',');
@@ -254 +254 @@
                         if (cur->a == NULL) {
                                 odict_link_child_a(odlink, cur);
-                                break;
+                                break;
                         }
                         cur = cur->a;
@@ -923 +923 @@
                 b->b->up = a;
 
-        /* Swap links going out of A and out of B */
-        n = a->up; a->up = b->up; b->up = n;
-        n = a->a; a->a = b->a; b->a = n;
-        n = a->b; a->b = b->b; b->b = n;
-        c = a->color; a->color = b->color; b->color = c;
+        /*
+         * Swap links going out of A and out of B
+         */
+        n = a->up;
+        a->up = b->up;
+        b->up = n;
+
+        n = a->a;
+        a->a = b->a;
+        b->a = n;
+
+        n = a->b;
+        a->b = b->b;
+        b->b = n;
+
+        c = a->color;
+        a->color = b->color;
+        b->color = c;
 
         /* When A and B are adjacent, fix self-loops that might have arisen */

uspace/lib/c/generic/fibril_synch.c

@@ -354 +354 @@
 
 errno_t
-    fibril_condvar_wait_timeout(fibril_condvar_t *fcv, fibril_mutex_t *fm,
+fibril_condvar_wait_timeout(fibril_condvar_t *fcv, fibril_mutex_t *fm,
     suseconds_t timeout)
 {

uspace/lib/c/include/assert.h

@@ -64 +64 @@
 
 #ifndef NDEBUG
-        #define assert(expr) ((expr) ? (void) 0 : __helenos_assert_abort(#expr, __FILE__, __LINE__))
+#define assert(expr) ((expr) ? (void) 0 : __helenos_assert_abort(#expr, __FILE__, __LINE__))
 #else
-        #define assert(expr) ((void) 0)
+#define assert(expr) ((void) 0)
 #endif
 
@@ -74 +74 @@
 
 #ifndef NDEBUG
-        #define safe_assert(expr) ((expr) ? (void) 0 : __helenos_assert_quick_abort(#expr, __FILE__, __LINE__))
+#define safe_assert(expr) ((expr) ? (void) 0 : __helenos_assert_quick_abort(#expr, __FILE__, __LINE__))
 #else
-        #define safe_assert(expr) ((void) 0)
+#define safe_assert(expr) ((void) 0)
 #endif
 

uspace/lib/ieee80211/include/ieee80211.h

@@ -178 +178 @@
 extern void ieee80211_set_specific(ieee80211_dev_t *, void *);
 extern ddf_dev_t *ieee80211_get_ddf_dev(ieee80211_dev_t *);
-extern ieee80211_operating_mode_t
-    ieee80211_query_current_op_mode(ieee80211_dev_t *);
+extern ieee80211_operating_mode_t ieee80211_query_current_op_mode(
+    ieee80211_dev_t *);
 extern uint16_t ieee80211_query_current_freq(ieee80211_dev_t *);
 extern void ieee80211_query_bssid(ieee80211_dev_t *, nic_address_t *);

uspace/lib/ieee80211/include/ieee80211_private.h

@@ -382 +382 @@
 
 static inline void
-    ieee80211_scan_result_list_init(ieee80211_scan_result_list_t *results)
+ieee80211_scan_result_list_init(ieee80211_scan_result_list_t *results)
 {
         list_initialize(&results->list);
@@ -389 +389 @@
 
 static inline void
-    ieee80211_scan_result_list_remove(ieee80211_scan_result_list_t *results,
+ieee80211_scan_result_list_remove(ieee80211_scan_result_list_t *results,
     ieee80211_scan_result_link_t *result)
 {
@@ -397 +397 @@
 
 static inline void
-    ieee80211_scan_result_list_append(ieee80211_scan_result_list_t *results,
+ieee80211_scan_result_list_append(ieee80211_scan_result_list_t *results,
     ieee80211_scan_result_link_t *result)
 {

uspace/lib/ieee80211/src/ieee80211.c

@@ -217 +217 @@
  */
 static inline bool
-    ieee80211_is_eapol_key_frame(ieee80211_eapol_key_frame_t *key_frame)
+ieee80211_is_eapol_key_frame(ieee80211_eapol_key_frame_t *key_frame)
 {
         return (key_frame->packet_type == IEEE80211_EAPOL_KEY);
@@ -281 +281 @@
  */
 ieee80211_operating_mode_t
-    ieee80211_query_current_op_mode(ieee80211_dev_t *ieee80211_dev)
+ieee80211_query_current_op_mode(ieee80211_dev_t *ieee80211_dev)
 {
         fibril_mutex_lock(&ieee80211_dev->gen_mutex);

uspace/lib/softrend/filter.c

@@ -106 +106 @@
         float weights[4];
         weights[0] = (1 - x_delta) * (1 - y_delta);
-        weights[1] = (    x_delta) * (1 - y_delta);
-        weights[2] = (1 - x_delta) * (    y_delta);
-        weights[3] = (    x_delta) * (    y_delta);
+        weights[1] = x_delta       * (1 - y_delta);
+        weights[2] = (1 - x_delta) * y_delta;
+        weights[3] = x_delta       * y_delta;
 
         return blend_pixels(4, weights, pixels);