diff options
| -rw-r--r-- | include/pathnames.h | 2 | ||||
| -rw-r--r-- | include/strutils.h | 2 | ||||
| -rw-r--r-- | lib/fileutils.c | 2 | ||||
| -rw-r--r-- | lib/loopdev.c | 2 | ||||
| -rw-r--r-- | lib/strutils.c | 2 | ||||
| -rw-r--r-- | libfdisk/src/ask.c | 2 | ||||
| -rw-r--r-- | libmount/python/fs.c | 4 | ||||
| -rw-r--r-- | libmount/python/tab.c | 4 | ||||
| -rw-r--r-- | libmount/src/tab.c | 2 | ||||
| -rw-r--r-- | libsmartcols/samples/fromfile.c | 2 | ||||
| -rw-r--r-- | libsmartcols/src/table.c | 2 | ||||
| -rw-r--r-- | misc-utils/blkid.c | 2 |
12 files changed, 14 insertions, 14 deletions
diff --git a/include/pathnames.h b/include/pathnames.h index a148f24d9b..12628a5d18 100644 --- a/include/pathnames.h +++ b/include/pathnames.h @@ -146,7 +146,7 @@ #ifndef _PATH_DEV /* - * The tailing '/' in _PATH_DEV is there for compatibility with libc. + * The trailing '/' in _PATH_DEV is there for compatibility with libc. */ # define _PATH_DEV "/dev/" #endif diff --git a/include/strutils.h b/include/strutils.h index c6172af43c..e5ddbcf1bf 100644 --- a/include/strutils.h +++ b/include/strutils.h @@ -388,7 +388,7 @@ static inline size_t __normalize_whitespace( else dst[x++] = src[i++]; } - if (nsp && x > 0) /* tailing space */ + if (nsp && x > 0) /* trailing space */ x--; done: dst[x] = '\0'; diff --git a/lib/fileutils.c b/lib/fileutils.c index 95ee516350..b7acae4308 100644 --- a/lib/fileutils.c +++ b/lib/fileutils.c @@ -332,7 +332,7 @@ char *ul_basename(char *path) return p + 1; /* begin of the name */ while (p > path && *(p - 1) == '/') - --p; /* remove tailing '/' */ + --p; /* remove trailing '/' */ if (p > path) { *p-- = '\0'; diff --git a/lib/loopdev.c b/lib/loopdev.c index c72fb2c404..699322c4a7 100644 --- a/lib/loopdev.c +++ b/lib/loopdev.c @@ -135,7 +135,7 @@ int loopcxt_set_device(struct loopdev_cxt *lc, const char *device) if (strlen(device) < 5) return -1; device += 4; - dir = _PATH_DEV_LOOP "/"; /* _PATH_DEV uses tailing slash */ + dir = _PATH_DEV_LOOP "/"; /* _PATH_DEV uses trailing slash */ } snprintf(lc->device, sizeof(lc->device), "%s%s", dir, device); diff --git a/lib/strutils.c b/lib/strutils.c index 9ea5da7cbc..e3a059145a 100644 --- a/lib/strutils.c +++ b/lib/strutils.c @@ -919,7 +919,7 @@ int streq_paths(const char *a, const char *b) if (a_sz + b_sz == 0) return 1; - /* ignore tailing slash */ + /* ignore trailing slash */ if (a_sz + b_sz == 1 && ((a_seg && *a_seg == '/') || (b_seg && *b_seg == '/'))) return 1; diff --git a/libfdisk/src/ask.c b/libfdisk/src/ask.c index 6e566256db..507cc6fc63 100644 --- a/libfdisk/src/ask.c +++ b/libfdisk/src/ask.c @@ -430,7 +430,7 @@ static char *mk_string_list(char *ptr, size_t *len, size_t *begin, if (cur == -1 && *begin) { /* end of the list */ - *(ptr - 1) = '\0'; /* remove tailing ',' from the list */ + *(ptr - 1) = '\0'; /* remove trailing ',' from the list */ return ptr; } diff --git a/libmount/python/fs.c b/libmount/python/fs.c index ccb2460a3f..a8e60eea79 100644 --- a/libmount/python/fs.c +++ b/libmount/python/fs.c @@ -584,7 +584,7 @@ static PyObject *Fs_match_options(FsObject *self, PyObject *args, PyObject *kwds } #define Fs_streq_srcpath_HELP "streq_srcpath(srcpath)\n\n" \ - "Compares fs source path with path. The tailing slash is ignored.\n" \ + "Compares fs source path with path. The trailing slash is ignored.\n" \ "Returns True if fs source path equal to path, otherwise False." static PyObject *Fs_streq_srcpath(FsObject *self, PyObject *args, PyObject *kwds) { @@ -599,7 +599,7 @@ static PyObject *Fs_streq_srcpath(FsObject *self, PyObject *args, PyObject *kwds } #define Fs_streq_target_HELP "streq_target(target)\n\n" \ - "Compares fs target path with path. The tailing slash is ignored.\n" \ + "Compares fs target path with path. The trailing slash is ignored.\n" \ "See also Fs.match_target().\n" \ "Returns True if fs target path equal to path, otherwise False." static PyObject *Fs_streq_target(FsObject *self, PyObject *args, PyObject *kwds) diff --git a/libmount/python/tab.c b/libmount/python/tab.c index d33a1fe3b7..8401ee1b21 100644 --- a/libmount/python/tab.c +++ b/libmount/python/tab.c @@ -101,7 +101,7 @@ static int Table_set_trailing_comment(TableObject *self, PyObject *value, "The initial (intro) file comment is accessible by\n" \ "Tab.intro_comment. The intro and the comment of the first fstab" \ "entry has to be separated by blank line. The filesystem comments are\n" \ - "accessible by Fs.comment. The tailing fstab comment is accessible\n" \ + "accessible by Fs.comment. The trailing fstab comment is accessible\n" \ "by Tab.trailing_comment.\n" \ "\n" \ "<informalexample>\n" \ @@ -114,7 +114,7 @@ static int Table_set_trailing_comment(TableObject *self, PyObject *value, "LABEL=foo /mnt/foo auto defaults 1 2\n" \ "# this comments belongs to the second fs\n" \ "LABEL=bar /mnt/bar auto defaults 1 2 \n" \ - "# tailing comment\n" \ + "# trailing comment\n" \ "</programlisting>\n" \ "</informalexample>" static PyObject *Table_enable_comments(TableObject *self, PyObject *args, diff --git a/libmount/src/tab.c b/libmount/src/tab.c index 526edcee6c..2b89552eb2 100644 --- a/libmount/src/tab.c +++ b/libmount/src/tab.c @@ -249,7 +249,7 @@ void *mnt_table_get_userdata(struct libmnt_table *tb) * LABEL=foo /mnt/foo auto defaults 1 2 * # this comments belongs to the second fs * LABEL=bar /mnt/bar auto defaults 1 2 - * # tailing comment + * # trailing comment * </programlisting> * </informalexample> */ diff --git a/libsmartcols/samples/fromfile.c b/libsmartcols/samples/fromfile.c index cf77cc4766..3c79b509b2 100644 --- a/libsmartcols/samples/fromfile.c +++ b/libsmartcols/samples/fromfile.c @@ -205,7 +205,7 @@ static void __attribute__((__noreturn__)) usage(void) "\n %s [options] <column-data-file> ...\n\n", program_invocation_short_name); fputs(" -m, --maxout fill all terminal width\n", out); - fputs(" -M, --minout minimize tailing padding\n", out); + fputs(" -M, --minout minimize trailing padding\n", out); fputs(" -c, --column <file> column definition\n", out); fputs(" -n, --nlines <num> number of lines\n", out); fputs(" -J, --json JSON output format\n", out); diff --git a/libsmartcols/src/table.c b/libsmartcols/src/table.c index 3d23da8d9b..dc6a3a74b1 100644 --- a/libsmartcols/src/table.c +++ b/libsmartcols/src/table.c @@ -1292,7 +1292,7 @@ int scols_table_enable_maxout(struct libscols_table *tb, int enable) * * Force library to terminate line after last column with data. The extra * padding is not added to the empty cells at the end of the line. The default is fill - * tailing empty cells except the last line cell. + * trailing empty cells except the last line cell. * * This setting is mutually exclusive to scols_table_enable_maxout(). * diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c index 5381d14f72..aaffe19168 100644 --- a/misc-utils/blkid.c +++ b/misc-utils/blkid.c @@ -464,7 +464,7 @@ static int print_udev_ambivalent(blkid_probe pr) } if (count > 1) { - *(val + valsz - 1) = '\0'; /* rem tailing whitespace */ + *(val + valsz - 1) = '\0'; /* rem trailing whitespace */ printf("ID_FS_AMBIVALENT=%s\n", val); rc = 0; } |