Changeset 05b59393 in mainline for uspace/lib

Timestamp:

2017-10-04T18:02:14Z (8 years ago)

Author:

jzr <zarevucky.jiri@…>

Branches:

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

Children:

c9e88da

Parents:

0b2d369

Message:

Fix a couple of benign clang warnings.
No change in semantics.

Location:

uspace/lib

Files:

• c/generic/cap.c (modified) (1 diff)
• hound/src/client.c (modified) (4 diffs)
• nettl/src/amap.c (modified) (5 diffs)
• usb/src/usb.c (modified) (2 diffs)
• usbdev/src/devdrv.c (modified) (2 diffs)

uspace/lib/c/generic/cap.c

@@ -185 +185 @@
         sunit = NULL;
 
-        if (cap->cunit < 0 || cap->cunit >= CU_LIMIT)
-                assert(false);
+        assert(cap->cunit < CU_LIMIT);
 
         rc = ipow10_u64(cap->dp, &div);

uspace/lib/hound/src/client.c

@@ -48 +48 @@
 
 /** Stream structure */
-typedef struct hound_stream {
+struct hound_stream {
         /** link in context's list */
         link_t link;
@@ -59 +59 @@
         /** Stream flags */
         int flags;
-} hound_stream_t;
+};
 
 /**
@@ -72 +72 @@
 
 /** Hound client context structure */
-typedef struct hound_context {
+struct hound_context {
         /** Audio session */
         hound_sess_t *session;
@@ -89 +89 @@
         /** Assigned context id */
         hound_context_id_t id;
-} hound_context_t;
+};
 
 /**

uspace/lib/nettl/src/amap.c

@@ -58 +58 @@
 #include <stdint.h>
 #include <stdlib.h>
+
+static portrng_flags_t aflags_to_pflags(amap_flags_t flags)
+{
+        // FIXME: either use a single type, or provide a proper conversion
+        return (portrng_flags_t) flags;
+}
 
 /** Create association map.
@@ -378 +384 @@
         mepp = *epp;
 
-        rc = portrng_alloc(repla->portrng, epp->local.port, arg, flags,
+        rc = portrng_alloc(repla->portrng, epp->local.port, arg, aflags_to_pflags(flags),
             &mepp.local.port);
         if (rc != EOK) {
@@ -422 +428 @@
         mepp = *epp;
 
-        rc = portrng_alloc(laddr->portrng, epp->local.port, arg, flags,
+        rc = portrng_alloc(laddr->portrng, epp->local.port, arg, aflags_to_pflags(flags),
             &mepp.local.port);
         if (rc != EOK) {
@@ -466 +472 @@
         mepp = *epp;
 
-        rc = portrng_alloc(llink->portrng, epp->local.port, arg, flags,
+        rc = portrng_alloc(llink->portrng, epp->local.port, arg, aflags_to_pflags(flags),
             &mepp.local.port);
         if (rc != EOK) {
@@ -498 +504 @@
         mepp = *epp;
 
-        rc = portrng_alloc(map->unspec, epp->local.port, arg, flags,
+        rc = portrng_alloc(map->unspec, epp->local.port, arg, aflags_to_pflags(flags),
             &mepp.local.port);
         if (rc != EOK) {

uspace/lib/usb/src/usb.c

@@ -73 +73 @@
 const char *usb_str_transfer_type(usb_transfer_type_t t)
 {
-        if (t >= ARRAY_SIZE(str_transfer_type)) {
+        if ((size_t)t >= ARRAY_SIZE(str_transfer_type)) {
                 return "invalid";
         }
@@ -86 +86 @@
 const char *usb_str_transfer_type_short(usb_transfer_type_t t)
 {
-        if (t >= ARRAY_SIZE(str_transfer_type_short)) {
+        if ((size_t)t >= ARRAY_SIZE(str_transfer_type_short)) {
                 return "invl";
         }

uspace/lib/usbdev/src/devdrv.c

@@ -53 +53 @@
 
 /** USB device structure. */
-typedef struct usb_device {
+struct usb_device {
         /** Connection to device on USB bus */
         usb_dev_session_t *bus_session;
@@ -95 +95 @@
          */
         void *driver_data;
-} usb_device_t;
+};
 
 /** Count number of pipes the driver expects.