Changeset 4b4cfe0cd38d6ab371f58d76a171b5edcffd9787

Timestamp:

10/29/09 23:14:57 (2 years ago)

Author:

Shao Miller <shao.miller@…>

Children:

259c0dca1bc6ead6003fc504e136be67a1311abb

Parents:

39adcc6d820d6432034c901f64a43dcd011ef1c3

git-committer:

Shao Miller <shao.miller@yrdsb.edu.on.ca> / 2009-10-29T19:14:57Z-0400

Message:

[chain] Run Nindent on chain.c

Files:

• com32/modules/chain.c (modified) (8 diffs)

com32/modules/chain.c

@@ -554 +554 @@
     return;
 
-too_big:
+  too_big:
     error("Loader file too large\n");
     return;
 
-enomem:
+  enomem:
     error("Out of memory\n");
     return;
@@ -597 +597 @@
 }
 
-
-
 static uint32_t get_file_lba(const char *filename)
 {
-    com32sys_t inregs; 
+    com32sys_t inregs;
     uint32_t lba;
 
@@ -619 +617 @@
 
     if ((inregs.eflags.l & EFLAGS_CF) || inregs.esi.w[0] == 0) {
-        return 0; /* Filename not found */
+        return 0;               /* Filename not found */
     }
 
     /* Since the first member is the LBA, we simply cast */
-    lba = *((uint32_t*)MK_PTR(inregs.ds, inregs.esi.w[0]));
-
-    /* Clean the registers for the next call*/
+    lba = *((uint32_t *) MK_PTR(inregs.ds, inregs.esi.w[0]));
+
+    /* Clean the registers for the next call */
     memset(&inregs, 0, sizeof(com32sys_t));
 
@@ -653 +651 @@
     uint32_t *checksum, *chkhead, *chktail;
     size_t boot_size = SECTOR;
-
 
     openconsole(&dev_null_r, &dev_stdcon_w);
@@ -831 +828 @@
 
                    Offset Name         Size      Meaning
-                     8     bi_pvd       4 bytes   LBA of primary volume descriptor
-                    12     bi_file      4 bytes   LBA of boot file
-                    16     bi_length    4 bytes   Boot file length in bytes
-                    20     bi_csum      4 bytes   32-bit checksum
-                    24     bi_reserved  40 bytes  Reserved
+                   8     bi_pvd       4 bytes   LBA of primary volume descriptor
+                   12     bi_file      4 bytes   LBA of boot file
+                   16     bi_length    4 bytes   Boot file length in bytes
+                   20     bi_csum      4 bytes   32-bit checksum
+                   24     bi_reserved  40 bytes  Reserved
 
                    The 32-bit checksum is the sum of all the 32-bit words in the
@@ -842 +839 @@
 
                    LBA of primary volume descriptor should already be set to 16. 
-                */
-
-                isolinux_bin = (unsigned char*)boot_sector;
+                 */
+
+                isolinux_bin = (unsigned char *)boot_sector;
 
                 /* Get LBA address of bootfile */
@@ -854 +851 @@
                 }
                 /* Set it */
-                *((uint32_t*)&isolinux_bin[12]) = file_lba;
-
-                /* Set boot file length */              
-                *((uint32_t*)&isolinux_bin[16]) = boot_size;
+                *((uint32_t *) & isolinux_bin[12]) = file_lba;
+
+                /* Set boot file length */
+                *((uint32_t *) & isolinux_bin[16]) = boot_size;
 
                 /* Calculate checksum */
-                checksum = (uint32_t*)&isolinux_bin[20];
-                chkhead = (uint32_t*)&isolinux_bin[64];
-                chktail = (uint32_t*)&isolinux_bin[boot_size-1];
+                checksum = (uint32_t *) & isolinux_bin[20];
+                chkhead = (uint32_t *) & isolinux_bin[64];
+                chktail = (uint32_t *) & isolinux_bin[boot_size - 1];
                 /* Fresh checksum and clear possibly fractional uint32_t at the end */
-                *checksum = *((uint32_t*)&isolinux_bin[boot_size]) = 0;
-
-                while (chkhead <= chktail)
-                {
-                        *checksum += *chkhead++;
+                *checksum = *((uint32_t *) & isolinux_bin[boot_size]) = 0;
+
+                while (chkhead <= chktail) {
+                    *checksum += *chkhead++;
                 }
-            }
-            else {
-                error("The isolinux= option is only valid when run from ISOLINUX\n");
+            } else {
+                error
+                    ("The isolinux= option is only valid when run from ISOLINUX\n");
                 goto bail;
             }
-        } 
-            
+        }
+
     } else if (partinfo) {
         /* Actually read the boot sector */
@@ -902 +898 @@
     do_boot(boot_sector, boot_size, &regs);
 
-bail:
+  bail:
     return 255;
 }
-