gpllibs: Running Nindent

Impact: visual

Running Nindent on gpllib / gplinclude

11 files changed, 213 insertions, 213 deletions

diff --git a/com32/gplinclude/disk/bootloaders.h b/com32/gplinclude/disk/bootloaders.h
index 6aec9b3d..5a6ff9d9 100644
--- a/com32/gplinclude/disk/bootloaders.h
+++ b/com32/gplinclude/disk/bootloaders.h
@@ -14,5 +14,6 @@
 #include <disk/geom.h>
 #include <disk/partition.h>
 
-int get_bootloader_string(const struct driveinfo *, const struct part_entry *, char*, const int);
+int get_bootloader_string(const struct driveinfo *, const struct part_entry *,
+			  char *, const int);
 #endif /* __BOOTLOADERS_H_ */
diff --git a/com32/gplinclude/disk/common.h b/com32/gplinclude/disk/common.h
index 627e94ec..4e415c11 100644
--- a/com32/gplinclude/disk/common.h
+++ b/com32/gplinclude/disk/common.h
@@ -23,11 +23,11 @@
 #define SECTOR 512		/* bytes/sector */
 
 struct ebios_dapa {
-	uint16_t len;
-	uint16_t count;
-	uint16_t off;
-	uint16_t seg;
-	uint64_t lba;
+    uint16_t len;
+    uint16_t count;
+    uint16_t off;
+    uint16_t seg;
+    uint64_t lba;
 };
 
 #endif /* _COMMON_H_ */
diff --git a/com32/gplinclude/disk/errno_disk.h b/com32/gplinclude/disk/errno_disk.h
index 60b511fc..68bd89d9 100644
--- a/com32/gplinclude/disk/errno_disk.h
+++ b/com32/gplinclude/disk/errno_disk.h
@@ -13,38 +13,38 @@
 extern int errno_disk;
 
 /* Prefix with ED to avoid confusion with errno */
-#define	EDINV	0x01	/* Invalid function in AH or invalid parameter */
-#define	EDADDR	0x02	/* Address mark not found */
-#define	EDRO	0x03	/* Disk write-protected */
-#define	EDNOFND	0x04	/* Sector not found/read error */
-#define	EDRFAIL	0x05	/* Reset failed (hard disk) */
-#define	EDCHANG	0x06	/* Disk changed (floppy) */
-#define	EDFAIL	0x07	/* Drive parameter activity failed (hard disk) */
-#define	EDDMA	0x08	/* DMA overrun */
-#define	EDBOUND	0x09	/* Data boundary error (attempted DMA across 64K boundary or >80h sectors) */
-#define	EDBADS	0x0A	/* Bad sector detected (hard disk) */
-#define	EDBADT	0x0B	/* Bad track detected (hard disk) */
-#define	EDINVM	0x0C	/* Unsupported track or invalid media */
-#define	EDINVS	0x0D	/* Invalid number of sectors on format (PS/2 hard disk) */
-#define	EDADDRM	0x0E	/* Control data address mark detected (hard disk) */
-#define	EDDMARG	0x0F	/* DMA arbitration level out of range (hard disk) */
-#define	EDCRCF	0x10	/* Uncorrectable CRC or ECC error on read */
-#define	EDCRCV	0x11	/* Data ECC corrected (hard disk) */
-#define	EDCTRL	0x20	/* Controller failure */
-#define	EDMEDIA	0x31	/* No media in drive (IBM/MS INT 13 extensions) */
-#define	EDCMOS	0x32	/* Incorrect drive type stored in CMOS (Compaq) */
-#define	EDSEEKF	0x40	/* Seek failed */
-#define	EDTIME	0x80	/* Timeout (not ready) */
-#define	EDREADY	0xAA	/* Drive not ready (hard disk) */
-#define	EDNLOCK	0xB0	/* Volume not locked in drive (INT 13 extensions) */
-#define	EDLOCK	0xB1	/* Volume locked in drive (INT 13 extensions) */
-#define	EDREMOV	0xB2	/* Volume not removable (INT 13 extensions) */
-#define	EDUSED	0xB3	/* Volume in use (INT 13 extensions) */
-#define	EDCOUNT	0xB4	/* Lock count exceeded (INT 13 extensions) */
-#define	EDEJF	0xB5	/* Valid eject request failed (INT 13 extensions) */
+#define	EDINV	0x01		/* Invalid function in AH or invalid parameter */
+#define	EDADDR	0x02		/* Address mark not found */
+#define	EDRO	0x03		/* Disk write-protected */
+#define	EDNOFND	0x04		/* Sector not found/read error */
+#define	EDRFAIL	0x05		/* Reset failed (hard disk) */
+#define	EDCHANG	0x06		/* Disk changed (floppy) */
+#define	EDFAIL	0x07		/* Drive parameter activity failed (hard disk) */
+#define	EDDMA	0x08		/* DMA overrun */
+#define	EDBOUND	0x09		/* Data boundary error (attempted DMA across 64K boundary or >80h sectors) */
+#define	EDBADS	0x0A		/* Bad sector detected (hard disk) */
+#define	EDBADT	0x0B		/* Bad track detected (hard disk) */
+#define	EDINVM	0x0C		/* Unsupported track or invalid media */
+#define	EDINVS	0x0D		/* Invalid number of sectors on format (PS/2 hard disk) */
+#define	EDADDRM	0x0E		/* Control data address mark detected (hard disk) */
+#define	EDDMARG	0x0F		/* DMA arbitration level out of range (hard disk) */
+#define	EDCRCF	0x10		/* Uncorrectable CRC or ECC error on read */
+#define	EDCRCV	0x11		/* Data ECC corrected (hard disk) */
+#define	EDCTRL	0x20		/* Controller failure */
+#define	EDMEDIA	0x31		/* No media in drive (IBM/MS INT 13 extensions) */
+#define	EDCMOS	0x32		/* Incorrect drive type stored in CMOS (Compaq) */
+#define	EDSEEKF	0x40		/* Seek failed */
+#define	EDTIME	0x80		/* Timeout (not ready) */
+#define	EDREADY	0xAA		/* Drive not ready (hard disk) */
+#define	EDNLOCK	0xB0		/* Volume not locked in drive (INT 13 extensions) */
+#define	EDLOCK	0xB1		/* Volume locked in drive (INT 13 extensions) */
+#define	EDREMOV	0xB2		/* Volume not removable (INT 13 extensions) */
+#define	EDUSED	0xB3		/* Volume in use (INT 13 extensions) */
+#define	EDCOUNT	0xB4		/* Lock count exceeded (INT 13 extensions) */
+#define	EDEJF	0xB5		/* Valid eject request failed (INT 13 extensions) */
 #define	EDUNKOWN	0xBB	/* Undefined error (hard disk) */
