From nobody Sun Oct 2 00:37:32 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Mg4mr3YsSz4cwKZ; Sun, 2 Oct 2022 00:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mg4mr2wbwz3f8x; Sun, 2 Oct 2022 00:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664671052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OJqJRSTnnX+BgPIocvaIuegbZk6vvF97EJwGxEF9Yto=; b=HBZcRwbmR6DC4jGOUPAP5SUeA68kFUfmMLV0wxZNSspKniv7j9NWTprx/2LpJLPLsH2v/k 5YVhjKOhaPy/1UpBcMrPOuGl2aYBds1YddUcs7BqXgBvDJ2ljY4qSM19L3QeBS1QKVW76Y tmJiIDtkVpcqoCOaQYwExXafI1mttbUbP8NVdOOTzI8Mu2HwCn2gPJ4hSNngZoqag8d31M MZZ+qgtBDUB79St6qhsAmHetoZF848wX6vdE6z9dfZF+OpnI1ir6uCi9A5h3VuQsMs/xj9 GhEAxtLMoWgowE2Vyp9/SSnoQFjwwsbUuE+6aTqACzWI7KkRWGtFeH6HCykk9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Mg4mr1z3xzh8f; Sun, 2 Oct 2022 00:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2920bWCo070520; Sun, 2 Oct 2022 00:37:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2920bW2T070519; Sun, 2 Oct 2022 00:37:32 GMT (envelope-from git) Date: Sun, 2 Oct 2022 00:37:32 GMT Message-Id: <202210020037.2920bW2T070519@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: e55ea61d07e8 - stable/13 - makefs: whitespace cleanup (remove space before tab) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e55ea61d07e87f181fc86cddaf7d738493d8b53b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664671052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OJqJRSTnnX+BgPIocvaIuegbZk6vvF97EJwGxEF9Yto=; b=wR5+YW73ScqyMQtB6O9ii2Jbh3gan9UeiQyZ53AjmFL4j51zn5owlLzwga/4CculMPBWxA vuirF196AP4Mp2eBBuhwoRVDnSc1a//4EAIXwOnV4RC3JQ/3Gn9WsXXEUb4nXOHv9/fHDy aNHZHvRBZ5msSJgEMYeEjTzYS2UFY1qKPrkJcRPs9D/iPeYdCY352LmrB23PZ+FY5R8FLa ESZDr79VcbMrFHi/cgpqUyDV2t/v3Q+YI+OSVCyl7Bwv5aHaLpOzWjhFIUnJJgW5M0VcQL myDl+GxpnQVbC8vgmaodu1SjyQgsfts/wpvxtKRK+xgqXa773kvQrRJeI3Nniw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664671052; a=rsa-sha256; cv=none; b=TqTLDZFbP/85FxecvdMd8+mCzhIn9mmoO/hvpSU8yfWLlD4IsW2cBKR+H8cjiyCTMOQYoJ FusSG4co5GMY+nmdFkYYYPqabVINg6NTzN2j+k7Ih9C4DSmULkvZlTI34abk+TWq79o6i5 JDl/xA+MQP7k3GT62ExzgxUVT5ejdiO4xhhJ8vS7fc3O2o4b0CEcLCexbZl/w10l8oM/qB KMEYhdqpMusw/sLzh78IjlXvdcMUkryILMtNoC2+n0ne1RtU8YL2TGi6v4AhGZlCg+oCr+ zPgzB9NsBPr53DwrnKBTBabh+/Ca9cBrQfmkmniVdRWhSDzDI+F2ZT7icy9KMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e55ea61d07e87f181fc86cddaf7d738493d8b53b commit e55ea61d07e87f181fc86cddaf7d738493d8b53b Author: Ed Maste AuthorDate: 2022-09-20 14:26:24 +0000 Commit: Ed Maste CommitDate: 2022-10-02 00:37:18 +0000 makefs: whitespace cleanup (remove space before tab) MFC after: 1 week (cherry picked from commit 06a400d76be90bc0ccf6110a1e614d60bafb0f6c) --- 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 29972317c80b..d91ed156c9e0 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 e4caaafa5b1a..07c1ff63b865 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 888a2b3edea7..987f4159b403 100644 --- a/usr.sbin/makefs/makefs.c +++ b/usr.sbin/makefs/makefs.c @@ -97,7 +97,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 68dc0362dd21..e85c1ac33119 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 *