emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fdisk_aix: fix aliasing warning, comment out unused global variables

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2019-10-04 17:16:15 +02:00
parent d8e4ce0503
commit 27f0e8a275
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
util-linux/fdisk_aix.c
View File

@ -6,10 +6,10 @@
*/ */
typedef struct { typedef struct {
unsigned int magic; /* expect AIX_LABEL_MAGIC */ uint32_t magic; /* expect AIX_LABEL_MAGIC */
unsigned int fillbytes1[124]; uint32_t fillbytes1[124];
unsigned int physical_volume_id; uint32_t physical_volume_id;
unsigned int fillbytes2[124]; uint32_t fillbytes2[124];
} aix_partition; } aix_partition;
#define AIX_LABEL_MAGIC 0xc9c2d4c1 #define AIX_LABEL_MAGIC 0xc9c2d4c1
@ -17,11 +17,8 @@ typedef struct {
#define AIX_INFO_MAGIC 0x00072959 #define AIX_INFO_MAGIC 0x00072959
#define AIX_INFO_MAGIC_SWAPPED 0x59290700 #define AIX_INFO_MAGIC_SWAPPED 0x59290700
#define aixlabel ((aix_partition *)MBRbuffer)
/* /*
Changes: * Changes:
* 1999-03-20 Arnaldo Carvalho de Melo <acme@conectiva.com.br> * 1999-03-20 Arnaldo Carvalho de Melo <acme@conectiva.com.br>
* Internationalization * Internationalization
* *
@ -29,8 +26,9 @@ typedef struct {
* Some fixes * Some fixes
*/ */
static smallint aix_other_endian; /* bool */ // Write-only vars, unfinished code?
static smallint aix_volumes = 1; /* max 15 */ //static smallint aix_other_endian; /* bool */
//static smallint aix_volumes = 1; /* max 15 */
/* /*
* only dealing with free blocks here * only dealing with free blocks here
@ -54,18 +52,20 @@ aix_info(void)
static int static int
check_aix_label(void) check_aix_label(void)
{ {
aix_partition *aixlabel = (void*)MBRbuffer;
if (aixlabel->magic != AIX_LABEL_MAGIC if (aixlabel->magic != AIX_LABEL_MAGIC
&& aixlabel->magic != AIX_LABEL_MAGIC_SWAPPED && aixlabel->magic != AIX_LABEL_MAGIC_SWAPPED
) { ) {
current_label_type = 0; current_label_type = LABEL_DOS;
aix_other_endian = 0; // aix_other_endian = 0;
return 0; return 0;
} }
aix_other_endian = (aixlabel->magic == AIX_LABEL_MAGIC_SWAPPED); // aix_other_endian = (aixlabel->magic == AIX_LABEL_MAGIC_SWAPPED);
update_units(); update_units();
current_label_type = LABEL_AIX; current_label_type = LABEL_AIX;
g_partitions = 1016; g_partitions = 1016;
aix_volumes = 15; // aix_volumes = 15;
aix_info(); aix_info();
/*aix_nolabel();*/ /* %% */ /*aix_nolabel();*/ /* %% */
/*aix_label = 1;*/ /* %% */ /*aix_label = 1;*/ /* %% */

6
util-linux/fdisk_gpt.c
View File

@ -161,7 +161,7 @@ check_gpt_label(void)
if (!valid_part_table_flag(MBRbuffer) if (!valid_part_table_flag(MBRbuffer)
|| first->sys_ind != LEGACY_GPT_TYPE || first->sys_ind != LEGACY_GPT_TYPE
) { ) {
current_label_type = 0; current_label_type = LABEL_DOS;
return 0; return 0;
} }
@ -171,7 +171,7 @@ check_gpt_label(void)
gpt_hdr = (void *)pe.sectorbuffer; gpt_hdr = (void *)pe.sectorbuffer;
if (gpt_hdr->magic != SWAP_LE64(GPT_MAGIC)) { if (gpt_hdr->magic != SWAP_LE64(GPT_MAGIC)) {
current_label_type = 0; current_label_type = LABEL_DOS;
return 0; return 0;
} }
@ -194,7 +194,7 @@ check_gpt_label(void)
|| SWAP_LE32(gpt_hdr->hdr_size) > sector_size || SWAP_LE32(gpt_hdr->hdr_size) > sector_size
) { ) {
puts("\nwarning: unable to parse GPT disklabel\n"); puts("\nwarning: unable to parse GPT disklabel\n");
current_label_type = 0; current_label_type = LABEL_DOS;
return 0; return 0;
} }