Changeset 1940326 in mainline

Timestamp:

2011-08-03T17:53:01Z (13 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

9cc1f43

Parents:

a33f0a6

Message:

Minor fixes for update

Location:

uspace

Files:

• lib/c/include/str.h (modified) (1 diff)
• srv/fs/fat/fat_ops.c (modified) (1 diff)

uspace/lib/c/include/str.h

@@ -83 +83 @@
 extern int wstr_to_str(char *dest, size_t size, const wchar_t *src);
 extern int spascii_to_str(char *dest, size_t size, const uint8_t *src, size_t n);
-extern void wstr_to_str(char *dest, size_t size, const wchar_t *src);
 extern char *wstr_to_astr(const wchar_t *src);
 extern int str_to_wstr(wchar_t *dest, size_t dlen, const char *src);

uspace/srv/fs/fat/fat_ops.c

@@ -960 +960 @@
                         free(rfn);
                         free(rootp);
-                        free(ridxp); /* TODO: Is it right way to free ridxp? */
                         (void) block_cache_fini(devmap_handle);
                         block_fini(devmap_handle);
                         fat_idx_fini_by_devmap_handle(devmap_handle);
-                        async_answer_0(rid, ENOTSUP);
-                        return;
+                        return ENOTSUP;
                 }
                 rootp->size = BPS(bs) * SPC(bs) * clusters;