chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rtnl: drop "sd_" prefix from cleanup macros
[elogind.git]
/
src
/
core
/
path.h
diff --git
a/src/core/path.h
b/src/core/path.h
index efb6b5eb44fe418c5f26d522f47e914cb36ee4bd..d2e91d7d71ed51f0f8b79718b034c982ff221b06 100644
(file)
--- a/
src/core/path.h
+++ b/
src/core/path.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 foopathhfoo
-#define foopathhfoo
+#pragma once
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-9,16
+8,16
@@
Copyright 2010 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
Copyright 2010 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ under the terms of the GNU
Lesser
General Public License as published by
+ the Free Software Foundation; either version 2
.1
of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+
Lesser
General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU
Lesser
General Public License
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
@@
-47,9
+46,11
@@
typedef enum PathType {
} PathType;
typedef struct PathSpec {
} PathType;
typedef struct PathSpec {
+ Unit *unit;
+
char *path;
char *path;
-
Watch watch
;
+
sd_event_source *event_source
;
LIST_FIELDS(struct PathSpec, spec);
LIST_FIELDS(struct PathSpec, spec);
@@
-60,8
+61,8
@@
typedef struct PathSpec {
bool previous_exists;
} PathSpec;
bool previous_exists;
} PathSpec;
-int path_spec_watch(PathSpec *s,
Unit *u
);
-void path_spec_unwatch(PathSpec *s
, Unit *u
);
+int path_spec_watch(PathSpec *s,
sd_event_io_handler_t handler
);
+void path_spec_unwatch(PathSpec *s);
int path_spec_fd_event(PathSpec *s, uint32_t events);
void path_spec_done(PathSpec *s);
int path_spec_fd_event(PathSpec *s, uint32_t events);
void path_spec_done(PathSpec *s);
@@
-81,8
+82,6
@@
struct Path {
LIST_HEAD(PathSpec, specs);
LIST_HEAD(PathSpec, specs);
- UnitRef unit;
-
PathState state, deserialized_state;
bool inotify_triggered;
PathState state, deserialized_state;
bool inotify_triggered;
@@
-93,21
+92,15
@@
struct Path {
PathResult result;
};
PathResult result;
};
-void path_unit_notify(Unit *u, UnitActiveState new_state);
-
-/* Called from the mount code figure out if a mount is a dependency of
- * any of the paths of this path object */
-int path_add_one_mount_link(Path *p, Mount *m);
+void path_free_specs(Path *p);
extern const UnitVTable path_vtable;
extern const UnitVTable path_vtable;
-const char* path_state_to_string(PathState i);
-PathState path_state_from_string(const char *s);
-
-const char* path_type_to_string(PathType i);
-PathType path_type_from_string(const char *s);
+const char* path_state_to_string(PathState i) _const_;
+PathState path_state_from_string(const char *s) _pure_;
-const char* path_
result_to_string(PathResult i)
;
-Path
Result path_result_from_string(const char *s)
;
+const char* path_
type_to_string(PathType i) _const_
;
+Path
Type path_type_from_string(const char *s) _pure_
;
-#endif
+const char* path_result_to_string(PathResult i) _const_;
+PathResult path_result_from_string(const char *s) _pure_;