← Commit list

27f0e8a27

Denys Vlasenko
Denys Vlasenko
2019-10-04
SUCCESS Duration: 151s

Subject

fdisk_aix: fix aliasing warning, comment out unused global variables

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

util-linux/fdisk_aix.c +20 -20util-linux/fdisk_gpt.c +3 -3
util-linux/fdisk_aix.c+20 -20
@@ -6,10 +6,10 @@
*/
typedef struct {
- unsigned int magic; /* expect AIX_LABEL_MAGIC */
- unsigned int fillbytes1[124];
- unsigned int physical_volume_id;
- unsigned int fillbytes2[124];
+ uint32_t magic; /* expect AIX_LABEL_MAGIC */
+ uint32_t fillbytes1[124];
+ uint32_t physical_volume_id;
+ uint32_t fillbytes2[124];
} aix_partition;
#define AIX_LABEL_MAGIC 0xc9c2d4c1
@@ -17,20 +17,18 @@ typedef struct {
#define AIX_INFO_MAGIC 0x00072959
#define AIX_INFO_MAGIC_SWAPPED 0x59290700
-#define aixlabel ((aix_partition *)MBRbuffer)
-
-
/*
- Changes:
- * 1999-03-20 Arnaldo Carvalho de Melo <[email protected]>
- * Internationalization
- *
- * 2003-03-20 Phillip Kesling <[email protected]>
- * Some fixes
-*/
+ * Changes:
+ * 1999-03-20 Arnaldo Carvalho de Melo <[email protected]>
+ * Internationalization
+ *
+ * 2003-03-20 Phillip Kesling <[email protected]>
+ * Some fixes
+ */
-static smallint aix_other_endian; /* bool */
-static smallint aix_volumes = 1; /* max 15 */
+// Write-only vars, unfinished code?
+//static smallint aix_other_endian; /* bool */
+//static smallint aix_volumes = 1; /* max 15 */
/*
* only dealing with free blocks here
@@ -54,18 +52,20 @@ aix_info(void)
static int
check_aix_label(void)
{
+ aix_partition *aixlabel = (void*)MBRbuffer;
+
if (aixlabel->magic != AIX_LABEL_MAGIC
&& aixlabel->magic != AIX_LABEL_MAGIC_SWAPPED
) {
- current_label_type = 0;
- aix_other_endian = 0;
+ current_label_type = LABEL_DOS;
+// aix_other_endian = 0;
return 0;
}
- aix_other_endian = (aixlabel->magic == AIX_LABEL_MAGIC_SWAPPED);
+// aix_other_endian = (aixlabel->magic == AIX_LABEL_MAGIC_SWAPPED);
update_units();
current_label_type = LABEL_AIX;
g_partitions = 1016;
- aix_volumes = 15;
+// aix_volumes = 15;
aix_info();
/*aix_nolabel();*/ /* %% */
/*aix_label = 1;*/ /* %% */
util-linux/fdisk_gpt.c+3 -3
@@ -161,7 +161,7 @@ check_gpt_label(void)
if (!valid_part_table_flag(MBRbuffer)
|| first->sys_ind != LEGACY_GPT_TYPE
) {
- current_label_type = 0;
+ current_label_type = LABEL_DOS;
return 0;
}
@@ -171,7 +171,7 @@ check_gpt_label(void)
gpt_hdr = (void *)pe.sectorbuffer;
if (gpt_hdr->magic != SWAP_LE64(GPT_MAGIC)) {
- current_label_type = 0;
+ current_label_type = LABEL_DOS;
return 0;
}
@@ -194,7 +194,7 @@ check_gpt_label(void)
|| SWAP_LE32(gpt_hdr->hdr_size) > sector_size
) {
puts("\nwarning: unable to parse GPT disklabel\n");
- current_label_type = 0;
+ current_label_type = LABEL_DOS;
return 0;
}