Changeset 44ecf89 in mainline for uspace/srv

Timestamp:

2013-05-18T21:11:29Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

acdb5bac

Parents:

eef14771

Message:

Replace deprecated function bcmp() with memcmp().

Location:

uspace/srv/fs

Files:

• cdfs/cdfs_ops.c (modified) (1 diff)
• fat/fat_directory.c (modified) (1 diff)
• fat/fat_ops.c (modified) (3 diffs)
• mfs/mfs_dentry.c (modified) (1 diff)
• mfs/mfs_ops.c (modified) (1 diff)
• udf/udf_volume.c (modified) (2 diffs)

uspace/srv/fs/cdfs/cdfs_ops.c

@@ -660 +660 @@
          */
         if ((vol_desc->type != VOL_DESC_PRIMARY) ||
-            (bcmp(vol_desc->standard_ident, CDFS_STANDARD_IDENT, 5) != 0) ||
+            (memcmp(vol_desc->standard_ident, CDFS_STANDARD_IDENT, 5) != 0) ||
             (vol_desc->version != 1)) {
                 block_put(block);

uspace/srv/fs/fat/fat_directory.c

@@ -516 +516 @@
                         return false;
                 case FAT_DENTRY_VALID:
-                        if (bcmp(de->name, d->name,
-                            FAT_NAME_LEN + FAT_EXT_LEN)==0)
+                        if (memcmp(de->name, d->name,
+                            FAT_NAME_LEN + FAT_EXT_LEN) == 0)
                                 return true;
                         break;

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;

uspace/srv/fs/mfs/mfs_dentry.c

@@ -178 +178 @@
 
                 if (name_len == d_name_len &&
-                    !bcmp(d_info.d_name, d_name, name_len)) {
+                    memcmp(d_info.d_name, d_name, name_len) == 0) {
 
                         d_info.d_inum = 0;

uspace/srv/fs/mfs/mfs_ops.c

@@ -452 +452 @@
 
                 if (comp_size == dentry_name_size &&
-                    !bcmp(component, d_info.d_name, dentry_name_size)) {
+                    memcmp(component, d_info.d_name, dentry_name_size) == 0) {
                         /* Hit! */
                         mfs_node_core_get(rfn, mnode->instance,

uspace/srv/fs/udf/udf_volume.c

@@ -262 +262 @@
                  * and Descriptor char set field.
                  */
-                if ((bcmp((uint8_t *) pvd[i].volume_id,
+                if ((memcmp((uint8_t *) pvd[i].volume_id,
                     (uint8_t *) desc->volume_id, 32) == 0) &&
-                    (bcmp((uint8_t *) pvd[i].volume_set_id,
+                    (memcmp((uint8_t *) pvd[i].volume_set_id,
                     (uint8_t *) desc->volume_set_id, 128) == 0) &&
-                    (bcmp((uint8_t *) &pvd[i].descriptor_charset,
+                    (memcmp((uint8_t *) &pvd[i].descriptor_charset,
                     (uint8_t *) &desc->descriptor_charset, 64) == 0) &&
                     (FLE32(desc->sequence_number) > FLE32(pvd[i].sequence_number))) {
@@ -301 +301 @@
                  * Logic Volume Identifier and Descriptor char set field.
                  */
-                if ((bcmp((uint8_t *) lvd[i].logical_volume_id,
+                if ((memcmp((uint8_t *) lvd[i].logical_volume_id,
                     (uint8_t *) desc->logical_volume_id, 128) == 0) &&
-                    (bcmp((uint8_t *) &lvd[i].charset,
+                    (memcmp((uint8_t *) &lvd[i].charset,
                     (uint8_t *) &desc->charset, 64) == 0) &&
                     (FLE32(desc->sequence_number) > FLE32(lvd[i].sequence_number))) {