Browse Source

misc: Fix various typos

Fix various typos in error messages, warnings, debug strings,
comments and names of static functions.

Signed-off-by: Sebastian Rasmussen <sebras@gmail.com>
pull/324/head
Sebastian Rasmussen 6 years ago
parent
commit
9e93004171
  1. 2
      disk-utils/cfdisk.c
  2. 6
      disk-utils/fdisk-menu.c
  3. 2
      disk-utils/fdisk.c
  4. 6
      disk-utils/fsck.c
  5. 6
      disk-utils/fsck.minix.c
  6. 2
      disk-utils/mkfs.cramfs.c
  7. 6
      disk-utils/mkfs.minix.c
  8. 2
      disk-utils/mkswap.c
  9. 10
      disk-utils/sfdisk.c
  10. 2
      include/color-names.h
  11. 2
      include/cpuset.h
  12. 2
      include/debug.h
  13. 2
      include/plymouth-ctrl.h
  14. 2
      include/statfs_magic.h
  15. 2
      include/sysfs.h
  16. 2
      lib/blkdev.c
  17. 2
      lib/canonicalize.c
  18. 4
      lib/colors.c
  19. 2
      lib/crc32.c
  20. 2
      lib/langinfo.c
  21. 6
      lib/loopdev.c
  22. 6
      lib/plymouth-ctrl.c
  23. 2
      lib/strutils.c
  24. 6
      lib/sysfs.c
  25. 2
      libblkid/samples/mkfs.c
  26. 2
      libblkid/samples/partitions.c
  27. 2
      libblkid/samples/superblocks.c
  28. 2
      libblkid/samples/topology.c
  29. 6
      libblkid/src/blkidP.h
  30. 2
      libblkid/src/cache.c
  31. 4
      libblkid/src/dev.c
  32. 2
      libblkid/src/devname.c
  33. 2
      libblkid/src/evaluate.c
  34. 6
      libblkid/src/init.c
  35. 4
      libblkid/src/partitions/dos.c
  36. 8
      libblkid/src/partitions/gpt.c
  37. 2
      libblkid/src/partitions/mac.c
  38. 30
      libblkid/src/partitions/partitions.c
  39. 4
      libblkid/src/partitions/solaris_x86.c
  40. 2
      libblkid/src/partitions/sun.c
  41. 2
      libblkid/src/partitions/unixware.c
  42. 18
      libblkid/src/probe.c
  43. 2
      libblkid/src/superblocks/gfs.c
  44. 2
      libblkid/src/superblocks/highpoint_raid.c
  45. 6
      libblkid/src/superblocks/iso9660.c
  46. 2
      libblkid/src/superblocks/linux_raid.c
  47. 2
      libblkid/src/superblocks/lvm.c
  48. 12
      libblkid/src/superblocks/superblocks.c
  49. 2
      libblkid/src/superblocks/sysv.c
  50. 6
      libblkid/src/tag.c
  51. 2
      libblkid/src/topology/evms.c
  52. 4
      libblkid/src/topology/sysfs.c
  53. 4
      libblkid/src/topology/topology.c
  54. 2
      libblkid/src/version.c
  55. 14
      libfdisk/src/alignment.c
  56. 14
      libfdisk/src/ask.c
  57. 4
      libfdisk/src/bsd.c
  58. 16
      libfdisk/src/context.c
  59. 16
      libfdisk/src/dos.c
  60. 10
      libfdisk/src/fdiskP.h
  61. 4
      libfdisk/src/field.c
  62. 14
      libfdisk/src/gpt.c
  63. 2
      libfdisk/src/init.c
  64. 6
      libfdisk/src/item.c
  65. 12
      libfdisk/src/label.c
  66. 12
      libfdisk/src/partition.c
  67. 12
      libfdisk/src/parttype.c
  68. 16
      libfdisk/src/script.c
  69. 2
      libfdisk/src/sgi.c
  70. 4
      libfdisk/src/sun.c
  71. 8
      libfdisk/src/table.c
  72. 12
      libmount/python/context.c
  73. 4
      libmount/python/fs.c
  74. 2
      libmount/python/pylibmount.c
  75. 4
      libmount/python/tab.c
  76. 2
      libmount/src/btrfs.c
  77. 24
      libmount/src/context.c
  78. 2
      libmount/src/context_mount.c
  79. 2
      libmount/src/context_umount.c
  80. 2
      libmount/src/fs.c
  81. 2
      libmount/src/init.c
  82. 4
      libmount/src/lock.c
  83. 4
      libmount/src/optmap.c
  84. 8
      libmount/src/tab.c
  85. 4
      libmount/src/tab_parse.c
  86. 2
      libmount/src/utils.c
  87. 6
      libsmartcols/samples/continuous.c
  88. 6
      libsmartcols/samples/title.c
  89. 6
      libsmartcols/samples/tree.c
  90. 6
      libsmartcols/samples/wrap.c
  91. 2
      libsmartcols/src/smartcolsP.h
  92. 4
      libsmartcols/src/symbols.c
  93. 6
      libsmartcols/src/table.c
  94. 22
      libsmartcols/src/table_print.c
  95. 4
      login-utils/last.c
  96. 4
      login-utils/login.c
  97. 2
      login-utils/lslogins.c
  98. 2
      login-utils/su-common.c
  99. 2
      login-utils/sulogin-consoles.c
  100. 4
      login-utils/sulogin.c
  101. 2
      misc-utils/blkid.c
  102. 4
      misc-utils/cal.c
  103. 6
      misc-utils/findmnt.c
  104. 4
      misc-utils/kill.c
  105. 4
      misc-utils/logger.c
  106. 12
      misc-utils/lsblk.c
  107. 2
      misc-utils/lslocks.c
  108. 2
      misc-utils/test_uuidd.c
  109. 2
      misc-utils/uuidd.c
  110. 10
      sys-utils/dmesg.c
  111. 4
      sys-utils/fstrim.c
  112. 2
      sys-utils/hwclock-cmos.c
  113. 2
      sys-utils/ipcutils.c
  114. 2
      sys-utils/lscpu.c
  115. 2
      sys-utils/mountpoint.c
  116. 2
      sys-utils/nsenter.c
  117. 2
      sys-utils/rtcwake.c
  118. 2
      sys-utils/setarch.c
  119. 2
      sys-utils/swapoff.c
  120. 2
      sys-utils/swapon.c
  121. 6
      sys-utils/umount.c
  122. 2
      sys-utils/zramctl.c
  123. 8
      term-utils/agetty.c
  124. 4
      term-utils/setterm.c
  125. 2
      term-utils/wall.c
  126. 2
      term-utils/write.c
  127. 2
      tests/expected/ipcs/limits
  128. 2
      tests/ts/ipcs/limits
  129. 6
      text-utils/pg.c
  130. 2
      text-utils/ul.c

