Changeset 89ac5513 in mainline for uspace/srv/fs/udf/udf_volume.c

Timestamp:

2013-06-23T19:54:53Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ddb1922

Parents:

3abf0760 (diff), 96cbd18 (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/udf/udf_volume.c (modified) (2 diffs)

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))) {