Changeset 1cf26ab in mainline for uspace/lib

Timestamp:

2016-05-14T06:44:37Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

362654a

Parents:

1023758

Message:

Use static assert instead of regular ones

Location:

uspace/lib

Files:

• c/generic/double_to_str.c (modified) (2 diffs)
• c/generic/ieee_double.c (modified) (1 diff)
• c/include/assert.h (modified) (1 diff)
• posix/source/fnmatch.c (modified) (1 diff)
• usbdev/include/usb/dev/request.h (modified) (1 diff)
• usbdev/src/pipesinit.c (modified) (1 diff)
• usbdev/src/request.c (modified) (1 diff)

uspace/lib/c/generic/double_to_str.c

@@ -505 +505 @@
 {
         /* The whole computation assumes 64bit significand. */
-        assert(sizeof(ieee_val.pos_val.significand) == sizeof(uint64_t));
+        static_assert(sizeof(ieee_val.pos_val.significand) == sizeof(uint64_t));
 
         if (ieee_val.is_special) {
@@ -753 +753 @@
 {
         /* The whole computation assumes 64bit significand. */
-        assert(sizeof(ieee_val.pos_val.significand) == sizeof(uint64_t));
+        static_assert(sizeof(ieee_val.pos_val.significand) == sizeof(uint64_t));
 
         if (ieee_val.is_special) {

uspace/lib/c/generic/ieee_double.c

@@ -45 +45 @@
         const int exponent_bias = 1075;
 
-        assert(sizeof(val) == sizeof(uint64_t));
+        static_assert(sizeof(val) == sizeof(uint64_t));
 
         union {

uspace/lib/c/include/assert.h

@@ -37 +37 @@
 #define LIBC_ASSERT_H_
 
+#define static_assert(expr)     _Static_assert(expr, "")
+
 /** Debugging assert macro
  *

uspace/lib/posix/source/fnmatch.c

@@ -640 +640 @@
         #define nomatch(s1, s2, flags) assert(posix_fnmatch(s1, s2, flags) == FNM_NOMATCH)
 
-        assert(FNM_PATHNAME == FNM_FILE_NAME);
+        static_assert(FNM_PATHNAME == FNM_FILE_NAME);
         match("", "", 0);
         match("*", "hello", 0);

uspace/lib/usbdev/include/usb/dev/request.h

@@ -109 +109 @@
 } __attribute__ ((packed)) usb_device_request_setup_packet_t;
 
-int assert[(sizeof(usb_device_request_setup_packet_t) == 8) ? 1: -1];
-
 int usb_control_request_set(usb_pipe_t *,
     usb_request_type_t, usb_request_recipient_t, uint8_t,

uspace/lib/usbdev/src/pipesinit.c

@@ -340 +340 @@
 {
         assert(pipe);
-        assert(DEV_DESCR_MAX_PACKET_SIZE_OFFSET < CTRL_PIPE_MIN_PACKET_SIZE);
+        static_assert(DEV_DESCR_MAX_PACKET_SIZE_OFFSET < CTRL_PIPE_MIN_PACKET_SIZE);
 
         if ((pipe->direction != USB_DIRECTION_BOTH) ||

uspace/lib/usbdev/src/request.c

@@ -39 +39 @@
 
 #define MAX_DATA_LENGTH ((size_t)(0xFFFF))
+
+static_assert(sizeof(usb_device_request_setup_packet_t) == 8);
 
 /** Generic wrapper for SET requests using standard control request format.