-#define	EDWF	0xCC	/* Write fault (hard disk) */
-#define	EDRF	0xE0	/* Status register error (hard disk) */
-#define	EDSF	0xFF	/* Sense operation failed (hard disk) */
+#define	EDWF	0xCC		/* Write fault (hard disk) */
+#define	EDRF	0xE0		/* Status register error (hard disk) */
+#define	EDSF	0xFF		/* Sense operation failed (hard disk) */
 
 #endif /* _ERRNO_DISK_H */
diff --git a/com32/gplinclude/disk/error.h b/com32/gplinclude/disk/error.h
index 27683572..e00266fe 100644
--- a/com32/gplinclude/disk/error.h
+++ b/com32/gplinclude/disk/error.h
@@ -9,5 +9,5 @@
 
 #ifndef _ERROR_H_
 #define _ERROR_H_
-void get_error(const char*);
+void get_error(const char *);
 #endif /* _ERROR_H_ */
diff --git a/com32/gplinclude/disk/geom.h b/com32/gplinclude/disk/geom.h
index 0d3eed57..359c7cf9 100644
--- a/com32/gplinclude/disk/geom.h
+++ b/com32/gplinclude/disk/geom.h
@@ -29,7 +29,7 @@
  *       returned by a v2.x implementation; similarly for the Device Path info
  **/
 struct edd_device_parameters {
-	uint16_t len;				/* size of returned data */
+    uint16_t len;		/* size of returned data */
 	/**
 	 * Bitfields for IBM/MS INT 13 Extensions information flags:
 	 * Bit(s)    Description    (Table 00274)
@@ -42,28 +42,28 @@ struct edd_device_parameters {
 	 * 6    CHS information set to maximum supported values, not current media
 	 * 15-7    reserved (0)
 	 **/
-	uint16_t info;				/* information flags */
-	uint32_t cylinders;			/* number of physical cylinders on drive */
-	uint32_t heads;				/* number of physical heads on drive */
-	uint32_t sectors_per_track;		/* number of physical sectors per track */
-	uint64_t sectors;			/* total number of sectors on drive */
-	uint16_t bytes_per_sector;		/* bytes per sector */
-	/* --- v2.0+ --- */
-	uint32_t dpte_pointer;			/* EDD configuration parameters, FFFFh:FFFFh if not available */
-	/* --- v3.0 --- */
-	uint16_t device_path_information;	/* signature BEDDh to indicate presence of Device Path info */
-	uint8_t device_path_length;		/* length of Device Path information, including signature and this byte (24h for v3.0) */
-	uint8_t device_path_reserved;		/* reserved (0) */
-	uint16_t device_path_reserved_2;	/* reserved (0) */
-	uint8_t host_bus_type[4];		/* ASCIZ name of host bus ("ISA" or "PCI") */
-	uint8_t interface_type[8];		/* ASCIZ name of interface type
-						 *         "ATA"
-						 *         "ATAPI"
-						 *         "SCSI"
-						 *         "USB"
-						 *         "1394" IEEE 1394 (FireWire)
-						 *         "FIBRE" Fibre Channel
-						 */
+    uint16_t info;		/* information flags */
+    uint32_t cylinders;		/* number of physical cylinders on drive */
+    uint32_t heads;		/* number of physical heads on drive */
+    uint32_t sectors_per_track;	/* number of physical sectors per track */
+    uint64_t sectors;		/* total number of sectors on drive */
+    uint16_t bytes_per_sector;	/* bytes per sector */
+    /* --- v2.0+ --- */
+    uint32_t dpte_pointer;	/* EDD configuration parameters, FFFFh:FFFFh if not available */
+    /* --- v3.0 --- */
+    uint16_t device_path_information;	/* signature BEDDh to indicate presence of Device Path info */
+    uint8_t device_path_length;	/* length of Device Path information, including signature and this byte (24h for v3.0) */
+    uint8_t device_path_reserved;	/* reserved (0) */
+    uint16_t device_path_reserved_2;	/* reserved (0) */
+    uint8_t host_bus_type[4];	/* ASCIZ name of host bus ("ISA" or "PCI") */
+    uint8_t interface_type[8];	/* ASCIZ name of interface type
+				 *         "ATA"
+				 *         "ATAPI"
+				 *         "SCSI"
+				 *         "USB"
+				 *         "1394" IEEE 1394 (FireWire)
+				 *         "FIBRE" Fibre Channel
+				 */
 	/**
 	 * Format of EDD v3.0 Interface Path:
 	 * Offset    Size    Description    (Table 00275)
@@ -76,33 +76,33 @@ struct edd_device_parameters {
 	 * 02h    BYTE    PCI function number
 	 * 03h 5 BYTEs    reserved (0)
 	 **/
-	union {
-		struct {
-			uint16_t base_address;
-			uint16_t reserved1;
-			uint32_t reserved2;
-		} __attribute__ ((packed)) isa;
-		struct {
-			uint8_t bus;
-			uint8_t slot;
-			uint8_t function;
-			uint8_t channel;
-			uint32_t reserved;
-		} __attribute__ ((packed)) pci;
-		/* pcix is same as pci */
-		struct {
-			uint64_t reserved;
-		} __attribute__ ((packed)) ibnd;
-		struct {
-			uint64_t reserved;
-		} __attribute__ ((packed)) xprs;
-		struct {
-			uint64_t reserved;
-		} __attribute__ ((packed)) htpt;
-		struct {
-			uint64_t reserved;
-		} __attribute__ ((packed)) unknown;
-	} interface_path;
+    union {
+	struct {
+	    uint16_t base_address;
+	    uint16_t reserved1;
+	    uint32_t reserved2;
+	} __attribute__ ((packed)) isa;
+	struct {
+	    uint8_t bus;
+	    uint8_t slot;
+	    uint8_t function;
+	    uint8_t channel;
+	    uint32_t reserved;
+	} __attribute__ ((packed)) pci;
+	/* pcix is same as pci */
+	struct {
+	    uint64_t reserved;
+	} __attribute__ ((packed)) ibnd;
+	struct {
+	    uint64_t reserved;
+	} __attribute__ ((packed)) xprs;
+	struct {
+	    uint64_t reserved;
+	} __attribute__ ((packed)) htpt;
+	struct {
+	    uint64_t reserved;
+	} __attribute__ ((packed)) unknown;
+    } interface_path;
 	/**
 	 * Format of EDD v3.0 Device Path:
 	 * Offset    Size    Description    (Table 00276)
@@ -124,83 +124,83 @@ struct edd_device_parameters {
 	 * ---FibreChannel---
 	 * 00h    QWORD    Word Wide Number (WWN)
 	 **/
-	union {
-		struct {
-			uint8_t device;
-			uint8_t reserved1;
-			uint16_t reserved2;
-			uint32_t reserved3;
-			uint64_t reserved4;
-		} __attribute__ ((packed)) ata;
-		struct {
-			uint8_t device;
-			uint8_t lun;
-			uint8_t reserved1;
-			uint8_t reserved2;
-			uint32_t reserved3;
-			uint64_t reserved4;
-		} __attribute__ ((packed)) atapi;
-		struct {
-			uint16_t id;
-			uint64_t lun;
-			uint16_t reserved1;
-			uint32_t reserved2;
-		} __attribute__ ((packed)) scsi;
-		struct {
-			uint64_t serial_number;
-			uint64_t reserved;
-		} __attribute__ ((packed)) usb;
-		struct {
-			uint64_t eui;
-			uint64_t reserved;
-		} __attribute__ ((packed)) i1394;
-		struct {
-			uint64_t wwid;
-			uint64_t lun;
-		} __attribute__ ((packed)) fibre;
-		struct {
-			uint64_t identity_tag;
-			uint64_t reserved;
-		} __attribute__ ((packed)) i2o;
-		struct {
-			uint32_t array_number;
-			uint32_t reserved1;
-			uint64_t reserved2;
-		} __attribute__ ((packed)) raid;
-		struct {
-			uint8_t device;
-			uint8_t reserved1;
-			uint16_t reserved2;
-			uint32_t reserved3;
-			uint64_t reserved4;
-		} __attribute__ ((packed)) sata;
-		struct {
-			uint64_t reserved1;
-			uint64_t reserved2;
-		} __attribute__ ((packed)) unknown;
-	} device_path;
-	uint8_t reserved;			/* reserved (0) */
-	uint8_t checksum;			/* checksum of bytes 1Eh-40h (two's complement of sum, which makes
-					 * the 8-bit sum of bytes 1Eh-41h equal 00h) */
+    union {
+	struct {
+	    uint8_t device;
+	    uint8_t reserved1;
+	    uint16_t reserved2;
+	    uint32_t reserved3;
+	    uint64_t reserved4;
+	} __attribute__ ((packed)) ata;
+	struct {
+	    uint8_t device;
+	    uint8_t lun;
+	    uint8_t reserved1;
+	    uint8_t reserved2;
+	    uint32_t reserved3;
+	    uint64_t reserved4;
+	} __attribute__ ((packed)) atapi;
+	struct {
+	    uint16_t id;
+	    uint64_t lun;
+	    uint16_t reserved1;
+	    uint32_t reserved2;
+	} __attribute__ ((packed)) scsi;
+	struct {
+	    uint64_t serial_number;
+	    uint64_t reserved;
+	} __attribute__ ((packed)) usb;
+	struct {
+	    uint64_t eui;
+	    uint64_t reserved;
+	} __attribute__ ((packed)) i1394;
+	struct {
+	    uint64_t wwid;
+	    uint64_t lun;
+	} __attribute__ ((packed)) fibre;
+	struct {
+	    uint64_t identity_tag;
+	    uint64_t reserved;
+	} __attribute__ ((packed)) i2o;
+	struct {
+	    uint32_t array_number;
+	    uint32_t reserved1;
+	    uint64_t reserved2;
+	} __attribute__ ((packed)) raid;
+	struct {
+	    uint8_t device;
+	    uint8_t reserved1;
+	    uint16_t reserved2;
+	    uint32_t reserved3;
+	    uint64_t reserved4;
+	} __attribute__ ((packed)) sata;
+	struct {
+	    uint64_t reserved1;
+	    uint64_t reserved2;
+	} __attribute__ ((packed)) unknown;
+    } device_path;
+    uint8_t reserved;		/* reserved (0) */
+    uint8_t checksum;		/* checksum of bytes 1Eh-40h (two's complement of sum, which makes
+				 * the 8-bit sum of bytes 1Eh-41h equal 00h) */
 } __attribute__ ((packed));
 
 /*
  * Disk parameters
  */
 struct driveinfo {
-	int disk;				/* Disk port (0x80 - 0xff) */
-	/* Legacy C/H/S */
-	int cbios;				/* CHS geometry is valid */
-	int legacy_max_head;
-	int legacy_max_cylinder;
-	int legacy_sectors_per_track;
-	int legacy_max_drive;
-	int legacy_type;			/* Drive type (AT/PS2 floppies only) */
-	/* EDD support */
-	int ebios;				/* EBIOS supported on this disk */
-	int edd_version;			/* EBIOS major version */
-	int edd_functionality_subset;
-	struct edd_device_parameters edd_params;/* EDD parameters */
+    int disk;			/* Disk port (0x80 - 0xff) */
+    /* Legacy C/H/S */
+    int cbios;			/* CHS geometry is valid */
+    int legacy_max_head;
+    int legacy_max_cylinder;
+    int legacy_sectors_per_track;
+    int legacy_max_drive;
+    int legacy_type;		/* Drive type (AT/PS2 floppies only) */
+    /* EDD support */
+    int ebios;			/* EBIOS supported on this disk */
+    int edd_version;		/* EBIOS major version */
+    int edd_functionality_subset;
+    struct edd_device_parameters edd_params;	/* EDD parameters */
 };
 
 /**
@@ -290,36 +290,37 @@ struct driveinfo {
  *     10h    ATAPI Removable Media Device
  */
 enum diskette_drive_types {
-	DISKETTE_360K = 1,
-	DISKETTE_1_2M = 2,
-	DISKETTE_720K = 3,
-	DISKETTE_1_44M = 4,
-	DISKETTE_2_88M = 6,
-	DISKETTE_ATAPI = 10,
+    DISKETTE_360K = 1,
+    DISKETTE_1_2M = 2,
+    DISKETTE_720K = 3,
+    DISKETTE_1_44M = 4,
+    DISKETTE_2_88M = 6,
+    DISKETTE_ATAPI = 10,
 };
 
 /**
  * chs_to_lba - compute lba value from cylinder, head and sector number
  **/
