switch tools and volume_id from LGPL to GPLv2

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

diff --git a/extras/volume_id/volume_id/mac.c b/extras/volume_id/volume_id/mac.c
index dcfacc2a697bf3732dbe2496abefd76500c9eb03..1587f488239cc36d8591d83b0806fca968b355af 100644 (file)
--- a/extras/volume_id/volume_id/mac.c
+++ b/extras/volume_id/volume_id/mac.c
@@ -3,19 +3,9 @@
  *
  * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
  *
- *     This library is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU Lesser General Public
- *     License as published by the Free Software Foundation; either
- *     version 2.1 of the License, or (at your option) any later version.
- *
- *     This library is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- *     Lesser General Public License for more details.
- *
- *     You should have received a copy of the GNU Lesser General Public
- *     License along with this library; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *     This program is free software; you can redistribute it and/or modify it
+ *     under the terms of the GNU General Public License as published by the
+ *     Free Software Foundation version 2 of the License.
  */
 
 #ifndef _GNU_SOURCE
@@ -32,7 +22,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"
@@ -40,24 +29,24 @@
 #include "mac.h"
 
 struct mac_driver_desc {
-       __u8    signature[2];
-       __u16   block_size;
-       __u32   block_count;
+       uint8_t         signature[2];
+       uint16_t        block_size;
+       uint32_t        block_count;
 } __attribute__((__packed__));
 
 struct mac_partition {
-       __u8    signature[2];
-       __u16   res1;
-       __u32   map_count;
-       __u32   start_block;
-       __u32   block_count;
-       __u8    name[32];
-       __u8    type[32];
+       uint8_t         signature[2];
+       uint16_t        res1;
+       uint32_t        map_count;
+       uint32_t        start_block;
+       uint32_t        block_count;
+       uint8_t         name[32];
+       uint8_t         type[32];
 } __attribute__((__packed__));
 
-int volume_id_probe_mac_partition_map(struct volume_id *id, __u64 off)
+int volume_id_probe_mac_partition_map(struct volume_id *id, uint64_t off)
 {
-       const __u8 *buf;
+       const uint8_t *buf;
        struct mac_driver_desc *driver;
        struct mac_partition *part;
 
@@ -108,8 +97,8 @@ int volume_id_probe_mac_partition_map(struct volume_id *id, __u64 off)
                id->partition_count = part_count;
 
                for (i = 0; i < part_count; i++) {
-                       __u64 poff;
-                       __u64 plen;
+                       uint64_t poff;
+                       uint64_t plen;
 
                        buf = volume_id_get_buffer(id, off + ((i+1) * bsize), 0x200);
                        if (buf == NULL)