Changeset 3f03199 in mainline for uspace/app/wavplay/drec.c

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (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:

Merge mainline changes.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:

• uspace/app/wavplay/drec.c (modified) (1 diff)

uspace/app/wavplay/drec.c

@@ -213 +213 @@
         wave_header_t header;
         fseek(rec.file, sizeof(header), SEEK_SET);
-        const char *error;
-        if (ret != EOK) {
-                printf("Error parsing wav header: %s.\n", error);
+        if (ret != EOK) {
+                printf("Error parsing wav header\n");
                 goto cleanup;
         }