Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/util-linux/fdisk_aix.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/util-linux/fdisk_aix.c (modified) (4 diffs)

branches/2.2.9/mindi-busybox/util-linux/fdisk_aix.c

@@ -2 +2 @@
 /*
  * Copyright (C) Andreas Neuper, Sep 1998.
- *      This file may be redistributed under
- *      the terms of the GNU Public License.
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
@@ -30 +30 @@
 */
 
-static int aix_other_endian;
-static short aix_volumes = 1;
+static smallint aix_other_endian; /* bool */
+static smallint aix_volumes = 1; /* max 15 */
 
 /*
@@ -55 +55 @@
 check_aix_label(void)
 {
-    if (aixlabel->magic != AIX_LABEL_MAGIC &&
-        aixlabel->magic != AIX_LABEL_MAGIC_SWAPPED) {
+    if (aixlabel->magic != AIX_LABEL_MAGIC
+     && aixlabel->magic != AIX_LABEL_MAGIC_SWAPPED
+    ) {
         current_label_type = 0;
         aix_other_endian = 0;
@@ -63 +64 @@
     aix_other_endian = (aixlabel->magic == AIX_LABEL_MAGIC_SWAPPED);
     update_units();
-    current_label_type = label_aix;
-    partitions = 1016;
+    current_label_type = LABEL_AIX;
+    g_partitions = 1016;
     aix_volumes = 15;
     aix_info();