change log for rtems (2011-02-10)

rtems-vc at rtems.org rtems-vc at rtems.org
Fri Feb 11 00:10:16 UTC 2011


 *ralf*:
2011-02-10	Ralf Corsépius <ralf.corsepius at 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.

M 1.2705  cpukit/ChangeLog
M    1.4  cpukit/libblock/include/rtems/bdpart.h
M    1.2  cpukit/libblock/src/bdpart-create.c
M    1.2  cpukit/libblock/src/bdpart-read.c
M    1.2  cpukit/libblock/src/bdpart-write.c

diff -u rtems/cpukit/ChangeLog:1.2704 rtems/cpukit/ChangeLog:1.2705
--- rtems/cpukit/ChangeLog:1.2704	Wed Feb  9 00:18:57 2011
+++ rtems/cpukit/ChangeLog	Thu Feb 10 17:34:58 2011
@@ -1,3 +1,10 @@
+2011-02-10	Ralf Corsépius <ralf.corsepius at 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.
+
 2011-02-09	Ralf Corsépius <ralf.corsepius at rtems.org>
 
 	* sapi/include/confdefs.h: Fix typo.

diff -u rtems/cpukit/libblock/include/rtems/bdpart.h:1.3 rtems/cpukit/libblock/include/rtems/bdpart.h:1.4
--- rtems/cpukit/libblock/include/rtems/bdpart.h:1.3	Fri Apr 30 03:42:12 2010
+++ rtems/cpukit/libblock/include/rtems/bdpart.h	Thu Feb 10 17:34:58 2011
@@ -197,7 +197,7 @@
        */
       uuid_t disk_id;
     } gpt;
-  };
+  } u;
 } rtems_bdpart_format;
 
 /**

diff -u rtems/cpukit/libblock/src/bdpart-create.c:1.1 rtems/cpukit/libblock/src/bdpart-create.c:1.2
--- rtems/cpukit/libblock/src/bdpart-create.c:1.1	Fri Apr 30 03:42:12 2010
+++ rtems/cpukit/libblock/src/bdpart-create.c	Thu Feb 10 17:34:58 2011
@@ -37,7 +37,7 @@
   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 -u rtems/cpukit/libblock/src/bdpart-read.c:1.1 rtems/cpukit/libblock/src/bdpart-read.c:1.2
--- rtems/cpukit/libblock/src/bdpart-read.c:1.1	Fri Apr 30 03:42:13 2010
+++ rtems/cpukit/libblock/src/bdpart-read.c	Thu Feb 10 17:34:58 2011
@@ -261,10 +261,10 @@
 
   /* 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 -u rtems/cpukit/libblock/src/bdpart-write.c:1.1 rtems/cpukit/libblock/src/bdpart-write.c:1.2
--- rtems/cpukit/libblock/src/bdpart-write.c:1.1	Fri Apr 30 03:42:13 2010
+++ rtems/cpukit/libblock/src/bdpart-write.c	Thu Feb 10 17:34:58 2011
@@ -94,7 +94,7 @@
   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 @@
 
   /* 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
   );
 


 *ralf*:
2011-02-10	Ralf Corsépius <ralf.corsepius at rtems.org>

	* libmisc/shell/fdisk.c: Reflect changes above.

M 1.2706  cpukit/ChangeLog
M    1.3  cpukit/libmisc/shell/fdisk.c

diff -u rtems/cpukit/ChangeLog:1.2705 rtems/cpukit/ChangeLog:1.2706
--- rtems/cpukit/ChangeLog:1.2705	Thu Feb 10 17:34:58 2011
+++ rtems/cpukit/ChangeLog	Thu Feb 10 18:05:29 2011
@@ -4,6 +4,7 @@
 	Eliminate unnamed union (Non c99-compliant).
 	* libblock/src/bdpart-create.c, libblock/src/bdpart-read.c,
 	libblock/src/bdpart-write.c: Reflect changes above.
+	* libmisc/shell/fdisk.c: Reflect changes above.
 
 2011-02-09	Ralf Corsépius <ralf.corsepius at rtems.org>
 

diff -u rtems/cpukit/libmisc/shell/fdisk.c:1.2 rtems/cpukit/libmisc/shell/fdisk.c:1.3
--- rtems/cpukit/libmisc/shell/fdisk.c:1.2	Fri Mar 26 12:18:43 2010
+++ rtems/cpukit/libmisc/shell/fdisk.c	Thu Feb 10 18:05:29 2011
@@ -132,8 +132,8 @@
 
     /* Default format */
     format.type = RTEMS_BDPART_FORMAT_MBR;
-    format.mbr.disk_id = 0;
-    format.mbr.dos_compatibility = true;
+    format.u.mbr.disk_id = 0;
+    format.u.mbr.dos_compatibility = true;
 
     for (ai = 2; ai < argc; ++ai) {
       char *s = argv [ai];
@@ -194,9 +194,9 @@
           break;
         case RTEMS_BDPART_SHELL_MBR:
           if (strcmp( s, "dos") == 0) {
-            format.mbr.dos_compatibility = true;
+            format.u.mbr.dos_compatibility = true;
           } else if (strcmp( s, "nodos") == 0) {
-            format.mbr.dos_compatibility = false;
+            format.u.mbr.dos_compatibility = false;
           } else {
             RTEMS_BDPART_SHELL_ERROR( "unexpected option: %s", argv [ai]);
           }



--

Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20110210/8dc962d2/attachment-0001.html>


More information about the vc mailing list