-static inline int chs_to_lba(const struct driveinfo* drive_info,
-			     const unsigned int cylinder, const unsigned int head,
-			     const unsigned int sector)
+static inline int chs_to_lba(const struct driveinfo *drive_info,
+			     const unsigned int cylinder,
+			     const unsigned int head, const unsigned int sector)
 {
-	/* Use EDD, if valid */
-	if (drive_info->edd_params.sectors_per_track > 0 &&
-	    drive_info->edd_params.heads > 0)
-		return (sector - 1) + (head * drive_info->edd_params.sectors_per_track) +
-		       (cylinder * (drive_info->edd_params.heads) *
-		                    drive_info->edd_params.sectors_per_track);
-	else if (drive_info->cbios)
-		return (sector - 1) + (head * drive_info->legacy_sectors_per_track) +
-		       (cylinder * (drive_info->legacy_max_head + 1) *
-		                    drive_info->legacy_sectors_per_track);
+    /* Use EDD, if valid */
+    if (drive_info->edd_params.sectors_per_track > 0 &&
+	drive_info->edd_params.heads > 0)
+	return (sector - 1) +
+	    (head * drive_info->edd_params.sectors_per_track) +
+	    (cylinder * (drive_info->edd_params.heads) *
+	     drive_info->edd_params.sectors_per_track);
+    else if (drive_info->cbios)
+	return (sector - 1) + (head * drive_info->legacy_sectors_per_track) +
+	    (cylinder * (drive_info->legacy_max_head + 1) *
+	     drive_info->legacy_sectors_per_track);
 }
 
