Changeset 192565b in mainline for uspace/srv/fs/fat/fat_ops.c

Timestamp:

2013-05-27T13:18:13Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f2c19b0

Parents:

d120133 (diff), c90aed4 (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.

File:

• uspace/srv/fs/fat/fat_ops.c (modified) (3 diffs)

uspace/srv/fs/fat/fat_ops.c

@@ -651 +651 @@
                 d = (fat_dentry_t *) b->data;
                 if ((fat_classify_dentry(d) == FAT_DENTRY_LAST) ||
-                    (bcmp(d->name, FAT_NAME_DOT, FAT_NAME_LEN)) == 0) {
+                    (memcmp(d->name, FAT_NAME_DOT, FAT_NAME_LEN)) == 0) {
                         memset(d, 0, sizeof(fat_dentry_t));
                         memcpy(d->name, FAT_NAME_DOT, FAT_NAME_LEN);
@@ -661 +661 @@
                 d++;
                 if ((fat_classify_dentry(d) == FAT_DENTRY_LAST) ||
-                    (bcmp(d->name, FAT_NAME_DOT_DOT, FAT_NAME_LEN) == 0)) {
+                    (memcmp(d->name, FAT_NAME_DOT_DOT, FAT_NAME_LEN) == 0)) {
                         memset(d, 0, sizeof(fat_dentry_t));
                         memcpy(d->name, FAT_NAME_DOT_DOT, FAT_NAME_LEN);
@@ -1042 +1042 @@
         info = (fat32_fsinfo_t *) b->data;
 
-        if (bcmp(info->sig1, FAT32_FSINFO_SIG1, sizeof(info->sig1)) ||
-            bcmp(info->sig2, FAT32_FSINFO_SIG2, sizeof(info->sig2)) ||
-            bcmp(info->sig3, FAT32_FSINFO_SIG3, sizeof(info->sig3))) {
+        if (memcmp(info->sig1, FAT32_FSINFO_SIG1, sizeof(info->sig1)) != 0 ||
+            memcmp(info->sig2, FAT32_FSINFO_SIG2, sizeof(info->sig2)) != 0 ||
+            memcmp(info->sig3, FAT32_FSINFO_SIG3, sizeof(info->sig3)) != 0) {
                 (void) block_put(b);
                 return EINVAL;