The branch main has been updated by emaste:
URL:
https://cgit.FreeBSD.org/src/commit/?id=06a400d76be90bc0ccf6110a1e614d60bafb0f6c
commit 06a400d76be90bc0ccf6110a1e614d60bafb0f6c
Author: Ed Maste <ema...@freebsd.org>
AuthorDate: 2022-09-20 14:26:24 +0000
Commit: Ed Maste <ema...@freebsd.org>
CommitDate: 2022-09-20 14:26:24 +0000
makefs: whitespace cleanup (remove space before tab)
MFC after: 1 week
---
usr.sbin/makefs/cd9660.c | 6 +++---
usr.sbin/makefs/cd9660.h | 4 ++--
usr.sbin/makefs/cd9660/cd9660_eltorito.h | 4 ++--
usr.sbin/makefs/cd9660/cd9660_write.c | 2 +-
usr.sbin/makefs/cd9660/iso9660_rrip.h | 2 +-
usr.sbin/makefs/ffs.c | 4 ++--
usr.sbin/makefs/ffs/ufs_inode.h | 2 +-
usr.sbin/makefs/makefs.c | 2 +-
usr.sbin/makefs/makefs.h | 2 +-
9 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c
index a83ff753b069..ac6a263ec2df 100644
--- a/usr.sbin/makefs/cd9660.c
+++ b/usr.sbin/makefs/cd9660.c
@@ -886,7 +886,7 @@ cd9660_translate_node(iso9660_disk *diskStructure, fsnode
*node,
* @param const char * The first file name
* @param const char * The second file name
* @returns : -1 if first is less than second, 0 if they are the same, 1 if
- * the second is greater than the first
+ * the second is greater than the first
*/
static int
cd9660_compare_filename(const char *first, const char *second)
@@ -1705,7 +1705,7 @@ cd9660_level2_convert_filename(iso9660_disk
*diskStructure, const char *oldname,
*newname++ = *oldname;
else if (diskStructure->allow_multidot &&
*oldname == '.') {
- *newname++ = '.';
+ *newname++ = '.';
} else {
*newname++ = '_';
}
@@ -1852,7 +1852,7 @@ cd9660_compute_offsets(iso9660_disk *diskStructure,
cd9660node *node,
cd9660_compute_record_size(diskStructure, child);
if ((cd9660_compute_record_size(diskStructure, child) +
current_sector_usage) >=
- diskStructure->sectorSize) {
+ diskStructure->sectorSize) {
current_sector_usage = 0;
node->fileSectorsUsed++;
}
diff --git a/usr.sbin/makefs/cd9660.h b/usr.sbin/makefs/cd9660.h
index 5f6525d3e94f..d854429a24bf 100644
--- a/usr.sbin/makefs/cd9660.h
+++ b/usr.sbin/makefs/cd9660.h
@@ -316,8 +316,8 @@ void cd9660_721(uint16_t, unsigned
char *);
void cd9660_731(uint32_t, unsigned char *);
void cd9660_722(uint16_t, unsigned char *);
void cd9660_732(uint32_t, unsigned char *);
-void cd9660_bothendian_dword(uint32_t dw, unsigned char *);
-void cd9660_bothendian_word(uint16_t dw, unsigned char *);
+void cd9660_bothendian_dword(uint32_t dw, unsigned char *);
+void cd9660_bothendian_word(uint16_t dw, unsigned char *);
void cd9660_set_date(char *, time_t);
void cd9660_time_8426(unsigned char *, time_t);
void cd9660_time_915(unsigned char *, time_t);
diff --git a/usr.sbin/makefs/cd9660/cd9660_eltorito.h
b/usr.sbin/makefs/cd9660/cd9660_eltorito.h
index cbc3f8419e31..423fff93ea21 100644
--- a/usr.sbin/makefs/cd9660/cd9660_eltorito.h
+++ b/usr.sbin/makefs/cd9660/cd9660_eltorito.h
@@ -131,7 +131,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;
@@ -144,7 +144,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 71e884f792d9..c77ba2b5f198 100644
--- a/usr.sbin/makefs/cd9660/cd9660_write.c
+++ b/usr.sbin/makefs/cd9660/cd9660_write.c
@@ -316,7 +316,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/iso9660_rrip.h
b/usr.sbin/makefs/cd9660/iso9660_rrip.h
index 0c7b89ec860b..3e1a6cb0e7d8 100644
--- a/usr.sbin/makefs/cd9660/iso9660_rrip.h
+++ b/usr.sbin/makefs/cd9660/iso9660_rrip.h
@@ -209,7 +209,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;
diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c
index 81101b6aa6bf..ac214a775e9d 100644
--- a/usr.sbin/makefs/ffs.c
+++ b/usr.sbin/makefs/ffs.c
@@ -907,7 +907,7 @@ ffs_populate_dir(const char *dir, fsnode *root, fsinfo_t
*fsopts)
static void
ffs_write_file(union dinode *din, uint32_t ino, void *buf, fsinfo_t *fsopts)
{
- int isfile, ffd;
+ int isfile, ffd;
char *fbuf, *p;
off_t bufleft, chunk, offset;
ssize_t nread;
@@ -1097,7 +1097,7 @@ ffs_make_dirbuf(dirbuf_t *dbuf, const char *name, fsnode
*node, int needswap)
static void
ffs_write_inode(union dinode *dp, uint32_t ino, const fsinfo_t *fsopts)
{
- char *buf;
+ char *buf;
struct ufs1_dinode *dp1;
struct ufs2_dinode *dp2, *dip;
struct cg *cgp;
diff --git a/usr.sbin/makefs/ffs/ufs_inode.h b/usr.sbin/makefs/ffs/ufs_inode.h
index 2b30b801b36e..e7baff23cbfc 100644
--- a/usr.sbin/makefs/ffs/ufs_inode.h
+++ b/usr.sbin/makefs/ffs/ufs_inode.h
@@ -46,7 +46,7 @@ union dinode {
};
struct inode {
- ino_t i_number; /* The identity of the inode. */
+ ino_t i_number; /* The identity of the inode. */
struct vnode *i_devvp; /* vnode pointer (contains fsopts) */
struct fs *i_fs; /* File system */
union dinode i_din;
diff --git a/usr.sbin/makefs/makefs.c b/usr.sbin/makefs/makefs.c
index 2a50768d3152..2b97c7643e1a 100644
--- a/usr.sbin/makefs/makefs.c
+++ b/usr.sbin/makefs/makefs.c
@@ -100,7 +100,7 @@ main(int argc, char *argv[])
fstype_t *fstype;
fsinfo_t fsoptions;
fsnode *root;
- int ch, i, len;
+ int ch, i, len;
const char *subtree;
const char *specfile;
diff --git a/usr.sbin/makefs/makefs.h b/usr.sbin/makefs/makefs.h
index e88313e8366d..927cbda2e414 100644
--- a/usr.sbin/makefs/makefs.h
+++ b/usr.sbin/makefs/makefs.h
@@ -58,7 +58,7 @@
*
* name "." "bin" "netbsd"
* type S_IFDIR S_IFDIR S_IFREG
- * next > > NULL
+ * next > > NULL
* parent NULL NULL NULL
* child NULL v
*
