1.1 --- a/libfsclient/include/fsclient/file.h Sat Dec 09 01:26:55 2023 +0100
1.2 +++ b/libfsclient/include/fsclient/file.h Sat Dec 09 01:27:19 2023 +0100
1.3 @@ -29,13 +29,7 @@
1.4 #include <systypes/base.h>
1.5 #include <systypes/user.h>
1.6
1.7 -
1.8 -
1.9 -/* C compatibility types (defined in the implementation). */
1.10 -
1.11 -struct file_notifier;
1.12 -
1.13 -typedef struct file_notifier file_notifier_t;
1.14 +#include <fsclient/notify.h>
1.15
1.16
1.17
1.18 @@ -49,6 +43,10 @@
1.19
1.20 l4_cap_idx_t ref;
1.21
1.22 + /* Notification structure. */
1.23 +
1.24 + notifiable_t notifiable;
1.25 +
1.26 /* Mapped memory accessing a file region. */
1.27
1.28 char *memory;
1.29 @@ -71,10 +69,6 @@
1.30
1.31 notify_flags_t can_block;
1.32
1.33 - /* Notification structure. */
1.34 -
1.35 - notifiable_t notifiable;
1.36 -
1.37 /* Flags indicated when opening the file. */
1.38
1.39 flags_t flags;
1.40 @@ -151,14 +145,8 @@
1.41 notifiable_t *file_notifiable(file_t *file);
1.42 notify_flags_t file_notifications(file_t *file);
1.43
1.44 -void file_notify_close(file_notifier_t *notifier);
1.45 -file_notifier_t *file_notify_local(void);
1.46 -file_notifier_t *file_notify_task(void);
1.47 -
1.48 -long file_notify_subscribe(file_t *file, notify_flags_t flags, file_notifier_t *notifier);
1.49 -long file_notify_unsubscribe(file_t *file, file_notifier_t *notifier);
1.50 -long file_notify_wait_file(file_t *file, file_notifier_t *notifier);
1.51 -long file_notify_wait_files(file_t **file, file_notifier_t *notifier);
1.52 +long file_notify_wait_file(file_t *file, notifier_t *notifier);
1.53 +long file_notify_wait_files(file_t **file, notifier_t *notifier);
1.54
1.55
1.56