-void lba_to_chs(const struct driveinfo* drive_info, const int lba,
-		unsigned int* cylinder, unsigned int* head,
-		unsigned int* sector);
+void lba_to_chs(const struct driveinfo *drive_info, const int lba,
+		unsigned int *cylinder, unsigned int *head,
+		unsigned int *sector);
 int get_drive_parameters(struct driveinfo *drive_info);
 
 #endif /* _GEOM_H */
diff --git a/com32/gplinclude/disk/msdos.h b/com32/gplinclude/disk/msdos.h
index 405b9b99..cb39dad2 100644
--- a/com32/gplinclude/disk/msdos.h
+++ b/com32/gplinclude/disk/msdos.h
@@ -13,7 +13,7 @@
 #include <disk/geom.h>
 #include <disk/partition.h>
 
-typedef void (*p_callback)(struct driveinfo *, struct part_entry *, int, int);
+typedef void (*p_callback) (struct driveinfo *, struct part_entry *, int, int);
 int parse_partition_table(struct driveinfo *, p_callback);
 
 #endif /* _MSDOS_H_ */
diff --git a/com32/gplinclude/disk/partition.h b/com32/gplinclude/disk/partition.h
index be6bfaab..5edf8281 100644
--- a/com32/gplinclude/disk/partition.h
+++ b/com32/gplinclude/disk/partition.h
@@ -21,17 +21,17 @@
 
 /* A DOS partition table entry */
 struct part_entry {
-	uint8_t active_flag;		/* 0x80 if "active" */
-	uint8_t start_head;
-	uint8_t start_sect;
-	uint8_t start_cyl;
-	uint8_t ostype;
-	uint8_t end_head;
-	uint8_t end_sect;
-	uint8_t end_cyl;
-	uint32_t start_lba;
-	uint32_t length;
-} __attribute__((packed));
+    uint8_t active_flag;	/* 0x80 if "active" */
+    uint8_t start_head;
+    uint8_t start_sect;
+    uint8_t start_cyl;
+    uint8_t ostype;
+    uint8_t end_head;
+    uint8_t end_sect;
+    uint8_t end_cyl;
+    uint32_t start_lba;
+    uint32_t length;
+} __attribute__ ((packed));
 
