From fc658e4e69b384fa3f51465c38b9b98a6995e507 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 10 Feb 2011 23:34:58 +0000 Subject: [PATCH] =?UTF-8?q?2011-02-10=09Ralf=20Cors=C3=A9pius=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * libblock/include/rtems/bdpart.h (rtems_bdpart_format): Eliminate unnamed union (Non c99-compliant). * libblock/src/bdpart-create.c, libblock/src/bdpart-read.c, libblock/src/bdpart-write.c: Reflect changes above. --- cpukit/ChangeLog | 7 +++++++ cpukit/libblock/include/rtems/bdpart.h | 2 +- cpukit/libblock/src/bdpart-create.c | 2 +- cpukit/libblock/src/bdpart-read.c | 4 ++-- cpukit/libblock/src/bdpart-write.c | 4 ++-- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index fcb7dcf682..579d703fa1 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,10 @@ +2011-02-10 Ralf Corsépius + + * libblock/include/rtems/bdpart.h (rtems_bdpart_format): + Eliminate unnamed union (Non c99-compliant). + * libblock/src/bdpart-create.c, libblock/src/bdpart-read.c, + libblock/src/bdpart-write.c: Reflect changes above. + 2011-02-09 Ralf Corsépius * sapi/include/confdefs.h: Fix typo. diff --git a/cpukit/libblock/include/rtems/bdpart.h b/cpukit/libblock/include/rtems/bdpart.h index 3a4422db94..a834f21059 100644 --- a/cpukit/libblock/include/rtems/bdpart.h +++ b/cpukit/libblock/include/rtems/bdpart.h @@ -197,7 +197,7 @@ typedef struct { */ uuid_t disk_id; } gpt; - }; + } u; } rtems_bdpart_format; /** diff --git a/cpukit/libblock/src/bdpart-create.c b/cpukit/libblock/src/bdpart-create.c index dc93522c19..498a67ea4e 100644 --- a/cpukit/libblock/src/bdpart-create.c +++ b/cpukit/libblock/src/bdpart-create.c @@ -37,7 +37,7 @@ rtems_status_code rtems_bdpart_create( rtems_status_code sc = RTEMS_SUCCESSFUL; bool dos_compatibility = format != NULL && format->type == RTEMS_BDPART_FORMAT_MBR - && format->mbr.dos_compatibility; + && format->u.mbr.dos_compatibility; rtems_blkdev_bnum disk_end = 0; rtems_blkdev_bnum pos = 0; rtems_blkdev_bnum dist_sum = 0; diff --git a/cpukit/libblock/src/bdpart-read.c b/cpukit/libblock/src/bdpart-read.c index 3560dbd3a3..515f5ce153 100644 --- a/cpukit/libblock/src/bdpart-read.c +++ b/cpukit/libblock/src/bdpart-read.c @@ -261,10 +261,10 @@ rtems_status_code rtems_bdpart_read( /* Set format */ format->type = RTEMS_BDPART_FORMAT_MBR; - format->mbr.disk_id = rtems_uint32_from_little_endian( + format->u.mbr.disk_id = rtems_uint32_from_little_endian( block->buffer + RTEMS_BDPART_MBR_OFFSET_DISK_ID ); - format->mbr.dos_compatibility = true; + format->u.mbr.dos_compatibility = true; /* Iterate through the rest of the primary partition table */ for (i = 1; i < 4; ++i) { diff --git a/cpukit/libblock/src/bdpart-write.c b/cpukit/libblock/src/bdpart-write.c index 92e80a24ec..8b3145126e 100644 --- a/cpukit/libblock/src/bdpart-write.c +++ b/cpukit/libblock/src/bdpart-write.c @@ -94,7 +94,7 @@ rtems_status_code rtems_bdpart_write( rtems_status_code esc = RTEMS_SUCCESSFUL; bool dos_compatibility = format != NULL && format->type == RTEMS_BDPART_FORMAT_MBR - && format->mbr.dos_compatibility; + && format->u.mbr.dos_compatibility; rtems_bdbuf_buffer *block = NULL; rtems_blkdev_bnum disk_end = 0; rtems_blkdev_bnum record_space = @@ -219,7 +219,7 @@ rtems_status_code rtems_bdpart_write( /* Write disk ID */ rtems_uint32_to_little_endian( - format->mbr.disk_id, + format->u.mbr.disk_id, block->buffer + RTEMS_BDPART_MBR_OFFSET_DISK_ID );