config_parse_set_status: put signals in the correct set

[elogind.git] / src / core / automount.h

diff --git a/src/core/automount.h b/src/core/automount.h
index 5704502ef70a3bdfb3c627740250e2e49d8e723a..60f55223897e94133d7de959fbeb76034507455d 100644 (file)
--- a/src/core/automount.h
+++ b/src/core/automount.h
@@ -1,7 +1,6 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 

-#ifndef fooautomounthfoo
-#define fooautomounthfoo
+#pragma once

 
 /***
   This file is part of systemd.
 
 /***
   This file is part of systemd.


@@ -49,11 +48,9 @@ struct Automount {
 
         char *where;
 
 
         char *where;
 

-        UnitRef mount;
-

         int pipe_fd;
         int pipe_fd;

+        sd_event_source *pipe_event_source;

         mode_t directory_mode;
         mode_t directory_mode;

-        Watch pipe_watch;

         dev_t dev_id;
 
         Set *tokens;
         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_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_;