-void get_label(int label, char** buffer_label);
+void get_label(int label, char **buffer_label);
 #endif /* _PARTITION_H_ */
diff --git a/com32/gplinclude/disk/read.h b/com32/gplinclude/disk/read.h
index 43762a68..08a9dd3e 100644
--- a/com32/gplinclude/disk/read.h
+++ b/com32/gplinclude/disk/read.h
@@ -12,7 +12,7 @@
 
 #include <disk/geom.h>
 
-int read_mbr(int, void*);
-int dev_read(int, void*, unsigned int, int);
-int read_sectors(struct driveinfo*, void*, const unsigned int, const int);
+int read_mbr(int, void *);
+int dev_read(int, void *, unsigned int, int);
+int read_sectors(struct driveinfo *, void *, const unsigned int, const int);
 #endif /* _READ_H */
diff --git a/com32/gplinclude/disk/swsusp.h b/com32/gplinclude/disk/swsusp.h
index 1d77c878..3e9acacf 100644
--- a/com32/gplinclude/disk/swsusp.h
+++ b/com32/gplinclude/disk/swsusp.h
@@ -8,12 +8,12 @@
 #define SWSUSP_SIG	"S1SUSPEND"
 
 struct swsusp_header {
-	char reserved[PAGE_SIZE - 20 - sizeof(unsigned long) - sizeof(int)];
-	unsigned long image;
-	unsigned int flags;	/* Flags to pass to the "boot" kernel */
-	char	orig_sig[10];
-	char	sig[10];
-} __attribute__((packed));
+    char reserved[PAGE_SIZE - 20 - sizeof(unsigned long) - sizeof(int)];
+    unsigned long image;
+    unsigned int flags;		/* Flags to pass to the "boot" kernel */
+    char orig_sig[10];
+    char sig[10];
+} __attribute__ ((packed));
 
