From: mr-bronson Date: Tue, 27 Aug 2024 06:19:47 +0000 (+0000) Subject: fix it's vs. its, and some adjacent errors X-Git-Tag: v2.42-start~223^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=70f8db2d87444131a11bdc620332b72e8ae7d629;p=thirdparty%2Futil-linux.git fix it's vs. its, and some adjacent errors But still need rewrite of opaque comments @ libmount/src/context_umount.c:350-353 and libmount/src/context.c:1149-1150. --- diff --git a/Documentation/releases/v2.22-ReleaseNotes b/Documentation/releases/v2.22-ReleaseNotes index b3163023b5..a8045565a4 100644 --- a/Documentation/releases/v2.22-ReleaseNotes +++ b/Documentation/releases/v2.22-ReleaseNotes @@ -40,7 +40,7 @@ eject(1): - supports new options --manualeject, --force and --no-partitions-unmount lslocks(1) - - this NEW COMMAND prints local system locks and it's replacement to very + - this NEW COMMAND prints local system locks; it's a replacement for very long time unmaintained lslk(1) wdctl(8): diff --git a/Documentation/releases/v2.25-ReleaseNotes b/Documentation/releases/v2.25-ReleaseNotes index 0722507f5a..ddc15bfebe 100644 --- a/Documentation/releases/v2.25-ReleaseNotes +++ b/Documentation/releases/v2.25-ReleaseNotes @@ -423,7 +423,7 @@ getopt: hexdump: - Create struct hexdump containing previously global variables. [Ondrej Oprala] - Merge hexsyntax.c into hexdump.c [Ondrej Oprala] - - Rename struct _pr to struct hexdump_pr and remove it's typedef [Ondrej Oprala] + - Rename struct _pr to struct hexdump_pr and remove its typedef [Ondrej Oprala] - add --color to the man page [Karel Zak] - add __attribute__ ((__noreturn__)) to bad*() functions [Ondrej Oprala] - add basic tests [Ondrej Oprala] diff --git a/Documentation/releases/v2.26-ReleaseNotes b/Documentation/releases/v2.26-ReleaseNotes index 84012bbdf0..eb610089ea 100644 --- a/Documentation/releases/v2.26-ReleaseNotes +++ b/Documentation/releases/v2.26-ReleaseNotes @@ -756,7 +756,7 @@ mkswap: - remove memory leaks [LeakSanitizer] [valgrind] [Sami Kerola] - remove system architecture specific max swap size checks [Sami Kerola] - remove unnecessary size check [Sami Kerola] - - set variable only when it's value is known [Sami Kerola] + - set variable only when its value is known [Sami Kerola] - use err() rather than perror() && exit() [Sami Kerola] - various minor improvement [Sami Kerola] more: diff --git a/libblkid/src/Makemodule.am b/libblkid/src/Makemodule.am index 3fae3f039e..78ebb22253 100644 --- a/libblkid/src/Makemodule.am +++ b/libblkid/src/Makemodule.am @@ -1,5 +1,5 @@ -# blkid.h is generated, so it's store in builddir! +# blkid.h is generated, so it's stored in builddir! blkidincdir = $(includedir)/blkid nodist_blkidinc_HEADERS = libblkid/src/blkid.h diff --git a/libblkid/src/superblocks/sysv.c b/libblkid/src/superblocks/sysv.c index a9085c44cc..a5caee9bb0 100644 --- a/libblkid/src/superblocks/sysv.c +++ b/libblkid/src/superblocks/sysv.c @@ -146,8 +146,8 @@ const struct blkid_idinfo sysv_idinfo = .usage = BLKID_USAGE_FILESYSTEM, .probefunc = probe_sysv, - /* SYSV is BE and LE and superblock could be on four positions. It's - * simpler to probe for the magic string by .probefunc(). + /* SYSV is BE and LE, and superblock could be one of four positions. + * So it's simpler to probe for the magic string via .probefunc(). */ .magics = BLKID_NONE_MAGIC }; diff --git a/libfdisk/src/partition.c b/libfdisk/src/partition.c index 22a07af702..9a5614d215 100644 --- a/libfdisk/src/partition.c +++ b/libfdisk/src/partition.c @@ -1142,7 +1142,7 @@ static int resize_get_first_possible( * counts size of all this space. * * This is core of the partition start offset move operation. We can move the - * start within the current partition of to the another free space. It's + * start within the current partition to another free space. It's * forbidden to move start of the partition to another already defined * partition. */ diff --git a/libmount/src/Makemodule.am b/libmount/src/Makemodule.am index f8cedbd280..66963bb094 100644 --- a/libmount/src/Makemodule.am +++ b/libmount/src/Makemodule.am @@ -1,5 +1,5 @@ -# libmount.h is generated, so it's store in builddir! +# libmount.h is generated, so it's stored in builddir! mountincdir = $(includedir)/libmount nodist_mountinc_HEADERS = libmount/src/libmount.h diff --git a/libmount/src/context.c b/libmount/src/context.c index d38e3671f6..ee27386afd 100644 --- a/libmount/src/context.c +++ b/libmount/src/context.c @@ -1146,8 +1146,8 @@ fail: * @cxt: mount context * @optstr: comma delimited mount options * - * Note that MS_MOVE cannot be specified as "string". It's operation that - * is no supported in fstab (etc.) + * Note that MS_MOVE cannot be specified as "string". It's an operation that + * is not supported in fstab (etc.) * * Returns: 0 on success, negative number in case of error. */ diff --git a/libmount/src/context_umount.c b/libmount/src/context_umount.c index c22ffbd80b..aae7fa4102 100644 --- a/libmount/src/context_umount.c +++ b/libmount/src/context_umount.c @@ -349,7 +349,7 @@ static int lookup_umount_fs_by_mountinfo(struct libmnt_context *cxt, const char /* This function searches for FS according to cxt->fs->target, * apply result to cxt->fs and it's umount replacement to - * mnt_context_apply_fstab(), use mnt_context_tab_applied() + * mnt_context_apply_fstab(); use mnt_context_tab_applied() * to check result. * * The goal is to minimize situations when we need to parse diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c index 05ed951bf7..67ea42b943 100644 --- a/misc-utils/findmnt.c +++ b/misc-utils/findmnt.c @@ -2004,7 +2004,7 @@ int main(int argc, char *argv[]) if (!(findmnt.flags & FL_NOSWAPMATCH) && !get_match(COL_TARGET) && get_match(COL_SOURCE)) { /* - * Check if we can swap source and target, it's + * Check if we can swap source and target; it's * not possible if the source is LABEL=/UUID= */ const char *x = get_match(COL_SOURCE); diff --git a/schedutils/chrt.c b/schedutils/chrt.c index dde3e48ce9..91e05831c4 100644 --- a/schedutils/chrt.c +++ b/schedutils/chrt.c @@ -459,7 +459,7 @@ int main(int argc, char **argv) if (ctl->policy == SCHED_DEADLINE) { /* The basic rule is runtime <= deadline <= period, so we can * make deadline and runtime optional on command line. Note we - * don't check any values or set any defaults, it's kernel + * don't check any values or set any defaults; it's kernel's * responsibility. */ if (ctl->deadline == 0) diff --git a/sys-utils/chmem.8.adoc b/sys-utils/chmem.8.adoc index de628aa438..029bc0832c 100644 --- a/sys-utils/chmem.8.adoc +++ b/sys-utils/chmem.8.adoc @@ -47,7 +47,7 @@ Set the specified _RANGE_, _SIZE_, or _BLOCKRANGE_ of memory online. Select the memory _ZONE_ where to set the specified _RANGE_, _SIZE_, or _BLOCKRANGE_ of memory online or offline. By default, memory will be set online to the zone Movable, if possible. *-v*, *--verbose*:: -Verbose mode. Causes *chmem* to print debugging messages about it's progress. +Verbose mode. Causes *chmem* to print debugging messages about its progress. include::man-common/help-version.adoc[] diff --git a/sys-utils/eject.c b/sys-utils/eject.c index 166d591ec7..12b1156008 100644 --- a/sys-utils/eject.c +++ b/sys-utils/eject.c @@ -330,7 +330,7 @@ static void auto_eject(const struct eject_control *ctl) /* * Stops CDROM from opening on manual eject button press. * This can be useful when you carry your laptop - * in your bag while it's on and no CD inserted in it's drive. + * in your bag while it's on and no CD is inserted in its tray. * Implemented as found in Documentation/userspace-api/ioctl/cdrom.rst */ static void manual_eject(const struct eject_control *ctl) diff --git a/tests/ts/hexdump/highlighting b/tests/ts/hexdump/highlighting index cb94615925..b7208fa83a 100755 --- a/tests/ts/hexdump/highlighting +++ b/tests/ts/hexdump/highlighting @@ -57,8 +57,8 @@ $TS_CMD_HEXDUMP $OPTS $ADDRFMT \ $FILES/ascii.in &> $TS_OUTPUT ts_finalize_subtest -# highlight the byte at offset 194 if it's value is 0x61 (a) -# and the byte at offset 130 if it's value is A (0x41) +# highlight the byte at offset 194 if its value is 0x61 (a) +# and the byte at offset 130 if its value is A (0x41) ts_init_subtest "1b_octal-4" TS_EXPECTED+=$BE_EXT $TS_CMD_HEXDUMP $OPTS $ADDRFMT \ @@ -66,8 +66,8 @@ $TS_CMD_HEXDUMP $OPTS $ADDRFMT \ $FILES/ascii.in &> $TS_OUTPUT ts_finalize_subtest -# highlight the byte at offset 194 if it's value is 0x61 (a) -# and the byte at offset 130 if it's value is C (0x41) (false) +# highlight the byte at offset 194 if its value is 0x61 (a) +# and the byte at offset 130 if its value is C (0x41) (false) ts_init_subtest "1b_octal-5" TS_EXPECTED+=$BE_EXT $TS_CMD_HEXDUMP $OPTS $ADDRFMT \ diff --git a/text-utils/column.1.adoc b/text-utils/column.1.adoc index 0fdc534558..38c802c10e 100644 --- a/text-utils/column.1.adoc +++ b/text-utils/column.1.adoc @@ -67,7 +67,7 @@ Input is taken from _file_, or otherwise from standard input. Empty lines are ig The argument _columns_ for *--table-** options is a comma separated list of the column names as defined by *--table-columns*, or names defined by -*--table-column* or it's column number in order as specified by input. It's +*--table-column* or its column number in order as specified by input. It's possible to mix names and numbers. The special placeholder '0' (e.g. -R0) may be used to specify all columns and '-1' (e.g. -R -1) to specify the last visible column. It's possible to use ranges like '1-5' when addressing columns by numbers. diff --git a/text-utils/hexdump.h b/text-utils/hexdump.h index 3233985d73..4b17e26983 100644 --- a/text-utils/hexdump.h +++ b/text-utils/hexdump.h @@ -41,8 +41,8 @@ struct hexdump_clr { struct list_head colorlist; /* next color unit */ const char *fmt; /* the color, UL_COLOR_* */ - off_t offt; /* offset where unit is valid... */ - int range; /* ... and it's range */ + off_t offt; /* offset of range where unit is valid... */ + int range; /* ... and range length */ int val; /* value ... */ char *str; /* ... or string to match */ int invert; /* invert condition? */