1.1 --- a/libfsclient/lib/src/client.cc Sat Dec 09 01:26:55 2023 +0100
1.2 +++ b/libfsclient/lib/src/client.cc Sat Dec 09 01:27:19 2023 +0100
1.3 @@ -557,23 +557,23 @@
1.4
1.5 /* Close a notifier object. */
1.6
1.7 -void client_notifier_close(file_notifier_t *notifier)
1.8 +void client_notifier_close(notifier_t *notifier)
1.9 {
1.10 - file_notify_close(notifier);
1.11 + notify_close(notifier);
1.12 }
1.13
1.14 /* Obtain a local notifier object. */
1.15
1.16 -file_notifier_t *client_notifier_local()
1.17 +notifier_t *client_notifier_local()
1.18 {
1.19 - return file_notify_local();
1.20 + return notify_get_local();
1.21 }
1.22
1.23 /* Obtain a task-wide notifier object. */
1.24
1.25 -file_notifier_t *client_notifier_task()
1.26 +notifier_t *client_notifier_task()
1.27 {
1.28 - return file_notify_task();
1.29 + return notify_get_task();
1.30 }
1.31
1.32
1.33 @@ -766,7 +766,7 @@
1.34 /* Since blocking access is used with specific file notifications, the
1.35 per-task notifier is used. */
1.36
1.37 - file_notifier_t *notifier = client_notifier_task();
1.38 + notifier_t *notifier = client_notifier_task();
1.39
1.40 if (flags)
1.41 err = client_subscribe(file, flags, notifier);
1.42 @@ -784,12 +784,12 @@
1.43
1.44 /* Subscribe from events concerning a file. */
1.45
1.46 -long client_subscribe(file_t *file, notify_flags_t flags, file_notifier_t *notifier)
1.47 +long client_subscribe(file_t *file, notify_flags_t flags, notifier_t *notifier)
1.48 {
1.49 if (!client_opened(file))
1.50 return -L4_EINVAL;
1.51
1.52 - return file_notify_subscribe(file, flags, notifier);
1.53 + return notify_subscribe(file_notifiable(file), flags, notifier);
1.54 }
1.55
1.56
1.57 @@ -808,19 +808,19 @@
1.58
1.59 /* Unsubscribe from events concerning a file. */
1.60
1.61 -long client_unsubscribe(file_t *file, file_notifier_t *notifier)
1.62 +long client_unsubscribe(file_t *file, notifier_t *notifier)
1.63 {
1.64 if (!client_opened(file))
1.65 return -L4_EINVAL;
1.66
1.67 - return file_notify_unsubscribe(file, notifier);
1.68 + return notify_unsubscribe(file_notifiable(file), notifier);
1.69 }
1.70
1.71
1.72
1.73 /* Wait for events involving a specific file. */
1.74
1.75 -long client_wait_file(file_t *file, file_notifier_t *notifier)
1.76 +long client_wait_file(file_t *file, notifier_t *notifier)
1.77 {
1.78 if (!client_opened(file))
1.79 return -L4_EINVAL;
1.80 @@ -831,7 +831,7 @@
1.81 /* Wait for events concerning files, referencing a file object if an event is
1.82 delivered. */
1.83
1.84 -long client_wait_files(file_t **file, file_notifier_t *notifier)
1.85 +long client_wait_files(file_t **file, notifier_t *notifier)
1.86 {
1.87 return file_notify_wait_files(file, notifier);
1.88 }