X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fbus-internal.h;h=321070d0e5716e74c902f9f4183201ba1140f7fb;hb=0ce036ce7fa040410fda6baceaceb43989a1de0c;hp=e4ef6e64ecffecbcd84945bc19a2f8250f1b372d;hpb=751bc6ac79320bc16e63e8c1bbb713c30a3b7bc9;p=elogind.git

diff --git a/src/libsystemd-bus/bus-internal.h b/src/libsystemd-bus/bus-internal.h
index e4ef6e64e..321070d0e 100644
--- a/src/libsystemd-bus/bus-internal.h
+++ b/src/libsystemd-bus/bus-internal.h
@@ -42,7 +42,7 @@ struct reply_callback {
         sd_bus_message_handler_t callback;
         void *userdata;
         usec_t timeout;
-        uint64_t serial;
+        uint64_t cookie;
         unsigned prioq_idx;
 };
 
@@ -178,7 +178,7 @@ struct sd_bus {
         size_t windex;
         size_t wqueue_allocated;
 
-        uint64_t serial;
+        uint64_t cookie;
 
         char *unique_name;
         uint64_t unique_id;
@@ -228,7 +228,7 @@ struct sd_bus {
         char *exec_path;
         char **exec_argv;
 
-        uint64_t hello_serial;
+        uint64_t hello_cookie;
         unsigned iteration_counter;
 
         void *kdbus_buffer;
@@ -286,20 +286,20 @@ struct sd_bus {
 
 #define BUS_EXEC_ARGV_MAX 256
 
-bool interface_name_is_valid(const char *p);
-bool service_name_is_valid(const char *p);
-bool member_name_is_valid(const char *p);
-bool object_path_is_valid(const char *p);
-char *object_path_startswith(const char *a, const char *b);
+bool interface_name_is_valid(const char *p) _pure_;
+bool service_name_is_valid(const char *p) _pure_;
+bool member_name_is_valid(const char *p) _pure_;
+bool object_path_is_valid(const char *p) _pure_;
+char *object_path_startswith(const char *a, const char *b) _pure_;
 
-bool namespace_complex_pattern(const char *pattern, const char *value);
-bool path_complex_pattern(const char *pattern, const char *value);
+bool namespace_complex_pattern(const char *pattern, const char *value) _pure_;
+bool path_complex_pattern(const char *pattern, const char *value) _pure_;
 
-bool namespace_simple_pattern(const char *pattern, const char *value);
-bool path_simple_pattern(const char *pattern, const char *value);
+bool namespace_simple_pattern(const char *pattern, const char *value) _pure_;
+bool path_simple_pattern(const char *pattern, const char *value) _pure_;
 
-int bus_message_type_from_string(const char *s, uint8_t *u);
-const char *bus_message_type_to_string(uint8_t u);
+int bus_message_type_from_string(const char *s, uint8_t *u) _pure_;
+const char *bus_message_type_to_string(uint8_t u) _pure_;
 
 #define error_name_is_valid interface_name_is_valid