-int swsusp_check(struct driveinfo*, struct part_entry*);
+int swsusp_check(struct driveinfo *, struct part_entry *);
 #endif /* _SWSUSP_H */
diff --git a/com32/gplinclude/disk/util.h b/com32/gplinclude/disk/util.h
index 20a9428f..52f085a7 100644
--- a/com32/gplinclude/disk/util.h
+++ b/com32/gplinclude/disk/util.h
@@ -17,5 +17,5 @@
 
 #include <com32.h>
 
-int int13_retry(const com32sys_t *inreg, com32sys_t *outreg);
+int int13_retry(const com32sys_t * inreg, com32sys_t * outreg);
 #endif /* _UTIL_H_ */
diff --git a/com32/gplinclude/disk/write.h b/com32/gplinclude/disk/write.h
index faa80c7d..89d26fc6 100644
--- a/com32/gplinclude/disk/write.h
+++ b/com32/gplinclude/disk/write.h
@@ -17,12 +17,10 @@
 
 #include <disk/geom.h>
 
-int write_sectors(const struct driveinfo*, const unsigned int,
+int write_sectors(const struct driveinfo *, const unsigned int,
 		  const void *, const int);
-int write_verify_sector(struct driveinfo* drive_info,
-			const unsigned int,
-			const void *);
-int write_verify_sectors(struct driveinfo*,
-			 const unsigned int,
-			 const void *, const int);
+int write_verify_sector(struct driveinfo *drive_info,
+			const unsigned int, const void *);
+int write_verify_sectors(struct driveinfo *,
+			 const unsigned int, const void *, const int);
 #endif