X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fcondition.h;h=1813b735a5b6c241335f26ac01607a959d69a440;hp=2a44ba681f0e3b33a0be9128e364cc05cb1403b2;hb=753e98788a9bcbd3bba2b3006672c003ae72eefa;hpb=5430f7f2bc7330f3088b894166bf3524a067e3d8

diff --git a/src/core/condition.h b/src/core/condition.h
index 2a44ba681..1813b735a 100644
--- a/src/core/condition.h
+++ b/src/core/condition.h
@@ -1,7 +1,6 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
-#ifndef fooconditionhfoo
-#define fooconditionhfoo
+#pragma once
 
 /***
   This file is part of systemd.
@@ -32,12 +31,16 @@ typedef enum ConditionType {
         CONDITION_PATH_IS_DIRECTORY,
         CONDITION_PATH_IS_SYMBOLIC_LINK,
         CONDITION_PATH_IS_MOUNT_POINT,
+        CONDITION_PATH_IS_READ_WRITE,
         CONDITION_DIRECTORY_NOT_EMPTY,
+        CONDITION_FILE_NOT_EMPTY,
         CONDITION_FILE_IS_EXECUTABLE,
         CONDITION_KERNEL_COMMAND_LINE,
         CONDITION_VIRTUALIZATION,
         CONDITION_SECURITY,
         CONDITION_CAPABILITY,
+        CONDITION_HOST,
+        CONDITION_AC_POWER,
         CONDITION_NULL,
         _CONDITION_TYPE_MAX,
         _CONDITION_TYPE_INVALID = -1
@@ -45,11 +48,14 @@ typedef enum ConditionType {
 
 typedef struct Condition {
         ConditionType type;
-        char *parameter;
 
         bool trigger:1;
         bool negate:1;
 
+        char *parameter;
+
+        int state;
+
         LIST_FIELDS(struct Condition, conditions);
 } Condition;
 
@@ -57,13 +63,10 @@ Condition* condition_new(ConditionType type, const char *parameter, bool trigger
 void condition_free(Condition *c);
 void condition_free_list(Condition *c);
 
-bool condition_test(Condition *c);
-bool condition_test_list(Condition *c);
+bool condition_test_list(const char *unit, Condition *c);
 
 void condition_dump(Condition *c, FILE *f, const char *prefix);
 void condition_dump_list(Condition *c, FILE *f, const char *prefix);
 
-const char* condition_type_to_string(ConditionType t);
-int condition_type_from_string(const char *s);
-
-#endif
+const char* condition_type_to_string(ConditionType t) _const_;
+int condition_type_from_string(const char *s) _pure_;