Changeset 4339f09 in mainline for uspace/drv/nic/rtl8139/driver.c

Timestamp:

2013-06-28T07:46:31Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

e52b4b5

Parents:

3de67b4c (diff), dba3e2c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Mostly C style (obey clang suggestions)

Merge from lp:~vojtech-horky/helenos/misc.

Most changes driven by warnings/errors from clang, such as type
redefinitions (typedef struct …) or possibly uninitizalied
variables. Clang still emits some warnings but a lot less than
before . As a result, kernel can be built with clang/-Werror.

Also updated mkext2.py to work with Python 3 again.

File:

• uspace/drv/nic/rtl8139/driver.c (modified) (1 diff)

uspace/drv/nic/rtl8139/driver.c

@@ -620 +620 @@
                 if (size == 0 || size > RTL8139_FRAME_MAX_LENGTH) {
                         ddf_msg(LVL_ERROR, "Receiver error -> receiver reset (size: %4" PRIu16 ", "
-                            "header 0x%4" PRIx16 ". Offset: %d)", size, frame_header,
+                            "header 0x%4" PRIx32 ". Offset: %" PRIu16 ")", size, frame_header,
                             rx_offset);
                         goto rx_err;