libmount: change tailing to trailing in *_tailing_comments functions

Signed-off-by: Ondrej Oprala <ooprala@redhat.com>

diff --git a/libmount/src/libmount.h.in b/libmount/src/libmount.h.in
index 74d21c7c5b78b82237ba3036cf45bd8864eed385..9f904ca5890a0b3b6335807c28275f1529d382e2 100644 (file)
--- 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 053783a72701169a9612801c0a0851761676f318..66455051b548dc118d61ab9c8f23026305fde209 100644 (file)
--- 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 20028a641844dcaebea094d2f5a65d348b2b187c..653c15d3dbc78b6fb8591c4548c2a01d8e6a2e76 100644 (file)
--- 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 527e14ee2440b901b2fcf0a21498da19aba6d9c9..f3947020c2e6de932b2703171101c8cd635d73a8 100644 (file)
--- 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 64d813183c6bccfc4cfe36cdb6fe91b7fd505b96..292aa34844613eb5060e00ed9b730748e3520458 100644 (file)
--- 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;