From: Tobias Stoeckmann Date: Fri, 3 Apr 2026 07:48:33 +0000 (+0200) Subject: Fix grammar and typos in code comments X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98ae51751fbd032d532698c3466a809aba90df21;p=thirdparty%2Futil-linux.git Fix grammar and typos in code comments No functional change. Signed-off-by: Tobias Stoeckmann --- diff --git a/include/debug.h b/include/debug.h index b34c065a9..e66bca56c 100644 --- a/include/debug.h +++ b/include/debug.h @@ -9,21 +9,21 @@ /* * util-linux debug macros * - * The debug stuff is based on _debug_mask that controls what outputs is - * expected. The mask is usually initialized by _DEBUG= env.variable + * The debug stuff is based on _debug_mask that controls what output is + * expected. The mask is usually initialized by _DEBUG= env.variable. * * After successful initialization the flag _DEBUG_INIT is always set * to the mask (this flag is required). The is usually library API - * prefix (e.g. MNT_) or program name (e.g. CFDISK_) + * prefix (e.g. MNT_) or program name (e.g. CFDISK_). * - * In the code is possible to use + * In the code it is possible to use * * DBG(FOO, ul_debug("this is output for foo")); * - * where for the FOO has to be defined _DEBUG_FOO. + * where _DEBUG_FOO has to be defined for FOO output. * * It's possible to initialize the mask by comma delimited strings with - * subsystem names (e.g. "LIBMOUNT_DEBUG=options,tab"). In this case is + * subsystem names (e.g. "LIBMOUNT_DEBUG=options,tab"). In this case it is * necessary to define mask names array. This functionality is optional. * * It's strongly recommended to use UL_* macros to define/declare/use diff --git a/lib/timer.c b/lib/timer.c index 2f7e90cd4..cde0a3932 100644 --- a/lib/timer.c +++ b/lib/timer.c @@ -14,7 +14,7 @@ #include "timer.h" /* - * Note the timeout is used for the first signal, then the signal is send + * Note the timeout is used for the first signal, then the signal is sent * repeatedly in interval ~1% of the original timeout to avoid race in signal * handling -- for example you want to use timer to define timeout for a * syscall: @@ -23,8 +23,8 @@ * syscall() * cancel_timer() * - * if the timeout is too short than it's possible that the signal is delivered - * before application enter the syscall function. For this reason timer send + * if the timeout is too short then it's possible that the signal is delivered + * before application enters the syscall function. For this reason timer sends * the signal repeatedly. * * The applications need to ensure that they can tolerate multiple signal diff --git a/libblkid/src/partitions/gpt.c b/libblkid/src/partitions/gpt.c index dc5bcf3aa..f977ed53a 100644 --- a/libblkid/src/partitions/gpt.c +++ b/libblkid/src/partitions/gpt.c @@ -380,7 +380,7 @@ static int probe_gpt_pt(blkid_probe pr, blkid_partlist_increment_partno(ls); continue; } - /* the partition has to inside usable range */ + /* the partition has to be inside usable range */ if (start < fu || start + size - 1 > lu) { DBG(LOWPROBE, ul_debug( "GPT entry[%d] overflows usable area - ignore", diff --git a/libblkid/src/partitions/partitions.c b/libblkid/src/partitions/partitions.c index e838b3db1..f976de064 100644 --- a/libblkid/src/partitions/partitions.c +++ b/libblkid/src/partitions/partitions.c @@ -435,7 +435,7 @@ static blkid_partition new_partition(blkid_partlist ls, blkid_parttable tab) if (ls->nparts + 1 > ls->nparts_max) { /* Linux kernel has DISK_MAX_PARTS=256, but it's too much for - * generic Linux machine -- let start with 32 partitions. + * generic Linux machine -- let's start with 32 partitions. */ void *tmp = reallocarray(ls->parts, ls->nparts_max + 32, sizeof(struct blkid_struct_partition)); @@ -1458,7 +1458,7 @@ blkid_loff_t blkid_partition_get_start(blkid_partition par) * rest of the partition has to be inaccessible for mkfs or mkswap * programs, we need a small space for boot loaders only. * - * For some unknown reason this (safe) practice is not to used for + * For some unknown reason this (safe) practice is not used for * nested BSD, Solaris, ..., partition tables in Linux kernel. * * Returns: size of the partition (in 512-sectors). diff --git a/libmount/src/fs.c b/libmount/src/fs.c index 9c8e22cf9..d816a3a58 100644 --- a/libmount/src/fs.c +++ b/libmount/src/fs.c @@ -1179,7 +1179,7 @@ const char *mnt_fs_get_vfs_options(struct libmnt_fs *fs) * mnt_fs_get_vfs_options_all: * @fs: fstab/mtab entry pointer * - * Returns: pointer to newlly allocated string (can be freed by free(3)) or + * Returns: pointer to newly allocated string (can be freed by free(3)) or * NULL in case of error. The string contains all (including defaults) mount * options. */ diff --git a/sys-utils/losetup.c b/sys-utils/losetup.c index be8bfd933..2316ad6da 100644 --- a/sys-utils/losetup.c +++ b/sys-utils/losetup.c @@ -574,7 +574,7 @@ static int create_loop(struct loopdev_cxt *lc, int hasdev = loopcxt_has_device(lc); int rc = 0, ntries = 0; - /* losetup --find --noverlap file.img */ + /* losetup --find --nooverlap file.img */ if (!hasdev && nooverlap) { rc = loopcxt_find_overlap(lc, file, offset, sizelimit); switch (rc) { @@ -621,7 +621,7 @@ static int create_loop(struct loopdev_cxt *lc, if (hasdev) loopcxt_add_device(lc); - /* losetup --noverlap /dev/loopN file.img */ + /* losetup --nooverlap /dev/loopN file.img */ if (hasdev && nooverlap) { struct loopdev_cxt lc2;