[aoe] Rename aoe__mount_disks to AOE_S_MOUNT_DISKS
authorShao Miller <Shao.Miller@yrdsb.edu.on.ca>
Sun, 2 Jan 2011 05:05:31 +0000 (00:05 -0500)
committerShao Miller <Shao.Miller@yrdsb.edu.on.ca>
Sun, 2 Jan 2011 05:05:31 +0000 (00:05 -0500)
src/aoe/driver.c
src/include/aoe.h
src/util/winvblk.c

index 25d6382..9320f64 100644 (file)
@@ -1699,7 +1699,7 @@ NTSTATUS STDCALL AoeBusDevCtlScan(IN PIRP irp) {
 NTSTATUS STDCALL AoeBusDevCtlShow(IN PIRP irp) {
     winvblock__uint32 count;
     WVL_SP_BUS_NODE walker;
-    aoe__mount_disks_ptr disks;
+    AOE_S_MOUNT_DISKS_ptr disks;
     wv_size_t size;
     PIO_STACK_LOCATION io_stack_loc = IoGetCurrentIrpStackLocation(irp);
 
@@ -1760,9 +1760,9 @@ NTSTATUS STDCALL AoeBusDevCtlShow(IN PIRP irp) {
         irp->AssociatedIrp.SystemBuffer,
         disks,
         (io_stack_loc->Parameters.DeviceIoControl.OutputBufferLength <
-          (sizeof (aoe__mount_disks) + (count * sizeof (aoe__mount_disk))) ?
+          (sizeof (AOE_S_MOUNT_DISKS) + (count * sizeof (aoe__mount_disk))) ?
           io_stack_loc->Parameters.DeviceIoControl.OutputBufferLength :
-          (sizeof (aoe__mount_disks) + (count * sizeof (aoe__mount_disk)))
+          (sizeof (AOE_S_MOUNT_DISKS) + (count * sizeof (aoe__mount_disk)))
         )
       );
     wv_free(disks);
index 76f4c2a..d04992c 100644 (file)
@@ -85,11 +85,10 @@ winvblock__def_struct(aoe__mount_disk)
     LONGLONG LBASize;
   };
 
-winvblock__def_struct(aoe__mount_disks)
-  {
+typedef struct AOE_MOUNT_DISKS {
     winvblock__uint32 Count;
     aoe__mount_disk Disk[];
-  };
+  } AOE_S_MOUNT_DISKS, * AOE_S_MOUNT_DISKS;
 
 extern void aoe__reset_probe(void);
 
index 1b95a2b..e75542f 100644 (file)
@@ -298,14 +298,14 @@ static int STDCALL cmd_scan(void) {
   }
 
 static int STDCALL cmd_show(void) {
-    aoe__mount_disks_ptr mounted_disks;
+    AOE_S_MOUNT_DISKS_ptr mounted_disks;
     DWORD bytes_returned;
     winvblock__uint32 i;
     winvblock__uint8 string[256];
     int status = 2;
 
     mounted_disks = malloc(
-        sizeof (aoe__mount_disks) +
+        sizeof (AOE_S_MOUNT_DISKS) +
         (32 * sizeof (aoe__mount_disk)) 
       );
     if (mounted_disks == NULL) {
@@ -318,7 +318,7 @@ static int STDCALL cmd_show(void) {
       NULL,
       0,
       mounted_disks,
-      sizeof (aoe__mount_disks) + (32 * sizeof (aoe__mount_disk)),
+      sizeof (AOE_S_MOUNT_DISKS) + (32 * sizeof (aoe__mount_disk)),
       &bytes_returned,
       (LPOVERLAPPED) NULL
     )) {