diff options
Diffstat (limited to 'shlibs/mount')
| -rw-r--r-- | shlibs/mount/src/mountP.h | 20 | ||||
| -rw-r--r-- | shlibs/mount/src/tab_parse.c | 6 | ||||
| -rw-r--r-- | shlibs/mount/src/utils.c | 13 |
3 files changed, 19 insertions, 20 deletions
diff --git a/shlibs/mount/src/mountP.h b/shlibs/mount/src/mountP.h index abaa6b2c6..00ca8875f 100644 --- a/shlibs/mount/src/mountP.h +++ b/shlibs/mount/src/mountP.h @@ -161,8 +161,8 @@ struct libmnt_fs { struct list_head ents; int id; /* mountinfo[1]: ID */ - int parent; /* moutninfo[2]: parent */ - dev_t devno; /* moutninfo[3]: st_dev */ + int parent; /* mountinfo[2]: parent */ + dev_t devno; /* mountinfo[3]: st_dev */ char *bindsrc; /* utab, full path from fstab[1] for bind mounts */ @@ -177,11 +177,11 @@ struct libmnt_fs { char *optstr; /* fstab[4], merged options */ char *vfs_optstr; /* mountinfo[6]: fs-independent (VFS) options */ - char *fs_optstr; /* mountinfo[11]: fs-depend options */ + char *fs_optstr; /* mountinfo[11]: fs-dependent options */ char *user_optstr; /* userspace mount options */ char *attrs; /* mount attributes */ - int freq; /* fstab[5]: dump frequency in days */ + int freq; /* fstab[5]: dump frequency in days */ int passno; /* fstab[6]: pass number on parallel fsck */ int flags; /* MNT_FS_* flags */ @@ -242,9 +242,9 @@ struct libmnt_context char *fstype_pattern; /* for mnt_match_fstype() */ char *optstr_pattern; /* for mnt_match_options() */ - struct libmnt_fs *fs; /* filesystem description (type, mountpopint, device, ...) */ + struct libmnt_fs *fs; /* filesystem description (type, mountpoint, device, ...) */ - struct libmnt_table *fstab; /* fstab (or mtab for some remounts) entires */ + struct libmnt_table *fstab; /* fstab (or mtab for some remounts) entries */ struct libmnt_table *mtab; /* mtab entries */ int optsmode; /* fstab optstr mode MNT_OPTSMODE_{AUTO,FORCE,IGNORE} */ @@ -258,11 +258,11 @@ struct libmnt_context struct libmnt_lock *lock; /* mtab lock */ struct libmnt_update *update;/* mtab/utab update */ - const char *mtab_path; /* writable mtab */ - int mtab_writable; /* ismtab writeable */ + const char *mtab_path; /* path to mtab */ + int mtab_writable; /* is mtab writable */ - const char *utab_path; /* writable mtab */ - int utab_writable; /* ismtab writeable */ + const char *utab_path; /* path to utab */ + int utab_writable; /* is utab writable */ int flags; /* private context flags */ int ambi; /* libblkid returns ambivalent result */ diff --git a/shlibs/mount/src/tab_parse.c b/shlibs/mount/src/tab_parse.c index cd4e34897..43a2bf192 100644 --- a/shlibs/mount/src/tab_parse.c +++ b/shlibs/mount/src/tab_parse.c @@ -244,7 +244,7 @@ enomem: /* * Returns {m,fs}tab or mountinfo file format (MNT_FMT_*) * - * Note that we aren't tring to guess utab file format, because this file has + * Note that we aren't trying to guess utab file format, because this file has * to be always parsed by private libmount routines with explicitly defined * format. * @@ -350,7 +350,7 @@ int mnt_table_parse_stream(struct libmnt_table *tb, FILE *f, const char *filenam DBG(TAB, mnt_debug_h(tb, "%s: start parsing", filename)); /* necessary for /proc/mounts only, the /proc/self/mountinfo - * parser sets propertly the flag + * parser sets the flag properly */ if (filename && strcmp(filename, _PATH_PROC_MOUNTS) == 0) flags = MNT_FS_KERNEL; @@ -422,7 +422,7 @@ static int mnt_table_parse_dir(struct libmnt_table *tb, const char *dirname) DIR *dir = NULL; struct dirent **namelist = NULL; - /* TODO: it would be nice to have a scandir() implementaion that + /* TODO: it would be nice to have a scandir() implementation that * is able to use already opened directory */ n = scandir(dirname, &namelist, NULL, versionsort); if (n <= 0) diff --git a/shlibs/mount/src/utils.c b/shlibs/mount/src/utils.c index 356c61069..27832b36a 100644 --- a/shlibs/mount/src/utils.c +++ b/shlibs/mount/src/utils.c @@ -202,11 +202,11 @@ int mnt_fstype_is_netfs(const char *type) /** * mnt_match_fstype: * @type: filesystem type - * @pattern: filesystem name or comma delimitted list of names + * @pattern: filesystem name or comma delimited list of names * * The @pattern list of filesystem can be prefixed with a global * "no" prefix to invert matching of the whole list. The "no" could - * also used for individual items in the @pattern list. So, + * also be used for individual items in the @pattern list. So, * "nofoo,bar" has the same meaning as "nofoo,nobar". * * "bar" : "nofoo,bar" -> False (global "no" prefix) @@ -284,10 +284,10 @@ static int check_option(const char *haystack, size_t len, /** * mnt_match_options: * @optstr: options string - * @pattern: comma delimitted list of options + * @pattern: comma delimited list of options * * The "no" could used for individual items in the @options list. The "no" - * prefix does not have a global meanning. + * prefix does not have a global meaning. * * Unlike fs type matching, nonetdev,user and nonetdev,nouser have * DIFFERENT meanings; each option is matched explicitly as specified. @@ -556,7 +556,7 @@ static int try_write(const char *filename) * If the file does not exist and @writable argument is not NULL then it will * try to create the file * - * Returns: 1 if /etc/mtab is a reqular file, and 0 in case of error (check + * Returns: 1 if /etc/mtab is a regular file, and 0 in case of error (check * errno for more details). */ int mnt_has_regular_mtab(const char **mtab, int *writable) @@ -602,10 +602,9 @@ done: * If the file does not exist and @writable argument is not NULL then it will * try to create the directory (e.g. /dev/.mount) and the file. * - * Returns: 1 if /dev/.mount/utab is a reqular file, and 0 in case of + * Returns: 1 if /dev/.mount/utab is a regular file, and 0 in case of * error (check errno for more details). */ - int mnt_has_regular_utab(const char **utab, int *writable) { struct stat st; |