From 841a57a218f5ee41539343ce9ac032daacdd0b16 Mon Sep 17 00:00:00 2001 From: krw Date: Sat, 17 Dec 2016 16:22:04 +0000 Subject: While here nuke some more annoying whitespace nits. --- usr.sbin/makefs/cd9660/cd9660_eltorito.c | 10 +++++----- usr.sbin/makefs/cd9660/cd9660_eltorito.h | 6 +++--- usr.sbin/makefs/cd9660/cd9660_write.c | 4 ++-- usr.sbin/makefs/cd9660/iso.h | 6 +++--- usr.sbin/makefs/cd9660/iso9660_rrip.h | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) (limited to 'usr.sbin/makefs') diff --git a/usr.sbin/makefs/cd9660/cd9660_eltorito.c b/usr.sbin/makefs/cd9660/cd9660_eltorito.c index 60cc8abbcbd..409298d5ca6 100644 --- a/usr.sbin/makefs/cd9660/cd9660_eltorito.c +++ b/usr.sbin/makefs/cd9660/cd9660_eltorito.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660_eltorito.c,v 1.8 2016/10/26 15:31:13 natano Exp $ */ +/* $OpenBSD: cd9660_eltorito.c,v 1.9 2016/12/17 16:22:04 krw Exp $ */ /* $NetBSD: cd9660_eltorito.c,v 1.20 2013/01/28 21:03:28 christos Exp $ */ /* @@ -475,7 +475,7 @@ cd9660_write_mbr_partition_entry(FILE *fd, int idx, off_t sector_start, if (fseeko(fd, (off_t)(idx) * 16 + 0x1be, SEEK_SET) == -1) err(1, "fseeko"); - + val = 0x80; /* Bootable */ fwrite(&val, sizeof(val), 1, fd); @@ -538,7 +538,7 @@ cd9660_write_apm_partition_entry(FILE *fd, int idx, int total_partitions, apm32 = 0; /* pmLgDataStart */ fwrite(&apm32, sizeof(apm32), 1, fd); - /* pmDataCnt */ + /* pmDataCnt */ apm32 = htobe32(nsectors); fwrite(&apm32, sizeof(apm32), 1, fd); /* pmPartStatus */ @@ -573,9 +573,9 @@ cd9660_write_boot(iso9660_disk *diskStructure, FILE *fd) TAILQ_FOREACH(t, &diskStructure->boot_images, image_list) { cd9660_copy_file(diskStructure, fd, t->sector, t->filename); - if (t->system == ET_SYS_MAC) + if (t->system == ET_SYS_MAC) apm_partitions++; - if (t->system == ET_SYS_PPC) + if (t->system == ET_SYS_PPC) mbr_partitions++; } diff --git a/usr.sbin/makefs/cd9660/cd9660_eltorito.h b/usr.sbin/makefs/cd9660/cd9660_eltorito.h index e0a19c9440e..43483018ef3 100644 --- a/usr.sbin/makefs/cd9660/cd9660_eltorito.h +++ b/usr.sbin/makefs/cd9660/cd9660_eltorito.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660_eltorito.h,v 1.2 2016/10/16 20:26:56 natano Exp $ */ +/* $OpenBSD: cd9660_eltorito.h,v 1.3 2016/12/17 16:22:04 krw Exp $ */ /* $NetBSD: cd9660_eltorito.h,v 1.5 2009/07/04 14:31:38 ahoka Exp $ */ /* @@ -127,7 +127,7 @@ struct boot_catalog_entry { char entry_type; union { boot_catalog_validation_entry VE; - boot_catalog_initial_entry IE; + boot_catalog_initial_entry IE; boot_catalog_section_header SH; boot_catalog_section_entry SE; boot_catalog_section_entry_extension EX; @@ -140,7 +140,7 @@ struct boot_catalog_entry { struct cd9660_boot_image { char *filename; int size; - int sector; /* copied to LoadRBA */ + int sector; /* copied to LoadRBA */ int num_sectors; unsigned int loadSegment; u_char targetMode; diff --git a/usr.sbin/makefs/cd9660/cd9660_write.c b/usr.sbin/makefs/cd9660/cd9660_write.c index ee45798cc98..2dd1819fc7f 100644 --- a/usr.sbin/makefs/cd9660/cd9660_write.c +++ b/usr.sbin/makefs/cd9660/cd9660_write.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660_write.c,v 1.6 2016/10/26 15:31:13 natano Exp $ */ +/* $OpenBSD: cd9660_write.c,v 1.7 2016/12/17 16:22:04 krw Exp $ */ /* $NetBSD: cd9660_write.c,v 1.17 2013/10/19 17:16:37 christos Exp $ */ /* @@ -285,7 +285,7 @@ cd9660_write_file(iso9660_disk *diskStructure, FILE *fd, cd9660node *writenode) /* * Now loop over children, writing out their directory * records - beware of sector boundaries - */ + */ TAILQ_FOREACH(temp, &writenode->cn_children, cn_next_child) { /* * Copy the temporary record and adjust its size diff --git a/usr.sbin/makefs/cd9660/iso.h b/usr.sbin/makefs/cd9660/iso.h index aa7eef44cdd..cbf011a1a53 100644 --- a/usr.sbin/makefs/cd9660/iso.h +++ b/usr.sbin/makefs/cd9660/iso.h @@ -1,4 +1,4 @@ -/* $OpenBSD: iso.h,v 1.1 2016/10/18 16:50:55 natano Exp $ */ +/* $OpenBSD: iso.h,v 1.2 2016/12/17 16:22:04 krw Exp $ */ /* $NetBSD: iso.h,v 1.10 2011/09/27 01:01:44 christos Exp $ */ /*- @@ -201,7 +201,7 @@ isonum_721(p) } /* 7.2.2: unsigned big-endian 16-bit value. NOT USED IN KERNEL. */ -static __inline int +static __inline int isonum_722(p) unsigned char *p; { @@ -210,7 +210,7 @@ isonum_722(p) #else return ((char)*p << 8)|p[1]; #endif -} +} /* 7.2.3: unsigned both-endian (little, then big) 16-bit value */ static __inline int diff --git a/usr.sbin/makefs/cd9660/iso9660_rrip.h b/usr.sbin/makefs/cd9660/iso9660_rrip.h index dffefbdb12e..3608eca4629 100644 --- a/usr.sbin/makefs/cd9660/iso9660_rrip.h +++ b/usr.sbin/makefs/cd9660/iso9660_rrip.h @@ -1,4 +1,4 @@ -/* $OpenBSD: iso9660_rrip.h,v 1.3 2016/10/18 16:50:55 natano Exp $ */ +/* $OpenBSD: iso9660_rrip.h,v 1.4 2016/12/17 16:22:04 krw Exp $ */ /* $NetBSD: iso9660_rrip.h,v 1.6 2013/01/28 21:03:28 christos Exp $ */ /* @@ -206,7 +206,7 @@ struct ISO_SUSP_ATTRIBUTES { char type_of[2]; char last_in_suf; /* last entry in the System Use Field? */ /* Dan's addons - will merge later. This allows use of a switch */ - char susp_type; /* SUSP or RRIP */ + char susp_type; /* SUSP or RRIP */ char entry_type; /* Record type */ char write_location; TAILQ_ENTRY(ISO_SUSP_ATTRIBUTES) rr_ll; -- cgit v1.2.3-59-g8ed1b