2
disk-utils/cfdisk.c

@ -529,7 +529,7 @@ static int is_freespace(struct cfdisk *cf, size_t i)
}
/* converts libfdisk FDISK_ASKTYPE_MENU to cfdisk menu and returns user's
* responseback to libfdisk
* response back to libfdisk
*/
static int ask_menu(struct fdisk_ask *ask, struct cfdisk *cf)
{

6
disk-utils/fdisk-menu.c

@ -681,7 +681,7 @@ static int generic_menu_cb(struct fdisk_context **cxt0,
/*
* This is fdisk frontend for GPT specific libfdisk functions that
* are not expported by generic libfdisk API.
* are not exported by generic libfdisk API.
*/
static int gpt_menu_cb(struct fdisk_context **cxt0,
const struct menu *menu __attribute__((__unused__)),
@ -777,7 +777,7 @@ static int gpt_menu_cb(struct fdisk_context **cxt0,
/*
* This is fdisk frontend for MBR specific libfdisk functions that
* are not expported by generic libfdisk API.
* are not exported by generic libfdisk API.
*/
static int dos_menu_cb(struct fdisk_context **cxt0,
const struct menu *menu __attribute__((__unused__)),
@ -942,7 +942,7 @@ static int sgi_menu_cb(struct fdisk_context **cxt0,
/*
* This is fdisk frontend for BSD specific libfdisk functions that
* are not expported by generic libfdisk API.
* are not exported by generic libfdisk API.
*/
static int bsd_menu_cb(struct fdisk_context **cxt0,
const struct menu *menu __attribute__((__unused__)),

2
disk-utils/fdisk.c

@ -736,7 +736,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE *out)
fputs(_(" -L, --color[=<when>] colorize output (auto, always or never)\n"), out);
fprintf(out,
" %s\n", USAGE_COLORS_DEFAULT);
fputs(_(" -l, --list display partitions end exit\n"), out);
fputs(_(" -l, --list display partitions and exit\n"), out);
fputs(_(" -o, --output <list> output columns\n"), out);
fputs(_(" -t, --type <type> recognize specified partition table type only\n"), out);
fputs(_(" -u, --units[=<unit>] display units: 'cylinders' or 'sectors' (default)\n"), out);

6
disk-utils/fsck.c

@ -89,7 +89,7 @@ static const char *really_wanted[] = {
};
/*
* Internal structure for mount tabel entries.
* Internal structure for mount table entries.
*/
struct fsck_fs_data
{
@ -490,7 +490,7 @@ static void load_fs_info(void)
errno = 0;
/*
* Let's follow libmount defauls if $FSTAB_FILE is not specified
* Let's follow libmount defaults if $FSTAB_FILE is not specified
*/
path = getenv("FSTAB_FILE");
@ -1279,7 +1279,7 @@ static int check_all(void)
/*
* This is for the bone-headed user who enters the root
* filesystem twice. Skip root will skep all root entries.
* filesystem twice. Skip root will skip all root entries.
*/
if (skip_root) {
mnt_reset_iter(itr, MNT_ITER_FORWARD);

6
disk-utils/fsck.minix.c

@ -6,7 +6,7 @@
*/
/*
* 09.11.91 - made the first rudimetary functions
* 09.11.91 - made the first rudimentary functions
*
* 10.11.91 - updated, does checking, no repairs yet.
* Sent out to the mailing-list for testing.
@ -22,7 +22,7 @@
*
*
* 19.04.92 - Had to start over again from this old version, as a
* kernel bug ate my enhanced fsck in february.
* kernel bug ate my enhanced fsck in February.
*
* 28.02.93 - added support for different directory entry sizes..
*
@ -106,7 +106,7 @@
#define ROOT_INO 1
#define YESNO_LENGTH 64
/* Global variables used in minix_programs.h inline fuctions */
/* Global variables used in minix_programs.h inline functions */
int fs_version = 1;
char *super_block_buffer;

2
disk-utils/mkfs.cramfs.c

@ -20,7 +20,7 @@
/*
* Old version would die on largish filesystems. Change to mmap the
* files one by one instaed of all simultaneously. - aeb, 2002-11-01
* files one by one instead of all simultaneously. - aeb, 2002-11-01
*/
#include <sys/types.h>

6
disk-utils/mkfs.minix.c

@ -90,7 +90,7 @@
#define DEFAULT_FS_VERSION 1
/*
* Global variables used in minix_programs.h inline fuctions
* Global variables used in minix_programs.h inline functions
*/
int fs_version = DEFAULT_FS_VERSION;
char *super_block_buffer;
@ -571,7 +571,7 @@ static void setup_tables(const struct fs_control *ctl) {
/*
* Perform a test of a block; return the number of
* blocks readable/writeable.
* blocks readable/writable.
*/
static size_t do_check(const struct fs_control *ctl, char * buffer, int try, unsigned int current_block) {
ssize_t got;
@ -767,7 +767,7 @@ int main(int argc, char ** argv)
case '1':
fs_version = 1;
break;
case 'v': /* kept for backwards compatiblitly */
case 'v': /* kept for backwards compatibility */
warnx(_("-v is ambiguous, use '-2' instead"));
/* fallthrough */
case '2':

2
disk-utils/mkswap.c

@ -124,7 +124,7 @@ static void set_uuid_and_label(const struct mkswap_control *ctl)
warnx(_("Label was truncated."));
}
/* report resuls */
/* report results */
if (ctl->uuid || ctl->opt_label) {
if (ctl->opt_label)
printf("LABEL=%s, ", ctl->hdr->volume_name);

10
disk-utils/sfdisk.c

@ -101,7 +101,7 @@ struct sfdisk {
struct fdisk_partition *orig_pa; /* -N <partno> before the change */
unsigned int verify : 1, /* call fdisk_verify_disklabel() */
quiet : 1, /* suppres extra messages */
quiet : 1, /* suppress extra messages */
interactive : 1, /* running on tty */
noreread : 1, /* don't check device is in use */
force : 1, /* do also stupid things */
@ -866,7 +866,7 @@ static int command_delete(struct sfdisk *sf, int argc, char **argv)
if (sf->backup)
backup_partition_table(sf, devname);
/* delate all */
/* delete all */
if (argc == 1) {
size_t nparts = fdisk_get_npartitions(sf->cxt);
for (i = 0; i < nparts; i++) {
@ -907,7 +907,7 @@ static int command_reorder(struct sfdisk *sf, int argc, char **argv)
if (sf->backup)
backup_partition_table(sf, devname);
if (fdisk_reorder_partitions(sf->cxt) == 1) /* unchnaged */
if (fdisk_reorder_partitions(sf->cxt) == 1) /* unchanged */
rc = fdisk_deassign_device(sf->cxt, 1);
else
rc = write_changes(sf);
@ -1782,7 +1782,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE *out)
fputs(_(" -J, --json <dev> dump partition table in JSON format\n"), out);
fputs(_(" -g, --show-geometry [<dev> ...] list geometry of all or specified devices\n"), out);
fputs(_(" -l, --list [<dev> ...] list partitions of each device\n"), out);
fputs(_(" -F, --list-free [<dev> ...] list unpartitions free areas of each device\n"), out);
fputs(_(" -F, --list-free [<dev> ...] list unpartitioned free areas of each device\n"), out);
fputs(_(" -r, --reorder <dev> fix partitions order (by start offset)\n"), out);
fputs(_(" -s, --show-size [<dev> ...] list sizes of all or specified devices\n"), out);
fputs(_(" -T, --list-types print the recognized types (see -X)\n"), out);
@ -1816,7 +1816,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE *out)
fputs(_(" -o, --output <list> output columns\n"), out);
fputs(_(" -q, --quiet suppress extra info messages\n"), out);
fputs(_(" -w, --wipe <mode> wipe signatures (auto, always or never)\n"), out);
fputs(_(" -W, --wipe-partitons <mode> wipe signatures from new partitions (auto, always or never)\n"), out);
fputs(_(" -W, --wipe-partitions <mode> wipe signatures from new partitions (auto, always or never)\n"), out);
fputs(_(" -X, --label <name> specify label type (dos, gpt, ...)\n"), out);
fputs(_(" -Y, --label-nested <name> specify nested label type (dos, bsd)\n"), out);
fputs(USAGE_SEPARATOR, out);

2
include/color-names.h

@ -36,7 +36,7 @@
#define UL_COLOR_WHITE "\033[1;37m"
/* maximal lenght of human readable name of ESC seq. */
/* maximal length of human readable name of ESC seq. */
#define UL_COLORNAME_MAXSZ 32
extern const char *color_sequence_from_colorname(const char *str);

2
include/cpuset.h

@ -66,7 +66,7 @@ extern int __cpuset_count_s(size_t setsize, const cpu_set_t *set);
#define cpuset_nbits(setsize) (8 * (setsize))
/*
* The @idx parametr returns an index of the first mask from @ary array where
* The @idx parameter returns an index of the first mask from @ary array where
* the @cpu is set.
*
* Returns: 0 if found, otherwise 1.

2
include/debug.h

@ -29,7 +29,7 @@
* subsystem names (e.g. "LIBMOUNT_DEBUG=options,tab"). In this case is
* necessary to define mask names array. This functionality is optional.
*
* It's stringly recommended to use UL_* macros to define/declare/use
* It's strongly recommended to use UL_* macros to define/declare/use
* the debug stuff.
*
* See disk-utils/cfdisk.c: cfdisk_init_debug() for programs debug

2
include/plymouth-ctrl.h

@ -1,5 +1,5 @@
/*
* plymouth-ctrl.h Header file for communcations with plymouthd
* plymouth-ctrl.h Header file for communications with plymouthd
*
* Copyright (c) 2016 SUSE Linux GmbH, All rights reserved.
* Copyright (c) 2016 Werner Fink <werner@suse.de>

2
include/statfs_magic.h

@ -13,7 +13,7 @@
#endif
/*
* Unfortunately, Linux kernel hedeader file <linux/magic.h> is incomplete
* Unfortunately, Linux kernel header file <linux/magic.h> is incomplete
* mess and kernel returns by statfs f_type many numbers that are nowhere
* specified (in API).
*

2
include/sysfs.h

@ -97,7 +97,7 @@ extern int sysfs_scsi_path_contains(struct sysfs_cxt *cxt, const char *pattern);
*
* Linux kernel linux/drivers/base/core.c: device_get_devnode()
* defines a replacement of '!' in the /sys device name by '/' in the
* /dev device name. This helper replaces all ocurrences of '!' in
* /dev device name. This helper replaces all occurrences of '!' in
* @name by '/' to convert from /sys to /dev.
*/
static inline void sysfs_devname_sys_to_dev(char *name)

2
lib/blkdev.c

@ -253,7 +253,7 @@ int blkdev_is_misaligned(int fd)
if (ioctl(fd, BLKALIGNOFF, &aligned) < 0)
return 0; /* probably kernel < 2.6.32 */
/*
* Note that kernel returns -1 as alignement offset if no compatible
* Note that kernel returns -1 as alignment offset if no compatible
* sizes and alignments exist for stacked devices
*/
return aligned != 0 ? 1 : 0;

2
lib/canonicalize.c

@ -67,7 +67,7 @@ static int is_dm_devname(char *canonical, char **name)
}
/*
* This function does not cannonicalize the path! It just prepends CWD before a
* This function does not canonicalize the path! It just prepends CWD before a
* relative path. If the path is no relative than returns NULL. The path does
* not have to exist.
*/

4
lib/colors.c

@ -265,7 +265,7 @@ static int colors_readdir(struct ul_color_ctl *cc, const char *dirname)
&tk_term, &tk_termsz, &type) != 0)
continue;
/* count teoretical score before we check names to avoid
/* count theoretical score before we check names to avoid
* unnecessary strcmp() */
if (tk_name)
score += 20;
@ -400,7 +400,7 @@ static int cn_sequence(const char *str, char **seq)
*out++ = '#'; /* Hash mark */
break;
case '?':
*out++ = '?'; /* Qestion mark */
*out++ = '?'; /* Question mark */
break;
default:
*out++ = *in;

2
lib/crc32.c

@ -19,7 +19,7 @@
* order from highest-order term to lowest-order term. UARTs transmit
* characters in order from LSB to MSB. By storing the CRC this way,
* we hand it to the UART in the order low-byte to high-byte; the UART
* sends each low-bit to hight-bit; and the result is transmission bit
* sends each low-bit to high-bit; and the result is transmission bit
* by bit from highest- to lowest-order term without requiring any bit
* shuffling on our part. Reception works similarly.
*

2
lib/langinfo.c

@ -1,6 +1,6 @@
/*
* This is callback solution for systems without nl_langinfo(), this function
* returns hardcoded and on locale setting independed value.
* returns hardcoded and on locale setting indepndent value.
*
* See langinfo.h man page for more details.
*

6
lib/loopdev.c

@ -857,7 +857,7 @@ int loopcxt_get_backing_inode(struct loopdev_cxt *lc, ino_t *ino)
*
* Notes:
* - kernels < 3.2 support partitioned loop devices and PT scanning
* only if max_part= module paremeter is non-zero
* only if max_part= module parameter is non-zero
*
* - kernels >= 3.2 always support partitioned loop devices
*
@ -889,7 +889,7 @@ int loopmod_supports_partscan(void)
* @lc: context
*
* Returns: 1 if the partscan flags is set *or* (for old kernels) partitions
* scannig is enabled for all loop devices.
* scanning is enabled for all loop devices.
*/
int loopcxt_is_partscan(struct loopdev_cxt *lc)
{
@ -1168,7 +1168,7 @@ static int loopcxt_check_size(struct loopdev_cxt *lc, int file_fd)
if (expected_size != size) {
DBG(CXT, ul_debugobj(lc, "warning: loopdev and expected "
"size dismatch (%ju/%ju)",
"size mismatch (%ju/%ju)",
size, expected_size));
if (loopcxt_set_capacity(lc)) {

6
lib/plymouth-ctrl.c

@ -1,8 +1,8 @@
/*
* plymouth-ctrl.c Simply communcations with plymouthd
* plymouth-ctrl.c Simply communications with plymouthd
* to avoid forked sub processes and/or
* misssed plymouth send commands tool
* due a plymouthd replacment.
* missed plymouth send commands tool
* due a plymouthd replacement.
*
* Copyright (c) 2016 SUSE Linux GmbH, All rights reserved.
* Copyright (c) 2016 Werner Fink <werner@suse.de>

2
lib/strutils.c

@ -44,7 +44,7 @@ static int do_scale_by_power (uintmax_t *x, int base, int power)
* for example:
* 10KB = 10000
*
* The optinal 'power' variable returns number associated with used suffix
* The optional 'power' variable returns number associated with used suffix
* {K,M,G,T,P,E,Z,Y} = {1,2,3,4,5,6,7,8}.
*
* The function also supports decimal point, for example:

6
lib/sysfs.c

@ -623,7 +623,7 @@ static char *get_subsystem(char *chain, char *buf, size_t bufsz)
}
/*
* Returns complete path to the device, the patch contains all all sybsystems
* Returns complete path to the device, the patch contains all all subsystems
* used for the device.
*/
char *sysfs_get_devchain(struct sysfs_cxt *cxt, char *buf, size_t bufsz)
@ -741,7 +741,7 @@ static int get_dm_wholedisk(struct sysfs_cxt *cxt, char *diskname,
}
/*
* Returns by @diskdevno whole disk device devno and (optionaly) by
* Returns by @diskdevno whole disk device devno and (optionally) by
* @diskname the whole disk device name.
*/
int sysfs_devno_to_wholedisk(dev_t dev, char *diskname,
@ -758,7 +758,7 @@ int sysfs_devno_to_wholedisk(dev_t dev, char *diskname,
/*
* Extra case for partitions mapped by device-mapper.
*
* All regualar partitions (added by BLKPG ioctl or kernel PT
* All regular partitions (added by BLKPG ioctl or kernel PT
* parser) have the /sys/.../partition file. The partitions
* mapped by DM don't have such file, but they have "part"
* prefix in DM UUID.

2
libblkid/samples/mkfs.c

@ -33,7 +33,7 @@ int main(int argc, char *argv[])
devname = argv[1];
pr = blkid_new_probe_from_filename(devname);
if (!pr)
err(EXIT_FAILURE, "%s: faild to create a new libblkid probe",
err(EXIT_FAILURE, "%s: failed to create a new libblkid probe",
devname);
/*

2
libblkid/samples/partitions.c

@ -33,7 +33,7 @@ int main(int argc, char *argv[])
devname = argv[1];
pr = blkid_new_probe_from_filename(devname);
if (!pr)
err(EXIT_FAILURE, "%s: faild to create a new libblkid probe",
err(EXIT_FAILURE, "%s: failed to create a new libblkid probe",
devname);
/* Binary interface */
ls = blkid_probe_get_partitions(pr);

2
libblkid/samples/superblocks.c

@ -32,7 +32,7 @@ int main(int argc, char *argv[])
devname = argv[1];
pr = blkid_new_probe_from_filename(devname);
if (!pr)
err(EXIT_FAILURE, "%s: faild to create a new libblkid probe",
err(EXIT_FAILURE, "%s: failed to create a new libblkid probe",
devname);
/* enable topology probing */

2
libblkid/samples/topology.c

@ -33,7 +33,7 @@ int main(int argc, char *argv[])
devname = argv[1];
pr = blkid_new_probe_from_filename(devname);
if (!pr)
err(EXIT_FAILURE, "%s: faild to create a new libblkid probe",
err(EXIT_FAILURE, "%s: failed to create a new libblkid probe",
devname);
/*
* Binary interface

6
libblkid/src/blkidP.h

@ -42,7 +42,7 @@ struct blkid_struct_dev
struct list_head bid_devs; /* All devices in the cache */
struct list_head bid_tags; /* All tags for this device */
blkid_cache bid_cache; /* Dev belongs to this cache */
char *bid_name; /* Device real pathn (as used in cache) */
char *bid_name; /* Device real path (as used in cache) */
char *bid_xname; /* Device path as used by application (maybe symlink..) */
char *bid_type; /* Preferred device TYPE */
int bid_pri; /* Device priority */
@ -187,7 +187,7 @@ struct blkid_struct_probe
unsigned int blkssz; /* sector size (BLKSSZGET ioctl) */
mode_t mode; /* struct stat.sb_mode */
int flags; /* private libray flags */
int flags; /* private library flags */
int prob_flags; /* always zeroized by blkid_do_*() */
uint64_t wipe_off; /* begin of the wiped area */
@ -405,7 +405,7 @@ extern int blkid_probe_get_idmag(blkid_probe pr, const struct blkid_idinfo *id,
uint64_t *offset, const struct blkid_idmag **res)
__attribute__((nonnull(1)));
/* returns superblok according to 'struct blkid_idmag' */
/* returns superblock according to 'struct blkid_idmag' */
#define blkid_probe_get_sb(_pr, _mag, type) \
((type *) blkid_probe_get_buffer((_pr),\
(_mag)->kboff << 10, sizeof(type)))

2
libblkid/src/cache.c

@ -86,7 +86,7 @@ char *blkid_get_cache_filename(struct blkid_config *conf)
* @cache: pointer to return cache handler
* @filename: path to the cache file or NULL for the default path
*
* Allocates and initialize librray cache handler.
* Allocates and initialize library cache handler.
*
* Returns: 0 on success or number less than zero in case of error.
*/

4
libblkid/src/dev.c

@ -107,10 +107,10 @@ void blkid_debug_dump_dev(blkid_dev dev)
*
* These routines do not expose the list.h implementation, which are a
* contamination of the namespace, and which force us to reveal far, far
* too much of our internal implemenation. I'm not convinced I want
* too much of our internal implementation. I'm not convinced I want
* to keep list.h in the long term, anyway. It's fine for kernel
* programming, but performance is not the #1 priority for this
* library, and I really don't like the tradeoff of type-safety for
* library, and I really don't like the trade-off of type-safety for
* performance for this application. [tytso:20030125.2007EST]
*/

2
libblkid/src/devname.c

@ -67,7 +67,7 @@ blkid_dev blkid_get_dev(blkid_cache cache, const char *devname, int flags)
/* try canonicalize the name */
if (!dev && (cn = canonicalize_path(devname))) {
if (strcmp(cn, devname) != 0) {
DBG(DEVNAME, ul_debug("search cannonical %s", cn));
DBG(DEVNAME, ul_debug("search canonical %s", cn));
list_for_each(p, &cache->bic_devs) {
tmp = list_entry(p, struct blkid_struct_dev, bid_devs);
if (strcmp(tmp->bid_name, cn))

2
libblkid/src/evaluate.c

@ -128,7 +128,7 @@ int blkid_send_uevent(const char *devname, const char *action)
DBG(EVALUATE, ul_debug("write failed: %s", uevent));
}
DBG(EVALUATE, ul_debug("%s: send uevent %s",
uevent, rc == 0 ? "SUCCES" : "FAILED"));
uevent, rc == 0 ? "SUCCESS" : "FAILED"));
return rc;
}

6
libblkid/src/init.c

@ -8,7 +8,7 @@
/**
* SECTION: init
* @title: Library initialization
* @short_description: initialize debuging
* @short_description: initialize debugging
*/
#include <stdarg.h>
@ -23,7 +23,7 @@ UL_DEBUG_DEFINE_MASKNAMES(libblkid) =
{ "config", BLKID_DEBUG_CONFIG, "config file utils" },
{ "dev", BLKID_DEBUG_DEV, "device utils" },
{ "devname", BLKID_DEBUG_DEVNAME, "/proc/partitions evaluation" },
{ "devno", BLKID_DEBUG_DEVNO, "convertions to device name" },
{ "devno", BLKID_DEBUG_DEVNO, "conversions to device name" },
{ "evaluate", BLKID_DEBUG_EVALUATE, "tags resolving" },
{ "help", BLKID_DEBUG_HELP, "this help" },
{ "lowprobe", BLKID_DEBUG_LOWPROBE, "superblock/raids/partitions probing" },
@ -37,7 +37,7 @@ UL_DEBUG_DEFINE_MASKNAMES(libblkid) =
/**
* blkid_init_debug:
* @mask: debug mask (0xffff to enable full debuging)
* @mask: debug mask (0xffff to enable full debugging)
*
* If the @mask is not specified then this function reads
* LIBBLKID_DEBUG environment variable to get the mask.

4
libblkid/src/partitions/dos.c

@ -191,11 +191,11 @@ static int probe_dos_pt(blkid_probe pr,
snprintf(idstr, sizeof(idstr), "%08x", id);
/*
* Well, all checks pass, it's MS-DOS partiton table
* Well, all checks pass, it's MS-DOS partition table
*/
if (blkid_partitions_need_typeonly(pr)) {
/* Non-binary interface -- caller does not ask for details
* about partitions, just set generic varibles only. */
* about partitions, just set generic variables only. */
if (id)
blkid_partitions_strcpy_ptuuid(pr, idstr);
return 0;

8
libblkid/src/partitions/gpt.c

@ -55,7 +55,7 @@ struct gpt_header {
uint64_t my_lba; /* location of this header copy */
uint64_t alternate_lba; /* location of the other header copy */
uint64_t first_usable_lba; /* lirst usable LBA for partitions */
uint64_t first_usable_lba; /* first usable LBA for partitions */
uint64_t last_usable_lba; /* last usable LBA for partitions */
efi_guid_t disk_guid; /* disk UUID */
@ -155,7 +155,7 @@ static int last_lba(blkid_probe pr, uint64_t *lba)
* (due DOS PT limitations).
*
* Note that the PMBR detection is optional (enabled by default) and could be
* disabled by BLKID_PARTS_FOPCE_GPT flag (see also blkid_paertitions_set_flags()).
* disabled by BLKID_PARTS_FOPCE_GPT flag (see also blkid_partitions_set_flags()).
*/
static int is_pmbr_valid(blkid_probe pr, int *has)
{
@ -343,7 +343,7 @@ static int probe_gpt_pt(blkid_probe pr,
if (blkid_partitions_need_typeonly(pr)) {
/* Non-binary interface -- caller does not ask for details
* about partitions, just set generic varibles only. */
* about partitions, just set generic variables only. */
blkid_partitions_set_ptuuid(pr, (unsigned char *) &guid);
return BLKID_PROBE_OK;
}
@ -423,7 +423,7 @@ const struct blkid_idinfo gpt_pt_idinfo =
/*
* It would be possible to check for DOS signature (0xAA55), but
* unfortunately almost all EFI GPT implemenations allow to optionaly
* unfortunately almost all EFI GPT implementations allow to optionally
* skip the legacy MBR. We follows this behavior and MBR is optional.
* See is_valid_pmbr().
*

2
libblkid/src/partitions/mac.c

@ -139,7 +139,7 @@ static int probe_mac_pt(blkid_probe pr,
if (be32_to_cpu(p->map_count) != nblks) {
DBG(LOWPROBE, ul_debug(
"mac: inconsisten map_count in partition map, "
"mac: inconsistent map_count in partition map, "
"entry[0]: %d, entry[%d]: %d",
nblks, i - 1,
be32_to_cpu(p->map_count)));

30
libblkid/src/partitions/partitions.c

@ -66,7 +66,7 @@
*
* pr = blkid_new_probe_from_filename(devname);
* if (!pr)
* err("%s: faild to open device", devname);
* err("%s: failed to open device", devname);
*
* blkid_probe_enable_partitions(pr, TRUE);
* blkid_do_fullprobe(pr);
@ -90,7 +90,7 @@
*
* pr = blkid_new_probe_from_filename(devname);
* if (!pr)
* err("%s: faild to open device", devname);
* err("%s: failed to open device", devname);
*
* ls = blkid_probe_get_partitions(pr);
* nparts = blkid_partlist_numof_partitions(ls);
@ -183,7 +183,7 @@ struct blkid_struct_partition {
int partno; /* partition number */
char uuid[37]; /* UUID (when supported by PT), e.g GPT */
unsigned char name[128]; /* Partition in UTF8 name (when supporte by PT), e.g. Mac */
unsigned char name[128]; /* Partition in UTF8 name (when supported by PT), e.g. Mac */
blkid_parttable tab; /* partition table */
};
@ -429,7 +429,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 partititions.
* generic Linux machine -- let start with 32 partitions.
*/
void *tmp = realloc(ls->parts, (ls->nparts_max + 32) *
sizeof(struct blkid_struct_partition));
@ -871,7 +871,7 @@ done:
/**
* blkid_known_pttype:
* @pttype: partiton name
* @pttype: partition name
*
* Returns: 1 for known or 0 for unknown partition type.
*/
@ -990,7 +990,7 @@ blkid_partition blkid_partlist_devno_to_partition(blkid_partlist ls, dev_t devno
if (!ls)
return NULL;
DBG(LOWPROBE, ul_debug("triyng to convert devno 0x%llx to partition",
DBG(LOWPROBE, ul_debug("trying to convert devno 0x%llx to partition",
(long long) devno));
if (sysfs_init(&sysfs, devno, NULL)) {
@ -1031,7 +1031,7 @@ blkid_partition blkid_partlist_devno_to_partition(blkid_partlist ls, dev_t devno
/*
* Partition mapped by kpartx does not provide "start" offset
* in /sys, but if we know partno and size of the partition
* that we can probably make the releation bettween the device
* that we can probably make the relation between the device
* and an entry in partition table.
*/
for (i = 0; i < ls->nparts; i++) {
@ -1163,7 +1163,7 @@ const char *blkid_parttable_get_type(blkid_parttable tab)
* blkid_parttable_get_parent:
* @tab: partition table
*
* Returns: parent for nexted partitition tables or NULL.
* Returns: parent for nested partition tables or NULL.
*/
blkid_partition blkid_parttable_get_parent(blkid_parttable tab)
{
@ -1176,7 +1176,7 @@ blkid_partition blkid_parttable_get_parent(blkid_parttable tab)
*
* Note the position is relative to begin of the device as defined by
* blkid_probe_set_device() for primary partition table, and relative
* to parental partition for nested patition tables.
* to parental partition for nested partition tables.
*
* <informalexample>
* <programlisting>
@ -1379,8 +1379,8 @@ const char *blkid_partition_get_uuid(blkid_partition par)
* blkid_partition_get_partno:
* @par: partition
*
* Returns: proposed partitin number (e.g. 'N' from sda'N') or -1 in case of
* error. Note that the number is generate by library independenly on your OS.
* Returns: proposed partition number (e.g. 'N' from sda'N') or -1 in case of
* error. Note that the number is generate by library independently on your OS.
*/
int blkid_partition_get_partno(blkid_partition par)
{
@ -1393,14 +1393,14 @@ int blkid_partition_get_partno(blkid_partition par)
*
* Be careful if you _not_ probe whole disk:
*
* 1) the offset is usully relative to begin of the disk -- but if you probe a
* 1) the offset is usually relative to begin of the disk -- but if you probe a
* fragment of the disk only -- then the offset could be still relative to
* the begin of the disk rather that relative to the fragment.
*
* 2) the offset for nested partitions could be releative to parent (e.g. Solaris)
* 2) the offset for nested partitions could be relative to parent (e.g. Solaris)
* _or_ relative to the begin of the whole disk (e.g. bsd).
*
* You don't have to care about such details if you proble whole disk. In such
* You don't have to care about such details if you probe whole disk. In such
* a case libblkid always returns the offset relative to the begin of the disk.
*
* Returns: start of the partition (in 512-sectors).
@ -1418,7 +1418,7 @@ blkid_loff_t blkid_partition_get_start(blkid_partition par)
* library always returns full size of the partition. If you want add
* the partition to the Linux system (BLKPG_ADD_PARTITION ioctl) you
* need to reduce the size of the partition to 1 or 2 blocks. The
* rest of the partition has to be unaccessible for mkfs or mkswap
* 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

4
libblkid/src/partitions/solaris_x86.c

@ -19,7 +19,7 @@
* offset (start) of the slice is always relatively to the primary dos
* partition.
*
* Note that Solaris-SPARC uses entire disk with a different partitionning
* Note that Solaris-SPARC uses entire disk with a different partitioning
* scheme.
*/
@ -61,7 +61,7 @@ static int probe_solaris_pt(blkid_probe pr,
const struct blkid_idmag *mag __attribute__((__unused__)))
{
struct solaris_vtoc *l; /* disk label */
struct solaris_slice *p; /* partitsion */
struct solaris_slice *p; /* partition */
blkid_parttable tab = NULL;
blkid_partition parent;
blkid_partlist ls;

2
libblkid/src/partitions/sun.c

@ -69,7 +69,7 @@ static int probe_sun_pt(blkid_probe pr,
/*
* So that old Linux-Sun partitions continue to work,
* alow the VTOC to be used under the additional condition ...
* allow the VTOC to be used under the additional condition ...
*/
use_vtoc = use_vtoc || !(l->vtoc.sanity || l->vtoc.version || l->vtoc.nparts);

2
libblkid/src/partitions/unixware.c

@ -7,7 +7,7 @@
* GNU Lesser General Public License.
*
*
* The intersting information about unixware PT:
* The interesting information about unixware PT:
* - Linux kernel / partx
* - vtoc(7) SCO UNIX command man page
* - evms source code (http://evms.sourceforge.net/)

18
libblkid/src/probe.c

@ -165,7 +165,7 @@ blkid_probe blkid_new_probe(void)
* Clone @parent, the new clone shares all, but except:
*
* - probing result
* - bufferes if another device (or offset) is set to the prober
* - buffers if another device (or offset) is set to the prober
*/
blkid_probe blkid_clone_probe(blkid_probe parent)
{
@ -292,7 +292,7 @@ void blkid_probe_chain_reset_values(blkid_probe pr, struct blkid_chain *chn)
if (!pr || list_empty(&pr->values))
return;
DBG(LOWPROBE, ul_debug("reseting %s values", chn->driver->name));
DBG(LOWPROBE, ul_debug("Resetting %s values", chn->driver->name));
list_for_each_safe(p, pnext, &pr->values) {
struct blkid_prval *v = list_entry(p,
@ -667,7 +667,7 @@ unsigned char *blkid_probe_get_buffer(blkid_probe pr, uint64_t off, uint64_t len
pr->off + off - pr->parent->off, len);
}
/* try buffers we already have in memmory */
/* try buffers we already have in memory */
list_for_each(p, &pr->buffers) {
struct blkid_bufinfo *x =
list_entry(p, struct blkid_bufinfo, bufs);
@ -703,7 +703,7 @@ static void blkid_probe_reset_buffer(blkid_probe pr)
if (!pr || list_empty(&pr->buffers))
return;
DBG(BUFFER, ul_debug("reseting probing buffers pr=%p", pr));
DBG(BUFFER, ul_debug("Resetting probing buffers pr=%p", pr));
while (!list_empty(&pr->buffers)) {
struct blkid_bufinfo *bf = list_entry(pr->buffers.next,
@ -1112,7 +1112,7 @@ int blkid_do_probe(blkid_probe pr)
*
* This function erases the current signature detected by @pr. The @pr has to
* be open in O_RDWR mode, BLKID_SUBLKS_MAGIC or/and BLKID_PARTS_MAGIC flags
* has to be enabled (if you want to errase also superblock with broken check
* has to be enabled (if you want to erase also superblock with broken check
* sums then use BLKID_SUBLKS_BADCSUM too).
*
* After successful signature removing the @pr prober will be moved one step
@ -1238,7 +1238,7 @@ int blkid_do_wipe(blkid_probe pr, int dryrun)
* continue;
*
* // convert ostr to the real offset by off = strtoll(ostr, NULL, 10);
* // use your stuff to errase @len bytes at the @off
* // use your stuff to erase @len bytes at the @off
* ....
*
* // retry the last probing to check for backup superblocks ..etc.
@ -1296,13 +1296,13 @@ int blkid_probe_step_back(blkid_probe pr)
*
* This is string-based NAME=value interface only.
*
* Note about suberblocks chain -- the function does not check for filesystems
* Note about superblocks chain -- the function does not check for filesystems
* when a RAID signature is detected. The function also does not check for
* collision between RAIDs. The first detected RAID is returned. The function
* checks for collision between partition table and RAID signature -- it's
* recommended to enable partitions chain together with superblocks chain.
*
* Returns: 0 on success, 1 if nothing is detected, -2 if ambivalen result is
* Returns: 0 on success, 1 if nothing is detected, -2 if ambivalent result is
* detected and -1 on case of error.
*/
int blkid_do_safeprobe(blkid_probe pr)
@ -1988,7 +1988,7 @@ int blkid_probe_is_wiped(blkid_probe pr, struct blkid_chain **chn, uint64_t off,
/*
* Try to use any area -- if the area has been previously wiped then the
* previous probing result should be ignored (reseted).
* previous probing result should be ignored (reset).
*/
void blkid_probe_use_wiper(blkid_probe pr, uint64_t off, uint64_t size)
{

2
libblkid/src/superblocks/gfs.c

@ -54,7 +54,7 @@ struct gfs2_sb {
char sb_locktable[GFS_LOCKNAME_LEN];
struct gfs2_inum __pad3; /* Was quota inode in gfs1 */
struct gfs2_inum __pad4; /* Was licence inode in gfs1 */
struct gfs2_inum __pad4; /* Was license inode in gfs1 */
uint8_t sb_uuid[16]; /* The UUID maybe 0 for backwards compat */
} __attribute__((packed));

2
libblkid/src/superblocks/highpoint_raid.c

@ -72,7 +72,7 @@ const struct blkid_idinfo highpoint37x_idinfo = {
.probefunc = probe_highpoint37x,
.magics = {
/*
* Superblok offset: 4608 bytes (9 sectors)
* Superblock offset: 4608 bytes (9 sectors)
* Magic string offset within superblock: 32 bytes
*
* kboff = (4608 + 32) / 1024

6
libblkid/src/superblocks/iso9660.c

@ -221,7 +221,7 @@ int probe_iso9660(blkid_probe pr, const struct blkid_idmag *mag)
continue;
}
/* Not a Boot record, lets see if its supplemntary volume descriptor */
/* Not a Boot record, lets see if its supplementary volume descriptor */
iso = (struct iso_volume_descriptor *) boot;
if (iso->vd_type != ISO_VD_SUPPLEMENTARY) {
@ -236,8 +236,8 @@ int probe_iso9660(blkid_probe pr, const struct blkid_idmag *mag)
blkid_probe_set_version(pr, "Joliet Extension");
/* Is the Joliet (UTF16BE) label equal to the label in
* the PVD? If yes, use PVD label. The Jolied version
* of the label could be trimed (because UTF16..).
* the PVD? If yes, use PVD label. The Joliet version
* of the label could be trimmed (because UTF16..).
*/
if (ascii_eq_utf16be(label, iso->volume_id, 32))
break;

2
libblkid/src/superblocks/linux_raid.c

@ -79,7 +79,7 @@ struct mdp1_super_block {
uint8_t pad2[64-57]; /* set to 0 when writing */
/* array state information - 64 bytes */
uint64_t utime; /* 40 bits second, 24 btes microseconds */
uint64_t utime; /* 40 bits second, 24 bits microseconds */
uint64_t events; /* incremented when superblock updated */
uint64_t resync_offset; /* data before this offset (from data_offset) known to be in sync */
uint32_t sb_csum; /* checksum up to dev_roles[max_dev] */

2
libblkid/src/superblocks/lvm.c

@ -113,7 +113,7 @@ static int probe_lvm2(blkid_probe pr, const struct blkid_idmag *mag)
blkid_probe_set_version(pr, mag->magic);
/* LVM (pvcreate) wipes begin of the device -- let's remember this
* to resolve conflicts bettween LVM and partition tables, ...
* to resolve conflicts between LVM and partition tables, ...
*/
blkid_probe_set_wiper(pr, 0, 8 * 1024);

12
libblkid/src/superblocks/superblocks.c

@ -65,7 +65,7 @@
*
* @SBMAGIC_OFFSET: offset of SBMAGIC
*
* @FSSIZE: size of filessystem [not-implemented yet]
* @FSSIZE: size of filesystem [not-implemented yet]
*
* @SYSTEM_ID: ISO9660 system identifier
*
@ -294,7 +294,7 @@ int blkid_probe_filter_superblocks_usage(blkid_probe pr, int flag, int usage)
* blkid_known_fstype:
* @fstype: filesystem name
*
* Returns: 1 for known filesytems, or 0 for unknown filesystem.
* Returns: 1 for known filesystems, or 0 for unknown filesystem.
*/
int blkid_known_fstype(const char *fstype)
{
@ -410,7 +410,7 @@ static int superblocks_probe(blkid_probe pr, struct blkid_chain *chn)
}
}
/* all cheks passed */
/* all checks passed */
if (chn->flags & BLKID_SUBLKS_TYPE)
rc = blkid_probe_set_value(pr, "TYPE",
(unsigned char *) id->name,
@ -440,7 +440,7 @@ static int superblocks_probe(blkid_probe pr, struct blkid_chain *chn)
/*
* This is the same function as blkid_do_probe(), but returns only one result
* (cannot be used in while()) and checks for ambivalen results (more
* (cannot be used in while()) and checks for ambivalent results (more
* filesystems on the device) -- in such case returns -2.
*
* The function does not check for filesystems when a RAID or crypto signature
@ -509,7 +509,7 @@ static int superblocks_safeprobe(blkid_probe pr, struct blkid_chain *chn)
/*