X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fautomount.h;h=60f55223897e94133d7de959fbeb76034507455d;hp=5704502ef70a3bdfb3c627740250e2e49d8e723a;hb=615938651d3a4fd9253b08da00db22d451a8cef8;hpb=5430f7f2bc7330f3088b894166bf3524a067e3d8

diff --git a/src/core/automount.h b/src/core/automount.h
index 5704502ef..60f552238 100644
--- a/src/core/automount.h
+++ b/src/core/automount.h
@@ -1,7 +1,6 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
-#ifndef fooautomounthfoo
-#define fooautomounthfoo
+#pragma once
 
 /***
   This file is part of systemd.
@@ -49,11 +48,9 @@ struct Automount {
 
         char *where;
 
-        UnitRef mount;
-
         int pipe_fd;
+        sd_event_source *pipe_event_source;
         mode_t directory_mode;
-        Watch pipe_watch;
         dev_t dev_id;
 
         Set *tokens;
@@ -65,12 +62,8 @@ extern const UnitVTable automount_vtable;
 
 int automount_send_ready(Automount *a, int status);
 
-int automount_add_one_mount_link(Automount *a, Mount *m);
-
-const char* automount_state_to_string(AutomountState i);
-AutomountState automount_state_from_string(const char *s);
-
-const char* automount_result_to_string(AutomountResult i);
-AutomountResult automount_result_from_string(const char *s);
+const char* automount_state_to_string(AutomountState i) _const_;
+AutomountState automount_state_from_string(const char *s) _pure_;
 
-#endif
+const char* automount_result_to_string(AutomountResult i) _const_;
+AutomountResult automount_result_from_string(const char *s) _pure_;