[PATCH] udev_volume_id: volume_id version 032

[elogind.git] / extras / volume_id / volume_id / udf / udf.c

diff --git a/extras/volume_id/volume_id/udf/udf.c b/extras/volume_id/volume_id/udf/udf.c
index b91e3cce4e6a3c33e482b49ed26d59945ec4fa04..ff23b310399b2a6cc010dc1d9b5ad9b8595dd4b1 100644 (file)
--- a/extras/volume_id/volume_id/udf/udf.c
+++ b/extras/volume_id/volume_id/udf/udf.c
@@ -87,19 +87,19 @@ int volume_id_probe_udf(struct volume_id *id, __u64 off)
        if (vsd == NULL)
                return -1;
 
        if (vsd == NULL)
                return -1;
 

-       if (strncmp(vsd->id, "NSR02", 5) == 0)
+       if (memcmp(vsd->id, "NSR02", 5) == 0)

                goto blocksize;
                goto blocksize;

-       if (strncmp(vsd->id, "NSR03", 5) == 0)
+       if (memcmp(vsd->id, "NSR03", 5) == 0)

                goto blocksize;
                goto blocksize;

-       if (strncmp(vsd->id, "BEA01", 5) == 0)
+       if (memcmp(vsd->id, "BEA01", 5) == 0)

                goto blocksize;
                goto blocksize;

-       if (strncmp(vsd->id, "BOOT2", 5) == 0)
+       if (memcmp(vsd->id, "BOOT2", 5) == 0)

                goto blocksize;
                goto blocksize;

-       if (strncmp(vsd->id, "CD001", 5) == 0)
+       if (memcmp(vsd->id, "CD001", 5) == 0)

                goto blocksize;
                goto blocksize;

-       if (strncmp(vsd->id, "CDW02", 5) == 0)
+       if (memcmp(vsd->id, "CDW02", 5) == 0)

                goto blocksize;
                goto blocksize;

-       if (strncmp(vsd->id, "TEA03", 5) == 0)
+       if (memcmp(vsd->id, "TEA03", 5) == 0)

                goto blocksize;
        return -1;
 
                goto blocksize;
        return -1;
 


@@ -127,9 +127,9 @@ nsr:
 
                if (vsd->id[0] == '\0')
                        return -1;
 
                if (vsd->id[0] == '\0')
                        return -1;

-               if (strncmp(vsd->id, "NSR02", 5) == 0)
+               if (memcmp(vsd->id, "NSR02", 5) == 0)

                        goto anchor;
                        goto anchor;

-               if (strncmp(vsd->id, "NSR03", 5) == 0)
+               if (memcmp(vsd->id, "NSR03", 5) == 0)

                        goto anchor;
        }
        return -1;
                        goto anchor;
        }
        return -1;