diff options
-rw-r--r-- | libmount/src/libmount.h.in | 6 | ||||
-rw-r--r-- | libmount/src/libmount.sym | 6 | ||||
-rw-r--r-- | libmount/src/tab.c | 18 | ||||
-rw-r--r-- | libmount/src/tab_parse.c | 4 | ||||
-rw-r--r-- | libmount/src/tab_update.c | 8 |
5 files changed, 21 insertions, 21 deletions
diff --git a/libmount/src/libmount.h.in b/libmount/src/libmount.h.in index 74d21c7c5..9f904ca58 100644 --- a/libmount/src/libmount.h.in +++ b/libmount/src/libmount.h.in @@ -417,9 +417,9 @@ extern void mnt_table_enable_comments(struct libmnt_table *tb, int enable); extern const char *mnt_table_get_intro_comment(struct libmnt_table *tb); extern int mnt_table_set_intro_comment(struct libmnt_table *tb, const char *comm); extern int mnt_table_append_intro_comment(struct libmnt_table *tb, const char *comm); -extern int mnt_table_set_tailing_comment(struct libmnt_table *tb, const char *comm); -extern const char *mnt_table_get_tailing_comment(struct libmnt_table *tb); -extern int mnt_table_append_tailing_comment(struct libmnt_table *tb, const char *comm); +extern int mnt_table_set_trailing_comment(struct libmnt_table *tb, const char *comm); +extern const char *mnt_table_get_trailing_comment(struct libmnt_table *tb); +extern int mnt_table_append_trailing_comment(struct libmnt_table *tb, const char *comm); extern int mnt_table_set_cache(struct libmnt_table *tb, struct libmnt_cache *mpc); extern struct libmnt_cache *mnt_table_get_cache(struct libmnt_table *tb); diff --git a/libmount/src/libmount.sym b/libmount/src/libmount.sym index 053783a72..66455051b 100644 --- a/libmount/src/libmount.sym +++ b/libmount/src/libmount.sym @@ -263,12 +263,12 @@ global: mnt_fs_get_comment; mnt_fs_set_comment; mnt_table_append_intro_comment; - mnt_table_append_tailing_comment; + mnt_table_append_trailing_comment; mnt_table_enable_comments; mnt_table_get_intro_comment; - mnt_table_get_tailing_comment; + mnt_table_get_trailing_comment; mnt_table_replace_file; mnt_table_set_intro_comment; - mnt_table_set_tailing_comment; + mnt_table_set_trailing_comment; mnt_table_write_file; } MOUNT_2.23; diff --git a/libmount/src/tab.c b/libmount/src/tab.c index 20028a641..653c15d3d 100644 --- a/libmount/src/tab.c +++ b/libmount/src/tab.c @@ -137,7 +137,7 @@ int mnt_table_get_nents(struct libmnt_table *tb) * mnt_table_get_intro_comment(). The intro and the comment of the first fstab * entry has to be separated by blank line. The filesystem comments are * accessible by mnt_fs_get_comment(). The tailing fstab comment is accessible - * by mnt_table_get_tailing_comment(). + * by mnt_table_get_trailing_comment(). * * <informalexample> * <programlisting> @@ -216,26 +216,26 @@ int mnt_table_append_intro_comment(struct libmnt_table *tb, const char *comm) } /** - * mnt_table_get_tailing_comment: + * mnt_table_get_trailing_comment: * @tb: pointer to tab * * Returns: table tailing comment */ -const char *mnt_table_get_tailing_comment(struct libmnt_table *tb) +const char *mnt_table_get_trailing_comment(struct libmnt_table *tb) { assert(tb); return tb ? tb->comm_tail : NULL; } /** - * mnt_table_set_tailing_comment + * mnt_table_set_trailing_comment * @tb: pointer to tab * * Sets tailing comment in table. * * Returns: 0 on success or negative number in case of error. */ -int mnt_table_set_tailing_comment(struct libmnt_table *tb, const char *comm) +int mnt_table_set_trailing_comment(struct libmnt_table *tb, const char *comm) { char *p = NULL; @@ -253,7 +253,7 @@ int mnt_table_set_tailing_comment(struct libmnt_table *tb, const char *comm) } /** - * mnt_table_append_tailing_comment: + * mnt_table_append_trailing_comment: * @tb: pointer to tab * @comm: comment of NULL * @@ -261,7 +261,7 @@ int mnt_table_set_tailing_comment(struct libmnt_table *tb, const char *comm) * * Returns: 0 on success or negative number in case of error. */ -int mnt_table_append_tailing_comment(struct libmnt_table *tb, const char *comm) +int mnt_table_append_trailing_comment(struct libmnt_table *tb, const char *comm) { assert(tb); if (!tb) @@ -1315,9 +1315,9 @@ int test_parse(struct libmnt_test *ts, int argc, char *argv[]) while(mnt_table_next_fs(tb, itr, &fs) == 0) mnt_fs_print_debug(fs, stdout); - if (mnt_table_get_tailing_comment(tb)) + if (mnt_table_get_trailing_comment(tb)) fprintf(stdout, "Trailing comment:\n\"%s\"\n", - mnt_table_get_tailing_comment(tb)); + mnt_table_get_trailing_comment(tb)); rc = 0; done: mnt_free_iter(itr); diff --git a/libmount/src/tab_parse.c b/libmount/src/tab_parse.c index 527e14ee2..f3947020c 100644 --- a/libmount/src/tab_parse.c +++ b/libmount/src/tab_parse.c @@ -404,10 +404,10 @@ static int append_comment(struct libmnt_table *tb, if (intro) rc = mnt_table_append_intro_comment(tb, comm); else if (eof) { - rc = mnt_table_set_tailing_comment(tb, + rc = mnt_table_set_trailing_comment(tb, mnt_fs_get_comment(fs)); if (!rc) - rc = mnt_table_append_tailing_comment(tb, comm); + rc = mnt_table_append_trailing_comment(tb, comm); if (!rc) rc = mnt_fs_set_comment(fs, NULL); } else diff --git a/libmount/src/tab_update.c b/libmount/src/tab_update.c index 64d813183..292aa3484 100644 --- a/libmount/src/tab_update.c +++ b/libmount/src/tab_update.c @@ -545,8 +545,8 @@ static int update_table(struct libmnt_update *upd, struct libmnt_table *tb) goto leave; } } - if (tb->comms && mnt_table_get_tailing_comment(tb)) - fputs(mnt_table_get_tailing_comment(tb), f); + if (tb->comms && mnt_table_get_trailing_comment(tb)) + fputs(mnt_table_get_trailing_comment(tb), f); if (fflush(f) != 0) { rc = -errno; @@ -603,8 +603,8 @@ int mnt_table_write_file(struct libmnt_table *tb, FILE *file) if (rc) return rc; } - if (tb->comms && mnt_table_get_tailing_comment(tb)) - fputs(mnt_table_get_tailing_comment(tb), file); + if (tb->comms && mnt_table_get_trailing_comment(tb)) + fputs(mnt_table_get_trailing_comment(tb), file); if (fflush(file) != 0) rc = -errno; |