ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'fix-misspellings' of https://github.com/rffontenelle/util-linux

This commit is contained in:
Karel Zak 2021-04-23 10:49:10 +02:00
parent a51aadb348 993556aaa5
commit ad0963685b
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libfdisk/src/dos.c
View File

@ -1878,7 +1878,7 @@ static int dos_add_partition(struct fdisk_context *cxt,
} }
fdisk_info(cxt, msg); fdisk_info(cxt, msg);
} }
DBG(LABEL, ul_debug("DOS: tring logical")); DBG(LABEL, ul_debug("DOS: trying logical"));
rc = add_logical(cxt, pa, &res); rc = add_logical(cxt, pa, &res);
} else { } else {
if (free_primary) if (free_primary)

2
man-common/manpage-stub.adoc
View File

@ -37,7 +37,7 @@ Describe *foobar* briefly.
*-o*, *--option* _value_:: *-o*, *--option* _value_::
This option has a value. This option has a value.
+ +
For empty lines within a desription (to keep the indentation) you can use the "plus" character at the beginning of an otherwise empty line. For empty lines within a description (to keep the indentation) you can use the "plus" character at the beginning of an otherwise empty line.
//Last but not least, don't forget the common options: //Last but not least, don't forget the common options:
*-V*, *--version*:: *-V*, *--version*::

2
meson.build
View File

@ -511,7 +511,7 @@ funcs = '''
foreach func: funcs foreach func: funcs
have = cc.has_function(func) have = cc.has_function(func)
# For autotools compatiblity, use either #define FOO 1 or #undef FOO. # For autotools compatibility, use either #define FOO 1 or #undef FOO.
# This makes little sense, but is necessary to avoid warnings about # This makes little sense, but is necessary to avoid warnings about
# redefined macros from Python.h, which uses this convention. # redefined macros from Python.h, which uses this convention.
conf.set('HAVE_' + func.to_upper(), have ? 1 : false) conf.set('HAVE_' + func.to_upper(), have ? 1 : false)

2
misc-utils/lsblk-mnt.c
View File

@ -112,7 +112,7 @@ struct libmnt_fs **lsblk_device_get_filesystems(struct lsblk_device *dev, size_t
add_filesystem(dev, fs); add_filesystem(dev, fs);
} }
/* Try mnt_table_find_srcpath() which also cannonicalize patchs, etc. /* Try mnt_table_find_srcpath() which also canonicalizes patches, etc.
*/ */
if (!dev->nfss) { if (!dev->nfss) {
fs = get_active_swap(dev->filename); fs = get_active_swap(dev->filename);

2
schedutils/uclampset.c
View File

@ -97,7 +97,7 @@ static void show_uclamp_pid_info(pid_t pid, char *cmd)
comm = proc_get_command_name(pid); comm = proc_get_command_name(pid);
printf(_("%s (%d) util_clamp: min: %d max: %d\n"), printf(_("%s (%d) util_clamp: min: %d max: %d\n"),
comm ? : "uknown", pid, sa.sched_util_min, sa.sched_util_max); comm ? : "unknown", pid, sa.sched_util_min, sa.sched_util_max);
if (!cmd) if (!cmd)
free(comm); free(comm);

2
sys-utils/hwclock.c
View File

@ -23,7 +23,7 @@
* Reshuffled things, added sparc code, and re-added alpha stuff * Reshuffled things, added sparc code, and re-added alpha stuff
* by David Mosberger <davidm@azstarnet.com> * by David Mosberger <davidm@azstarnet.com>
* and Jay Estabrook <jestabro@amt.tay1.dec.com> * and Jay Estabrook <jestabro@amt.tay1.dec.com>
* and Martin Ostermann <ost@coments.rwth-aachen.de>, aeb@cwi.nl, 990212. * and Martin Ostermann <ost@comnets.rwth-aachen.de>, aeb@cwi.nl, 990212.
* *
* Fix for Award 2094 bug, Dave Coffin (dcoffin@shore.net) 11/12/98 * Fix for Award 2094 bug, Dave Coffin (dcoffin@shore.net) 11/12/98
* Change of local time handling, Stefan Ring <e9725446@stud3.tuwien.ac.at> * Change of local time handling, Stefan Ring <e9725446@stud3.tuwien.ac.at>