From 9e93004171eb0c4c288051b2d7bb37f97a0ae430 Mon Sep 17 00:00:00 2001 From: Sebastian Rasmussen Date: Sun, 29 May 2016 23:11:53 +0200 Subject: misc: Fix various typos Fix various typos in error messages, warnings, debug strings, comments and names of static functions. Signed-off-by: Sebastian Rasmussen --- libmount/python/context.c | 12 ++++++------ libmount/python/fs.c | 4 ++-- libmount/python/pylibmount.c | 2 +- libmount/python/tab.c | 4 ++-- libmount/src/btrfs.c | 2 +- libmount/src/context.c | 24 ++++++++++++------------ libmount/src/context_mount.c | 2 +- libmount/src/context_umount.c | 2 +- libmount/src/fs.c | 2 +- libmount/src/init.c | 2 +- libmount/src/lock.c | 4 ++-- libmount/src/optmap.c | 4 ++-- libmount/src/tab.c | 8 ++++---- libmount/src/tab_parse.c | 4 ++-- libmount/src/utils.c | 2 +- 15 files changed, 39 insertions(+), 39 deletions(-) (limited to 'libmount') diff --git a/libmount/python/context.c b/libmount/python/context.c index 623239436..8256e87c9 100644 --- a/libmount/python/context.c +++ b/libmount/python/context.c @@ -311,10 +311,10 @@ static PyObject *Context_enable_fork(ContextObjext *self, PyObject *args, PyObje #define Context_disable_canonicalize_HELP "disable_canonicalize(disable)\n\n" \ "Enable/disable paths canonicalization and tags evaluation. The libmount context\n" \ - "canonicalies paths when search in fstab and when prepare source and target paths\n" \ + "canonicalizes paths when searching fstab and when preparing source and target paths\n" \ "for mount(2) syscall.\n" \ "\n" \ - "This fuction has effect to the private (within context) fstab instance only\n" \ + "This function has effect to the private (within context) fstab instance only\n" \ "(see Cxt.fstab).\n" \ "Returns self or raises an exception in case of an error." static PyObject *Context_disable_canonicalize(ContextObjext *self, PyObject *args, PyObject *kwds) @@ -1074,11 +1074,11 @@ static PyObject *Context_helper_setopt(ContextObjext *self, PyObject *args, PyOb } #define Context_init_helper_HELP "init_helper(action, flags)\n\n" \ - "This function infors libmount that used from [u]mount.type helper.\n" \ + "This function informs libmount that it is used from [u]mount.type helper.\n" \ "\n" \ - "The function also calls Cxt.disable_helpers() to avoid recursive\n" \ - "mount.type helpers calling. It you really want to call another\n" \ - "mount.type helper from your helper than you have to explicitly enable this\n" \ + "The function also calls Cxt.disable_helpers() to avoid calling\n" \ + "mount.type helpers recursively. If you really want to call another\n" \ + "mount.type helper from your helper then you have to explicitly enable this\n" \ "feature by:\n" \ "\n" \ "Cxt.disable_helpers(False);\n" \ diff --git a/libmount/python/fs.c b/libmount/python/fs.c index 0789d3797..ca1ce2ada 100644 --- a/libmount/python/fs.c +++ b/libmount/python/fs.c @@ -609,7 +609,7 @@ static PyMethodDef Fs_methods[] = { static void Fs_destructor(FsObject *self) { - DBG(FS, pymnt_debug_h(self->fs, "destrutor py-obj: %p, py-refcnt=%d", + DBG(FS, pymnt_debug_h(self->fs, "destructor py-obj: %p, py-refcnt=%d", self, (int) ((PyObject *) self)->ob_refcnt)); mnt_unref_fs(self->fs); PyFree(self); @@ -748,7 +748,7 @@ PyObject *PyObjectResultFs(struct libmnt_fs *fs) return (PyObject *) result; } - /* Creating an encapsualing object: increment the refcount, so that code + /* Creating an encapsulating object: increment the refcount, so that code * such as tab.next_fs() doesn't call the destructor, which would free * our fs struct as well */ diff --git a/libmount/python/pylibmount.c b/libmount/python/pylibmount.c index 54d7dfa70..61dace7d4 100644 --- a/libmount/python/pylibmount.c +++ b/libmount/python/pylibmount.c @@ -130,7 +130,7 @@ char *pystos(PyObject *pys) "Please note that none of the classes' attributes may be deleted.\n" \ "This is not a complete mapping to the libmount C API, nor is it\n" \ "attempting to be one.\n" "Iterator functions only allow forward\n" \ - "iteration for now. Contex.get_{user_,}mflags() differs from the C API\n" \ + "iteration for now. Context.get_{user_,}mflags() differs from the C API\n" \ "and returns the flags directly. Fs.get_tag() differs from the C API\n" \ "and returns a (tag, value) tuple. Every attribute is \"filtered\"" \ "through appropriate getters/setters, no values are set directly." diff --git a/libmount/python/tab.c b/libmount/python/tab.c index 6f255aef7..a77c5cb0c 100644 --- a/libmount/python/tab.c +++ b/libmount/python/tab.c @@ -546,7 +546,7 @@ void Table_unref(struct libmnt_table *tab) static void Table_destructor(TableObject *self) { - DBG(TAB, pymnt_debug_h(self->tab, "destrutor py-obj: %p, py-refcnt=%d", + DBG(TAB, pymnt_debug_h(self->tab, "destructor py-obj: %p, py-refcnt=%d", self, (int) ((PyObject *) self)->ob_refcnt)); Table_unref(self->tab); self->tab = NULL; @@ -686,7 +686,7 @@ PyObject *PyObjectResultTab(struct libmnt_table *tab) return (PyObject *) result; } - /* Creating an encapsualing object: increment the refcount, so that + /* Creating an encapsulating object: increment the refcount, so that * code such as: cxt.get_fstab() doesn't call the destructor, which * would free our tab struct as well */ diff --git a/libmount/src/btrfs.c b/libmount/src/btrfs.c index 9f48bf4a4..be4d144bf 100644 --- a/libmount/src/btrfs.c +++ b/libmount/src/btrfs.c @@ -37,7 +37,7 @@ /* * the key defines the order in the tree, and so it also defines (optimal) - * block layout. objectid corresonds to the inode number. The flags + * block layout. objectid corresponds with the inode number. The flags * tells us things about the object, and is a kind of stream selector. * so for a given inode, keys with flags of 1 might refer to the inode * data, flags of 2 may point to file data in the btree and flags == 3 diff --git a/libmount/src/context.c b/libmount/src/context.c index d9bda4375..c53a63954 100644 --- a/libmount/src/context.c +++ b/libmount/src/context.c @@ -214,7 +214,7 @@ static int context_init_paths(struct libmnt_context *cxt, int writable) if (!writable) return 0; /* only paths wanted */ if (mnt_context_is_nomtab(cxt)) - return 0; /* write mode overrided by mount -n */ + return 0; /* write mode overridden by mount -n */ if (cxt->flags & MNT_FL_TABPATHS_CHECKED) return 0; @@ -349,7 +349,7 @@ int mnt_context_get_optsmode(struct libmnt_context *cxt) * canonicalizes paths when searching in fstab and when preparing source and target paths * for mount(2) syscall. * - * This fuction has an effect on the private (within context) fstab instance only + * This function has an effect on the private (within context) fstab instance only * (see mnt_context_set_fstab()). If you want to use an external fstab then you * need to manage your private struct libmnt_cache (see mnt_table_set_cache(fstab, * NULL). @@ -686,7 +686,7 @@ int mnt_context_is_loopdel(struct libmnt_context *cxt) * * The mount context uses private @fs by default. This function allows to * overwrite the private @fs with an external instance. This function - * increments @fs reference counter (and deincrement reference counter of the + * increments @fs reference counter (and decrement reference counter of the * old fs). * * The @fs will be modified by mnt_context_set_{source,target,options,fstype} @@ -766,7 +766,7 @@ void *mnt_context_get_mtab_userdata(struct libmnt_context *cxt) * Note that libmount does not interpret "nofail" (MNT_MS_NOFAIL) * mount option. The real return code is always returned, when * the device does not exist then it's usually MNT_ERR_NOSOURCE - * from libmount or ENOENT, ENOTDIR, ENOTBLK, ENXIO from moun(2). + * from libmount or ENOENT, ENOTDIR, ENOTBLK, ENXIO from mount(2). * * Returns: 0 on success, negative number in case of error. */ @@ -1191,7 +1191,7 @@ int mnt_context_set_tables_errcb(struct libmnt_context *cxt, /** * mnt_context_set_cache: * @cxt: mount context - * @cache: cache instance or nULL + * @cache: cache instance or NULL * * The mount context maintains a private struct libmnt_cache by default. This * function allows to overwrite the private cache with an external instance. @@ -1248,7 +1248,7 @@ struct libmnt_cache *mnt_context_get_cache(struct libmnt_context *cxt) * mnt_context_set_passwd_cb: * @cxt: mount context * @get: callback to get password - * @release: callback to release (delallocate) password + * @release: callback to release (deallocate) password * * Sets callbacks for encryption password (e.g encrypted loopdev). This * function is deprecated (encrypted loops are no longer supported). @@ -1275,7 +1275,7 @@ int mnt_context_set_passwd_cb(struct libmnt_context *cxt, * interrupted by signal or signals have to be ignored when the lock is locked. * * The default behavior is to ignore all signals (except SIGALRM and - * SIGTRAP for mtab udate) when the lock is locked. If this behavior + * SIGTRAP for mtab update) when the lock is locked. If this behavior * is unacceptable, then use: * * lc = mnt_context_get_lock(cxt); @@ -1349,7 +1349,7 @@ int mnt_context_set_mflags(struct libmnt_context *cxt, unsigned long flags) * @cxt: mount context * @flags: returns MS_* mount flags * - * Converts mount options string to MS_* flags and bitewise-OR the result with + * Converts mount options string to MS_* flags and bitwise-OR the result with * the already defined flags (see mnt_context_set_mflags()). * * Returns: 0 on success, negative number in case of error. @@ -1406,7 +1406,7 @@ int mnt_context_set_user_mflags(struct libmnt_context *cxt, unsigned long flags) * @cxt: mount context * @flags: returns mount flags * - * Converts mount options string to MNT_MS_* flags and bitewise-OR the result + * Converts mount options string to MNT_MS_* flags and bitwise-OR the result * with the already defined flags (see mnt_context_set_user_mflags()). * * Returns: 0 on success, negative number in case of error. @@ -2440,7 +2440,7 @@ static int test_mount(struct libmnt_test *ts, int argc, char *argv[]) } if (argc == idx + 1) - /* mount | */ + /* mount | */ mnt_context_set_target(cxt, argv[idx++]); else if (argc == idx + 2) { @@ -2500,7 +2500,7 @@ static int test_umount(struct libmnt_test *ts, int argc, char *argv[]) } if (argc == idx + 1) { - /* mount | */ + /* mount | */ mnt_context_set_target(cxt, argv[idx++]); } else { rc = -EINVAL; @@ -2542,7 +2542,7 @@ static int test_flags(struct libmnt_test *ts, int argc, char *argv[]) } if (argc == idx + 1) - /* mount | */ + /* mount | */ mnt_context_set_target(cxt, argv[idx++]); rc = mnt_context_prepare_mount(cxt); diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c index e0d316021..7e5128b79 100644 --- a/libmount/src/context_mount.c +++ b/libmount/src/context_mount.c @@ -378,7 +378,7 @@ static int generate_helper_optstr(struct libmnt_context *cxt, char **optstr) * However, if you call mount. as root, then the helper follows * the command line. If there is (for example) "user,exec" in fstab, * then we have to manually append the "exec" back to the options - * string, bacause there is nothing like MS_EXEC (we only have + * string, because there is nothing like MS_EXEC (we only have * MS_NOEXEC in mount flags and we don't care about the original * mount string in libmount for VFS options). */ diff --git a/libmount/src/context_umount.c b/libmount/src/context_umount.c index 9a37901b5..707665db4 100644 --- a/libmount/src/context_umount.c +++ b/libmount/src/context_umount.c @@ -164,7 +164,7 @@ err: * stored in context->utab and deallocated by mnt_free_context(). * * This function exists to avoid (if possible) /proc/self/mountinfo usage, so - * don't use thigs like mnt_resolve_target(), mnt_context_get_mtab() etc here. + * don't use things like mnt_resolve_target(), mnt_context_get_mtab() etc here. * See lookup_umount_fs() for more details. */ static int has_utab_entry(struct libmnt_context *cxt, const char *target) diff --git a/libmount/src/fs.c b/libmount/src/fs.c index df00504ba..9cb329345 100644 --- a/libmount/src/fs.c +++ b/libmount/src/fs.c @@ -731,7 +731,7 @@ static char *merge_optstr(const char *vfs, const char *fs) * @fs: fstab/mtab/mountinfo entry pointer * * Merges all mount options (VFS, FS and userspace) to one options string - * and returns the result. This function does not modigy @fs. + * and returns the result. This function does not modify @fs. * * Returns: pointer to string (can be freed by free(3)) or NULL in case of error. */ diff --git a/libmount/src/init.c b/libmount/src/init.c index 9d3e4b539..c927fb7f6 100644 --- a/libmount/src/init.c +++ b/libmount/src/init.c @@ -27,7 +27,7 @@ UL_DEBUG_DEFINE_MASKNAMES(libmount) = { "locks", MNT_DEBUG_LOCKS, "mtab and utab locking" }, { "loop", MNT_DEBUG_LOOP, "loop devices routines" }, { "options", MNT_DEBUG_OPTIONS, "mount options parsing" }, - { "tab", MNT_DEBUG_TAB, "fstab, mtab, mounninfo routines" }, + { "tab", MNT_DEBUG_TAB, "fstab, mtab, mountinfo routines" }, { "update", MNT_DEBUG_UPDATE, "mtab, utab updates" }, { "utils", MNT_DEBUG_UTILS, "misc library utils" }, { "monitor", MNT_DEBUG_MONITOR, "mount tables monitor" }, diff --git a/libmount/src/lock.c b/libmount/src/lock.c index 4076a23f2..c3cd226f4 100644 --- a/libmount/src/lock.c +++ b/libmount/src/lock.c @@ -508,11 +508,11 @@ failed: * * 1. create linkfile (e.g. /etc/mtab~.$PID) * 2. link linkfile --> lockfile (e.g. /etc/mtab~.$PID --> /etc/mtab~) - * 3. a) link() success: setups F_SETLK lock (see fcnlt(2)) + * 3. a) link() success: setups F_SETLK lock (see fcntl(2)) * b) link() failed: wait (max 30s) on F_SETLKW lock, goto 2. * * Note that when the lock is used by mnt_update_table() interface then libmount - * uses flock() for private library file /run/mount/utab. The fcnlt(2) is used only + * uses flock() for private library file /run/mount/utab. The fcntl(2) is used only * for backwardly compatible stuff like /etc/mtab. * * Returns: 0 on success or negative number in case of error (-ETIMEOUT is case diff --git a/libmount/src/optmap.c b/libmount/src/optmap.c index 3ad77273e..f827e04f5 100644 --- a/libmount/src/optmap.c +++ b/libmount/src/optmap.c @@ -14,7 +14,7 @@ * * @mountflags: (see MS_* macros in linux/fs.h) * - * @mountdata: (usully a comma separated string of options) + * @mountdata: (usually a comma separated string of options) * * The libmount uses options-map(s) to describe mount options. * @@ -182,7 +182,7 @@ static const struct libmnt_optmap userspace_opts_map[] = * MNT_LINUX_MAP - Linux kernel fs-independent mount options * (usually MS_* flags, see linux/fs.h) * - * MNT_USERSPACE_MAP - userpace mount(8) specific mount options + * MNT_USERSPACE_MAP - userspace mount(8) specific mount options * (e.g user=, _netdev, ...) * * Returns: static built-in libmount map. diff --git a/libmount/src/tab.c b/libmount/src/tab.c index b09c79f0d..155c65ee3 100644 --- a/libmount/src/tab.c +++ b/libmount/src/tab.c @@ -152,7 +152,7 @@ void mnt_unref_table(struct libmnt_table *tb) * Deallocates the table. This function does not care about reference count. Don't * use this function directly -- it's better to use use mnt_unref_table(). * - * The table entries (filesystems) are unrefrenced by mnt_reset_table() and + * The table entries (filesystems) are unreferenced by mnt_reset_table() and * cache by mnt_unref_cache(). */ void mnt_free_table(struct libmnt_table *tb) @@ -359,7 +359,7 @@ int mnt_table_append_trailing_comment(struct libmnt_table *tb, const char *comm) * same cache between more threads -- currently the cache does not provide any * locking method. * - * This function increments cache reference counter. It's recomented to use + * This function increments cache reference counter. It's recommended to use * mnt_unref_cache() after mnt_table_set_cache() if you want to keep the cache * referenced by @tb only. * @@ -690,7 +690,7 @@ static int mnt_table_move_parent(struct libmnt_table *tb, int oldid, int newid) * backward mode iterator). * * @MNT_UNIQ_FORWARD: remove later mounted filesystems - * @MNT_UNIQ_KEEPTREE: keep parent->id relation ship stil valid + * @MNT_UNIQ_KEEPTREE: keep parent->id relationship still valid * * Returns: negative number in case of error, or 0 o success. */ @@ -871,7 +871,7 @@ struct libmnt_fs *mnt_table_find_target(struct libmnt_table *tb, const char *pat return fs; } - /* non-canonicaled path in struct libmnt_table + /* non-canonical path in struct libmnt_table * -- note that mountpoint in /proc/self/mountinfo is already * canonicalized by the kernel */ diff --git a/libmount/src/tab_parse.c b/libmount/src/tab_parse.c index 3f5e14abb..b17a22913 100644 --- a/libmount/src/tab_parse.c +++ b/libmount/src/tab_parse.c @@ -591,7 +591,7 @@ static int kernel_fs_postparse(struct libmnt_table *tb, rc = __mnt_fs_set_source_ptr(fs, real); } else if (rc == 1) { - /* mnt_guess_system_root() returns 1 if not able to conver to + /* mnt_guess_system_root() returns 1 if not able to convert to * the real devname; ignore this problem */ rc = 0; } @@ -1069,7 +1069,7 @@ int __mnt_table_parse_mtab(struct libmnt_table *tb, const char *filename, assert(tb); if (filename) - DBG(TAB, ul_debugobj(tb, "%s reuested as mtab", filename)); + DBG(TAB, ul_debugobj(tb, "%s requested as mtab", filename)); #ifdef USE_LIBMOUNT_SUPPORT_MTAB if (mnt_has_regular_mtab(&filename, NULL)) { diff --git a/libmount/src/utils.c b/libmount/src/utils.c index 8b80609e9..733a03330 100644 --- a/libmount/src/utils.c +++ b/libmount/src/utils.c @@ -1013,7 +1013,7 @@ err: } /* - * Search for @name kernel command parametr. + * Search for @name kernel command parameter. * * Returns newly allocated string with a parameter argument if the @name is * specified as "name=" or returns pointer to @name or returns NULL if not -- cgit v1.2.3-55-g7522