diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-02-10 23:34:58 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-02-10 23:34:58 +0000 |
| commit | fc658e4e69b384fa3f51465c38b9b98a6995e507 (patch) | |
| tree | 6f0be3468776d8c86eedb031ac18735e91f8d781 /cpukit/libblock | |
| parent | Synchronization with RTEMS CVS (HEAD revision). (diff) | |
| download | rtems-fc658e4e69b384fa3f51465c38b9b98a6995e507.tar.bz2 | |
2011-02-10 Ralf Corsépius <ralf.corsepius@rtems.org>
* 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.
Diffstat (limited to 'cpukit/libblock')
| -rw-r--r-- | cpukit/libblock/include/rtems/bdpart.h | 2 | ||||
| -rw-r--r-- | cpukit/libblock/src/bdpart-create.c | 2 | ||||
| -rw-r--r-- | cpukit/libblock/src/bdpart-read.c | 4 | ||||
| -rw-r--r-- | cpukit/libblock/src/bdpart-write.c | 4 |
4 files changed, 6 insertions, 6 deletions
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 ); |