diff options
| -rw-r--r-- | libmount/docs/libmount-sections.txt | 7 | ||||
| -rw-r--r-- | libmount/src/cache.c | 2 | ||||
| -rw-r--r-- | libmount/src/libmount.h.in | 2 | ||||
| -rw-r--r-- | libmount/src/libmount.sym | 2 | ||||
| -rw-r--r-- | libmount/src/monitor.c | 10 |
5 files changed, 14 insertions, 9 deletions
diff --git a/libmount/docs/libmount-sections.txt b/libmount/docs/libmount-sections.txt index 4e3b9774d..38013042f 100644 --- a/libmount/docs/libmount-sections.txt +++ b/libmount/docs/libmount-sections.txt @@ -8,11 +8,13 @@ mnt_unref_cache mnt_cache_device_has_tag mnt_cache_find_tag_value mnt_cache_read_tags +mnt_cache_set_targets mnt_get_fstype mnt_pretty_path mnt_resolve_path mnt_resolve_spec mnt_resolve_tag +mnt_resolve_target </SECTION> <SECTION> @@ -377,6 +379,9 @@ mnt_unmangle <SECTION> <FILE>version-utils</FILE> +LIBMOUNT_MAJOR_VERSION +LIBMOUNT_MINOR_VERSION +LIBMOUNT_PATCH_VERSION mnt_parse_version_string mnt_get_library_version mnt_get_library_features @@ -393,7 +398,7 @@ mnt_monitor_enable_userspace mnt_monitor_enable_kernel mnt_monitor_get_fd mnt_monitor_close_fd -mnt_monitor_next_changed +mnt_monitor_next_change mnt_monitor_event_cleanup mnt_monitor_wait </SECTION> diff --git a/libmount/src/cache.c b/libmount/src/cache.c index fcd84fde7..1f940cc73 100644 --- a/libmount/src/cache.c +++ b/libmount/src/cache.c @@ -563,7 +563,7 @@ char *mnt_resolve_path(const char *path, struct libmnt_cache *cache) * Like mnt_resolve_path(), unless @cache is not NULL and * mnt_cache_set_targets(cache, mtab) was called: if @path is found in the * cached @mtab and the matching entry was provided by the kernel, assume that - * @path is already canonicalized. By avoiding a call to canonicalize_path() on + * @path is already canonicalized. By avoiding a call to realpath(2) on * known mount points, there is a lower risk of stepping on a stale mount * point, which can result in an application freeze. This is also faster in * general, as stat(2) on a mount point is slower than on a regular file. diff --git a/libmount/src/libmount.h.in b/libmount/src/libmount.h.in index 789979c44..a45e0fad7 100644 --- a/libmount/src/libmount.h.in +++ b/libmount/src/libmount.h.in @@ -554,7 +554,7 @@ extern int mnt_monitor_get_fd(struct libmnt_monitor *mn); extern int mnt_monitor_close_fd(struct libmnt_monitor *mn); extern int mnt_monitor_wait(struct libmnt_monitor *mn, int timeout); -extern int mnt_monitor_next_changed(struct libmnt_monitor *mn, +extern int mnt_monitor_next_change(struct libmnt_monitor *mn, const char **filename, int *type); extern int mnt_monitor_event_cleanup(struct libmnt_monitor *mn); diff --git a/libmount/src/libmount.sym b/libmount/src/libmount.sym index 33f55a97e..ebb596349 100644 --- a/libmount/src/libmount.sym +++ b/libmount/src/libmount.sym @@ -304,7 +304,7 @@ MOUNT_2.26 { mnt_monitor_enable_kernel; mnt_monitor_event_cleanup; mnt_monitor_get_fd; - mnt_monitor_next_changed; + mnt_monitor_next_change; mnt_monitor_wait; mnt_new_monitor; mnt_ref_monitor; diff --git a/libmount/src/monitor.c b/libmount/src/monitor.c index f0d91d931..f7323f693 100644 --- a/libmount/src/monitor.c +++ b/libmount/src/monitor.c @@ -573,7 +573,7 @@ int mnt_monitor_close_fd(struct libmnt_monitor *mn) * * The file descriptor is associated with all monitored files and it's usable * for example for epoll. You have to call mnt_monitor_event_cleanup() or - * mnt_monitor_next_changed() after each event. + * mnt_monitor_next_change() after each event. * * Returns: >=0 (fd) on success, <0 on error */ @@ -673,7 +673,7 @@ static struct monitor_entry *get_changed(struct libmnt_monitor *mn) } /** - * mnt_monitor_next_changed: + * mnt_monitor_next_change: * @mn: monitor * @filename: returns changed file (optional argument) * @type: returns MNT_MONITOR_TYPE_* (optional argument) @@ -682,7 +682,7 @@ static struct monitor_entry *get_changed(struct libmnt_monitor *mn) * * Returns: 0 on success, 1 no change, <0 on error */ -int mnt_monitor_next_changed(struct libmnt_monitor *mn, +int mnt_monitor_next_change(struct libmnt_monitor *mn, const char **filename, int *type) { @@ -846,7 +846,7 @@ int test_epoll(struct libmnt_test *ts, int argc, char *argv[]) continue; printf(" top-level FD active\n"); - while (mnt_monitor_next_changed(mn, &filename, NULL) == 0) + while (mnt_monitor_next_change(mn, &filename, NULL) == 0) printf(" %s: change detected\n", filename); } while (1); @@ -873,7 +873,7 @@ int test_wait(struct libmnt_test *ts, int argc, char *argv[]) while (mnt_monitor_wait(mn, -1) > 0) { printf("notification detected\n"); - while (mnt_monitor_next_changed(mn, &filename, NULL) == 0) + while (mnt_monitor_next_change(mn, &filename, NULL) == 0) printf(" %s: change detected\n", filename); } |