| cgroup-util.h | | cgroup-util.h | |
| | | | |
| skipping to change at line 92 | | skipping to change at line 92 | |
| int cg_create(const char *controller, const char *path); | | int cg_create(const char *controller, const char *path); | |
| int cg_attach(const char *controller, const char *path, pid_t pid); | | int cg_attach(const char *controller, const char *path, pid_t pid); | |
| int cg_create_and_attach(const char *controller, const char *path, pid_t pi
d); | | int cg_create_and_attach(const char *controller, const char *path, pid_t pi
d); | |
| | | | |
| int cg_set_attribute(const char *controller, const char *path, const char *
attribute, const char *value); | | int cg_set_attribute(const char *controller, const char *path, const char *
attribute, const char *value); | |
| | | | |
| int cg_set_group_access(const char *controller, const char *path, mode_t mo
de, uid_t uid, gid_t gid); | | int cg_set_group_access(const char *controller, const char *path, mode_t mo
de, uid_t uid, gid_t gid); | |
| int cg_set_task_access(const char *controller, const char *path, mode_t mod
e, uid_t uid, gid_t gid); | | int cg_set_task_access(const char *controller, const char *path, mode_t mod
e, uid_t uid, gid_t gid); | |
| | | | |
| int cg_install_release_agent(const char *controller, const char *agent); | | int cg_install_release_agent(const char *controller, const char *agent); | |
|
| | | int cg_uninstall_release_agent(const char *controller); | |
| | | | |
| int cg_is_empty(const char *controller, const char *path, bool ignore_self)
; | | int cg_is_empty(const char *controller, const char *path, bool ignore_self)
; | |
| int cg_is_empty_by_spec(const char *spec, bool ignore_self); | | int cg_is_empty_by_spec(const char *spec, bool ignore_self); | |
| int cg_is_empty_recursive(const char *controller, const char *path, bool ig
nore_self); | | int cg_is_empty_recursive(const char *controller, const char *path, bool ig
nore_self); | |
| | | | |
| int cg_get_root_path(char **path); | | int cg_get_root_path(char **path); | |
| | | | |
| int cg_path_get_session(const char *path, char **session); | | int cg_path_get_session(const char *path, char **session); | |
| int cg_path_get_owner_uid(const char *path, uid_t *uid); | | int cg_path_get_owner_uid(const char *path, uid_t *uid); | |
| int cg_path_get_unit(const char *path, char **unit); | | int cg_path_get_unit(const char *path, char **unit); | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 1 lines changed or added | |
|
| condition.h | | condition.h | |
| | | | |
| skipping to change at line 51 | | skipping to change at line 51 | |
| CONDITION_CAPABILITY, | | CONDITION_CAPABILITY, | |
| CONDITION_HOST, | | CONDITION_HOST, | |
| CONDITION_AC_POWER, | | CONDITION_AC_POWER, | |
| CONDITION_NULL, | | CONDITION_NULL, | |
| _CONDITION_TYPE_MAX, | | _CONDITION_TYPE_MAX, | |
| _CONDITION_TYPE_INVALID = -1 | | _CONDITION_TYPE_INVALID = -1 | |
| } ConditionType; | | } ConditionType; | |
| | | | |
| typedef struct Condition { | | typedef struct Condition { | |
| ConditionType type; | | ConditionType type; | |
|
| char *parameter; | | | |
| | | | |
| bool trigger:1; | | bool trigger:1; | |
| bool negate:1; | | bool negate:1; | |
| | | | |
|
| | | char *parameter; | |
| | | | |
| | | int state; | |
| | | | |
| LIST_FIELDS(struct Condition, conditions); | | LIST_FIELDS(struct Condition, conditions); | |
| } Condition; | | } Condition; | |
| | | | |
| Condition* condition_new(ConditionType type, const char *parameter, bool tr
igger, bool negate); | | Condition* condition_new(ConditionType type, const char *parameter, bool tr
igger, bool negate); | |
| void condition_free(Condition *c); | | void condition_free(Condition *c); | |
| void condition_free_list(Condition *c); | | void condition_free_list(Condition *c); | |
| | | | |
|
| bool condition_test(Condition *c); | | bool condition_test_list(const char *unit, Condition *c); | |
| bool condition_test_list(Condition *c); | | | |
| | | | |
| void condition_dump(Condition *c, FILE *f, const char *prefix); | | void condition_dump(Condition *c, FILE *f, const char *prefix); | |
| void condition_dump_list(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) _const_; | | const char* condition_type_to_string(ConditionType t) _const_; | |
| int condition_type_from_string(const char *s) _pure_; | | int condition_type_from_string(const char *s) _pure_; | |
| | | | |
End of changes. 3 change blocks. |
| 3 lines changed or deleted | | 5 lines changed or added | |
|
| config.h | | config.h | |
| | | | |
| skipping to change at line 89 | | skipping to change at line 89 | |
| /* Define if IMA is available */ | | /* Define if IMA is available */ | |
| #define HAVE_IMA 1 | | #define HAVE_IMA 1 | |
| | | | |
| /* Define to 1 if you have the `inet_ntoa' function. */ | | /* Define to 1 if you have the `inet_ntoa' function. */ | |
| #define HAVE_INET_NTOA 1 | | #define HAVE_INET_NTOA 1 | |
| | | | |
| /* Define to 1 if you have the <inttypes.h> header file. */ | | /* Define to 1 if you have the <inttypes.h> header file. */ | |
| #define HAVE_INTTYPES_H 1 | | #define HAVE_INTTYPES_H 1 | |
| | | | |
| /* Define if kmod is available */ | | /* Define if kmod is available */ | |
|
| /* #undef HAVE_KMOD */ | | #define HAVE_KMOD 1 | |
| | | | |
| /* Define to 1 if you have the <libaudit.h> header file. */ | | /* Define to 1 if you have the <libaudit.h> header file. */ | |
| #define HAVE_LIBAUDIT_H 1 | | #define HAVE_LIBAUDIT_H 1 | |
| | | | |
| /* Define if libcryptsetup is available */ | | /* Define if libcryptsetup is available */ | |
| /* #undef HAVE_LIBCRYPTSETUP */ | | /* #undef HAVE_LIBCRYPTSETUP */ | |
| | | | |
| /* Have tcpwrap? */ | | /* Have tcpwrap? */ | |
| #define HAVE_LIBWRAP /**/ | | #define HAVE_LIBWRAP /**/ | |
| | | | |
| | | | |
| skipping to change at line 256 | | skipping to change at line 256 | |
| /* Name of package */ | | /* Name of package */ | |
| #define PACKAGE "systemd" | | #define PACKAGE "systemd" | |
| | | | |
| /* Define to the address where bug reports for this package should be sent.
*/ | | /* Define to the address where bug reports for this package should be sent.
*/ | |
| #define PACKAGE_BUGREPORT "http://bugs.freedesktop.org/enter_bug.cgi?produc
t=systemd" | | #define PACKAGE_BUGREPORT "http://bugs.freedesktop.org/enter_bug.cgi?produc
t=systemd" | |
| | | | |
| /* Define to the full name of this package. */ | | /* Define to the full name of this package. */ | |
| #define PACKAGE_NAME "systemd" | | #define PACKAGE_NAME "systemd" | |
| | | | |
| /* Define to the full name and version of this package. */ | | /* Define to the full name and version of this package. */ | |
|
| #define PACKAGE_STRING "systemd 205" | | #define PACKAGE_STRING "systemd 206" | |
| | | | |
| /* Define to the one symbol short name of this package. */ | | /* Define to the one symbol short name of this package. */ | |
| #define PACKAGE_TARNAME "systemd" | | #define PACKAGE_TARNAME "systemd" | |
| | | | |
| /* Define to the home page for this package. */ | | /* Define to the home page for this package. */ | |
| #define PACKAGE_URL "http://www.freedesktop.org/wiki/Software/systemd" | | #define PACKAGE_URL "http://www.freedesktop.org/wiki/Software/systemd" | |
| | | | |
| /* Define to the version of this package. */ | | /* Define to the version of this package. */ | |
|
| #define PACKAGE_VERSION "205" | | #define PACKAGE_VERSION "206" | |
| | | | |
| /* Path of /etc/rc.local script */ | | /* Path of /etc/rc.local script */ | |
| #define RC_LOCAL_SCRIPT_PATH_START "/etc/rc.local" | | #define RC_LOCAL_SCRIPT_PATH_START "/etc/rc.local" | |
| | | | |
| /* Path of /usr/sbin/halt.local script */ | | /* Path of /usr/sbin/halt.local script */ | |
| #define RC_LOCAL_SCRIPT_PATH_STOP "/usr/sbin/halt.local" | | #define RC_LOCAL_SCRIPT_PATH_STOP "/usr/sbin/halt.local" | |
| | | | |
| /* Define to the type of arg 1 for `select'. */ | | /* Define to the type of arg 1 for `select'. */ | |
| #define SELECT_TYPE_ARG1 int | | #define SELECT_TYPE_ARG1 int | |
| | | | |
| | | | |
| skipping to change at line 316 | | skipping to change at line 316 | |
| /* Enable extensions on HP NonStop. */ | | /* Enable extensions on HP NonStop. */ | |
| #ifndef _TANDEM_SOURCE | | #ifndef _TANDEM_SOURCE | |
| # define _TANDEM_SOURCE 1 | | # define _TANDEM_SOURCE 1 | |
| #endif | | #endif | |
| /* Enable general extensions on Solaris. */ | | /* Enable general extensions on Solaris. */ | |
| #ifndef __EXTENSIONS__ | | #ifndef __EXTENSIONS__ | |
| # define __EXTENSIONS__ 1 | | # define __EXTENSIONS__ 1 | |
| #endif | | #endif | |
| | | | |
| /* Version number of package */ | | /* Version number of package */ | |
|
| #define VERSION "205" | | #define VERSION "206" | |
| | | | |
| /* Enable large inode numbers on Mac OS X 10.5. */ | | /* Enable large inode numbers on Mac OS X 10.5. */ | |
| #ifndef _DARWIN_USE_64_BIT_INODE | | #ifndef _DARWIN_USE_64_BIT_INODE | |
| # define _DARWIN_USE_64_BIT_INODE 1 | | # define _DARWIN_USE_64_BIT_INODE 1 | |
| #endif | | #endif | |
| | | | |
| /* Number of bits in a file offset, on hosts where this is settable. */ | | /* Number of bits in a file offset, on hosts where this is settable. */ | |
| #define _FILE_OFFSET_BITS 64 | | #define _FILE_OFFSET_BITS 64 | |
| | | | |
| /* Define for large files, on AIX-style hosts. */ | | /* Define for large files, on AIX-style hosts. */ | |
| | | | |
End of changes. 4 change blocks. |
| 4 lines changed or deleted | | 4 lines changed or added | |
|
| dbus-unit.h | | dbus-unit.h | |
| | | | |
| skipping to change at line 128 | | skipping to change at line 128 | |
| " <property name=\"AllowIsolate\" type=\"b\" access=\"read\"/>\n"
\ | | " <property name=\"AllowIsolate\" type=\"b\" access=\"read\"/>\n"
\ | |
| " <property name=\"DefaultDependencies\" type=\"b\" access=\"read\
"/>\n" \ | | " <property name=\"DefaultDependencies\" type=\"b\" access=\"read\
"/>\n" \ | |
| " <property name=\"OnFailureIsolate\" type=\"b\" access=\"read\"/>
\n" \ | | " <property name=\"OnFailureIsolate\" type=\"b\" access=\"read\"/>
\n" \ | |
| " <property name=\"IgnoreOnIsolate\" type=\"b\" access=\"read\"/>\
n" \ | | " <property name=\"IgnoreOnIsolate\" type=\"b\" access=\"read\"/>\
n" \ | |
| " <property name=\"IgnoreOnSnapshot\" type=\"b\" access=\"read\"/>
\n" \ | | " <property name=\"IgnoreOnSnapshot\" type=\"b\" access=\"read\"/>
\n" \ | |
| " <property name=\"NeedDaemonReload\" type=\"b\" access=\"read\"/>
\n" \ | | " <property name=\"NeedDaemonReload\" type=\"b\" access=\"read\"/>
\n" \ | |
| " <property name=\"JobTimeoutUSec\" type=\"t\" access=\"read\"/>\n
" \ | | " <property name=\"JobTimeoutUSec\" type=\"t\" access=\"read\"/>\n
" \ | |
| " <property name=\"ConditionTimestamp\" type=\"t\" access=\"read\"
/>\n" \ | | " <property name=\"ConditionTimestamp\" type=\"t\" access=\"read\"
/>\n" \ | |
| " <property name=\"ConditionTimestampMonotonic\" type=\"t\" access
=\"read\"/>\n" \ | | " <property name=\"ConditionTimestampMonotonic\" type=\"t\" access
=\"read\"/>\n" \ | |
| " <property name=\"ConditionResult\" type=\"b\" access=\"read\"/>\
n" \ | | " <property name=\"ConditionResult\" type=\"b\" access=\"read\"/>\
n" \ | |
|
| | | " <property name=\"Conditions\" type=\"a(sbbsi)\" access=\"read\"/
>\n" \ | |
| " <property name=\"LoadError\" type=\"(ss)\" access=\"read\"/>\n"
\ | | " <property name=\"LoadError\" type=\"(ss)\" access=\"read\"/>\n"
\ | |
| " <property name=\"Transient\" type=\"b\" access=\"read\"/>\n" \ | | " <property name=\"Transient\" type=\"b\" access=\"read\"/>\n" \ | |
| " </interface>\n" | | " </interface>\n" | |
| | | | |
| #define BUS_UNIT_CGROUP_INTERFACE \ | | #define BUS_UNIT_CGROUP_INTERFACE \ | |
| " <property name=\"Slice\" type=\"s\" access=\"read\"/>\n" \ | | " <property name=\"Slice\" type=\"s\" access=\"read\"/>\n" \ | |
| " <property name=\"ControlGroup\" type=\"s\" access=\"read\"/>\n" | | " <property name=\"ControlGroup\" type=\"s\" access=\"read\"/>\n" | |
| | | | |
| #define BUS_UNIT_INTERFACES_LIST \ | | #define BUS_UNIT_INTERFACES_LIST \ | |
| BUS_GENERIC_INTERFACES_LIST \ | | BUS_GENERIC_INTERFACES_LIST \ | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 1 lines changed or added | |
|
| dbus.h | | dbus.h | |
| | | | |
| skipping to change at line 46 | | skipping to change at line 46 | |
| int bus_query_pid(Manager *m, const char *name); | | int bus_query_pid(Manager *m, const char *name); | |
| | | | |
| int bus_broadcast(Manager *m, DBusMessage *message); | | int bus_broadcast(Manager *m, DBusMessage *message); | |
| | | | |
| bool bus_has_subscriber(Manager *m); | | bool bus_has_subscriber(Manager *m); | |
| bool bus_connection_has_subscriber(Manager *m, DBusConnection *c); | | bool bus_connection_has_subscriber(Manager *m, DBusConnection *c); | |
| | | | |
| int bus_fdset_add_all(Manager *m, FDSet *fds); | | int bus_fdset_add_all(Manager *m, FDSet *fds); | |
| | | | |
| void bus_broadcast_finished(Manager *m, usec_t firmware_usec, usec_t loader
_usec, usec_t kernel_usec, usec_t initrd_usec, usec_t userspace_usec, usec_
t total_usec); | | void bus_broadcast_finished(Manager *m, usec_t firmware_usec, usec_t loader
_usec, usec_t kernel_usec, usec_t initrd_usec, usec_t userspace_usec, usec_
t total_usec); | |
|
| | | void bus_broadcast_reloading(Manager *m, bool active); | |
| | | | |
| | | Set *bus_acquire_subscribed(Manager *m, DBusConnection *c); | |
| | | | |
| | | void bus_serialize(Manager *m, FILE *f); | |
| | | int bus_deserialize_item(Manager *m, const char *line); | |
| | | | |
| #define BUS_CONNECTION_SUBSCRIBED(m, c) dbus_connection_get_data((c), (m)->
subscribed_data_slot) | | #define BUS_CONNECTION_SUBSCRIBED(m, c) dbus_connection_get_data((c), (m)->
subscribed_data_slot) | |
| #define BUS_PENDING_CALL_NAME(m, p) dbus_pending_call_get_data((p), (m)->na
me_data_slot) | | #define BUS_PENDING_CALL_NAME(m, p) dbus_pending_call_get_data((p), (m)->na
me_data_slot) | |
| | | | |
| extern const char * const bus_interface_table[]; | | extern const char * const bus_interface_table[]; | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 6 lines changed or added | |
|
| journal-internal.h | | journal-internal.h | |
| | | | |
| skipping to change at line 100 | | skipping to change at line 100 | |
| uint64_t xor_hash; | | uint64_t xor_hash; | |
| }; | | }; | |
| | | | |
| struct Directory { | | struct Directory { | |
| char *path; | | char *path; | |
| int wd; | | int wd; | |
| bool is_root; | | bool is_root; | |
| }; | | }; | |
| | | | |
| struct sd_journal { | | struct sd_journal { | |
|
| int flags; | | | |
| | | | |
| char *path; | | char *path; | |
| | | | |
| Hashmap *files; | | Hashmap *files; | |
| MMapCache *mmap; | | MMapCache *mmap; | |
| | | | |
| Location current_location; | | Location current_location; | |
| | | | |
| JournalFile *current_file; | | JournalFile *current_file; | |
| uint64_t current_field; | | uint64_t current_field; | |
| | | | |
|
| Hashmap *directories_by_path; | | | |
| Hashmap *directories_by_wd; | | | |
| | | | |
| int inotify_fd; | | | |
| | | | |
| Match *level0, *level1, *level2; | | Match *level0, *level1, *level2; | |
| | | | |
|
| | | pid_t original_pid; | |
| | | | |
| | | int inotify_fd; | |
| unsigned current_invalidate_counter, last_invalidate_counter; | | unsigned current_invalidate_counter, last_invalidate_counter; | |
|
| | | usec_t last_process_usec; | |
| | | | |
| char *unique_field; | | char *unique_field; | |
| JournalFile *unique_file; | | JournalFile *unique_file; | |
| uint64_t unique_offset; | | uint64_t unique_offset; | |
| | | | |
|
| | | int flags; | |
| | | | |
| bool on_network; | | bool on_network; | |
| bool no_new_files; | | bool no_new_files; | |
| | | | |
| size_t data_threshold; | | size_t data_threshold; | |
| | | | |
|
| Set *errors; | | Hashmap *directories_by_path; | |
| | | Hashmap *directories_by_wd; | |
| | | | |
|
| usec_t last_process_usec; | | Set *errors; | |
| }; | | }; | |
| | | | |
| char *journal_make_match_string(sd_journal *j); | | char *journal_make_match_string(sd_journal *j); | |
| void journal_print_header(sd_journal *j); | | void journal_print_header(sd_journal *j); | |
| | | | |
| static inline void journal_closep(sd_journal **j) { | | static inline void journal_closep(sd_journal **j) { | |
| sd_journal_close(*j); | | sd_journal_close(*j); | |
| } | | } | |
| | | | |
| #define _cleanup_journal_close_ _cleanup_(journal_closep) | | #define _cleanup_journal_close_ _cleanup_(journal_closep) | |
| | | | |
End of changes. 7 change blocks. |
| 9 lines changed or deleted | | 9 lines changed or added | |
|
| journald-server.h | | journald-server.h | |
| | | | |
| skipping to change at line 128 | | skipping to change at line 128 | |
| bool dev_kmsg_readable; | | bool dev_kmsg_readable; | |
| | | | |
| uint64_t *kernel_seqnum; | | uint64_t *kernel_seqnum; | |
| | | | |
| struct udev *udev; | | struct udev *udev; | |
| | | | |
| int sync_timer_fd; | | int sync_timer_fd; | |
| bool sync_scheduled; | | bool sync_scheduled; | |
| } Server; | | } Server; | |
| | | | |
|
| #define N_IOVEC_META_FIELDS 17 | | #define N_IOVEC_META_FIELDS 19 | |
| #define N_IOVEC_KERNEL_FIELDS 64 | | #define N_IOVEC_KERNEL_FIELDS 64 | |
| #define N_IOVEC_UDEV_FIELDS 32 | | #define N_IOVEC_UDEV_FIELDS 32 | |
| #define N_IOVEC_OBJECT_FIELDS 11 | | #define N_IOVEC_OBJECT_FIELDS 11 | |
| | | | |
| void server_dispatch_message(Server *s, struct iovec *iovec, unsigned n, un
signed m, struct ucred *ucred, struct timeval *tv, const char *label, size_
t label_len, const char *unit_id, int priority, pid_t object_pid); | | void server_dispatch_message(Server *s, struct iovec *iovec, unsigned n, un
signed m, struct ucred *ucred, struct timeval *tv, const char *label, size_
t label_len, const char *unit_id, int priority, pid_t object_pid); | |
| void server_driver_message(Server *s, sd_id128_t message_id, const char *fo
rmat, ...) _printf_attr_(3,4); | | void server_driver_message(Server *s, sd_id128_t message_id, const char *fo
rmat, ...) _printf_attr_(3,4); | |
| | | | |
| /* gperf lookup function */ | | /* gperf lookup function */ | |
| const struct ConfigPerfItem* journald_gperf_lookup(const char *key, unsigne
d length); | | const struct ConfigPerfItem* journald_gperf_lookup(const char *key, unsigne
d length); | |
| | | | |
| | | | |
End of changes. 1 change blocks. |
| 1 lines changed or deleted | | 1 lines changed or added | |
|
| kdbus.h | | kdbus.h | |
| | | | |
| skipping to change at line 286 | | skipping to change at line 286 | |
| enum { | | enum { | |
| KDBUS_MAKE_ACCESS_GROUP = 1 << 0, | | KDBUS_MAKE_ACCESS_GROUP = 1 << 0, | |
| KDBUS_MAKE_ACCESS_WORLD = 1 << 1, | | KDBUS_MAKE_ACCESS_WORLD = 1 << 1, | |
| KDBUS_MAKE_POLICY_OPEN = 1 << 2, | | KDBUS_MAKE_POLICY_OPEN = 1 << 2, | |
| }; | | }; | |
| | | | |
| /* Items to append to kdbus_cmd_{bus,ep,ns}_make */ | | /* Items to append to kdbus_cmd_{bus,ep,ns}_make */ | |
| enum { | | enum { | |
| _KDBUS_MAKE_NULL, | | _KDBUS_MAKE_NULL, | |
| KDBUS_MAKE_NAME, | | KDBUS_MAKE_NAME, | |
|
| KDBUS_MAKE_CGROUP, /* the cgroup hierarchy ID for which to atta | | | |
| ch | | | |
| * cgroup membership paths to messages. | | | |
| * FIXME: remove, use *the* hierarchy */ | | | |
| KDBUS_MAKE_CRED, /* allow translator services which connect | | KDBUS_MAKE_CRED, /* allow translator services which connect | |
| * to the bus on behalf of somebody else, | | * to the bus on behalf of somebody else, | |
| * allow specifiying the credentials of the | | * allow specifiying the credentials of the | |
| * client to connect on behalf on. Needs | | * client to connect on behalf on. Needs | |
| * privileges */ | | * privileges */ | |
| }; | | }; | |
| | | | |
| struct kdbus_cmd_bus_make { | | struct kdbus_cmd_bus_make { | |
| __u64 size; | | __u64 size; | |
| __u64 flags; /* userspace → kernel, kernel → userspace | | __u64 flags; /* userspace → kernel, kernel → userspace | |
| | | | |
End of changes. 1 change blocks. |
| 4 lines changed or deleted | | 0 lines changed or added | |
|
| load-fragment.h | | load-fragment.h | |
| | | | |
| skipping to change at line 84 | | skipping to change at line 84 | |
| int config_parse_start_limit_action(const char *unit, const char *filename,
unsigned line, const char *section, const char *lvalue, int ltype, const c
har *rvalue, void *data, void *userdata); | | int config_parse_start_limit_action(const char *unit, const char *filename,
unsigned line, const char *section, const char *lvalue, int ltype, const c
har *rvalue, void *data, void *userdata); | |
| int config_parse_unit_requires_mounts_for(const char *unit, const char *fil
ename, unsigned line, const char *section, const char *lvalue, int ltype, c
onst char *rvalue, void *data, void *userdata); | | int config_parse_unit_requires_mounts_for(const char *unit, const char *fil
ename, unsigned line, const char *section, const char *lvalue, int ltype, c
onst char *rvalue, void *data, void *userdata); | |
| int config_parse_syscall_filter(const char *unit, const char *filename, uns
igned line, const char *section, const char *lvalue, int ltype, const char
*rvalue, void *data, void *userdata); | | int config_parse_syscall_filter(const char *unit, const char *filename, uns
igned line, const char *section, const char *lvalue, int ltype, const char
*rvalue, void *data, void *userdata); | |
| int config_parse_environ(const char *unit, const char *filename, unsigned l
ine, const char *section, const char *lvalue, int ltype, const char *rvalue
, void *data, void *userdata); | | int config_parse_environ(const char *unit, const char *filename, unsigned l
ine, const char *section, const char *lvalue, int ltype, const char *rvalue
, void *data, void *userdata); | |
| int config_parse_unit_slice(const char *unit, const char *filename, unsigne
d line, const char *section, const char *lvalue, int ltype, const char *rva
lue, void *data, void *userdata); | | int config_parse_unit_slice(const char *unit, const char *filename, unsigne
d line, const char *section, const char *lvalue, int ltype, const char *rva
lue, void *data, void *userdata); | |
| int config_parse_cpu_shares(const char *unit, const char *filename, unsigne
d line, const char *section, const char *lvalue, int ltype, const char *rva
lue, void *data, void *userdata); | | int config_parse_cpu_shares(const char *unit, const char *filename, unsigne
d line, const char *section, const char *lvalue, int ltype, const char *rva
lue, void *data, void *userdata); | |
| int config_parse_memory_limit(const char *unit, const char *filename, unsig
ned line, const char *section, const char *lvalue, int ltype, const char *r
value, void *data, void *userdata); | | int config_parse_memory_limit(const char *unit, const char *filename, unsig
ned line, const char *section, const char *lvalue, int ltype, const char *r
value, void *data, void *userdata); | |
| int config_parse_device_policy(const char *unit, const char *filename, unsi
gned line, const char *section, const char *lvalue, int ltype, const char *
rvalue, void *data, void *userdata); | | int config_parse_device_policy(const char *unit, const char *filename, unsi
gned line, const char *section, const char *lvalue, int ltype, const char *
rvalue, void *data, void *userdata); | |
| int config_parse_device_allow(const char *unit, const char *filename, unsig
ned line, const char *section, const char *lvalue, int ltype, const char *r
value, void *data, void *userdata); | | int config_parse_device_allow(const char *unit, const char *filename, unsig
ned line, const char *section, const char *lvalue, int ltype, const char *r
value, void *data, void *userdata); | |
| int config_parse_blockio_weight(const char *unit, const char *filename, uns
igned line, const char *section, const char *lvalue, int ltype, const char
*rvalue, void *data, void *userdata); | | int config_parse_blockio_weight(const char *unit, const char *filename, uns
igned line, const char *section, const char *lvalue, int ltype, const char
*rvalue, void *data, void *userdata); | |
|
| | | int config_parse_blockio_device_weight(const char *unit, const char *filena
me, unsigned line, const char *section, const char *lvalue, int ltype, cons
t char *rvalue, void *data, void *userdata); | |
| int config_parse_blockio_bandwidth(const char *unit, const char *filename,
unsigned line, const char *section, const char *lvalue, int ltype, const ch
ar *rvalue, void *data, void *userdata); | | int config_parse_blockio_bandwidth(const char *unit, const char *filename,
unsigned line, const char *section, const char *lvalue, int ltype, const ch
ar *rvalue, void *data, void *userdata); | |
| | | | |
| /* gperf prototypes */ | | /* gperf prototypes */ | |
| const struct ConfigPerfItem* load_fragment_gperf_lookup(const char *key, un
signed length); | | const struct ConfigPerfItem* load_fragment_gperf_lookup(const char *key, un
signed length); | |
| extern const char load_fragment_gperf_nulstr[]; | | extern const char load_fragment_gperf_nulstr[]; | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 1 lines changed or added | |
|
| logind.h | | logind.h | |
| | | | |
| skipping to change at line 181 | | skipping to change at line 181 | |
| extern const DBusObjectPathVTable bus_manager_vtable; | | extern const DBusObjectPathVTable bus_manager_vtable; | |
| | | | |
| DBusHandlerResult bus_message_filter(DBusConnection *c, DBusMessage *messag
e, void *userdata); | | DBusHandlerResult bus_message_filter(DBusConnection *c, DBusMessage *messag
e, void *userdata); | |
| | | | |
| int bus_manager_shutdown_or_sleep_now_or_later(Manager *m, const char *unit
_name, InhibitWhat w, DBusError *error); | | int bus_manager_shutdown_or_sleep_now_or_later(Manager *m, const char *unit
_name, InhibitWhat w, DBusError *error); | |
| | | | |
| int manager_send_changed(Manager *manager, const char *properties); | | int manager_send_changed(Manager *manager, const char *properties); | |
| | | | |
| int manager_dispatch_delayed(Manager *manager); | | int manager_dispatch_delayed(Manager *manager); | |
| | | | |
|
| int manager_start_scope(Manager *manager, const char *scope, pid_t pid, con
st char *slice, const char *description, DBusError *error, char **job); | | int manager_start_scope(Manager *manager, const char *scope, pid_t pid, con
st char *slice, const char *description, const char *after, DBusError *erro
r, char **job); | |
| int manager_start_unit(Manager *manager, const char *unit, DBusError *error
, char **job); | | int manager_start_unit(Manager *manager, const char *unit, DBusError *error
, char **job); | |
| int manager_stop_unit(Manager *manager, const char *unit, DBusError *error,
char **job); | | int manager_stop_unit(Manager *manager, const char *unit, DBusError *error,
char **job); | |
| int manager_kill_unit(Manager *manager, const char *unit, KillWho who, int
signo, DBusError *error); | | int manager_kill_unit(Manager *manager, const char *unit, KillWho who, int
signo, DBusError *error); | |
| int manager_unit_is_active(Manager *manager, const char *unit); | | int manager_unit_is_active(Manager *manager, const char *unit); | |
| | | | |
| /* gperf lookup function */ | | /* gperf lookup function */ | |
| const struct ConfigPerfItem* logind_gperf_lookup(const char *key, unsigned
length); | | const struct ConfigPerfItem* logind_gperf_lookup(const char *key, unsigned
length); | |
| | | | |
End of changes. 1 change blocks. |
| 1 lines changed or deleted | | 1 lines changed or added | |
|
| machine.h | | machine.h | |
| | | | |
| skipping to change at line 85 | | skipping to change at line 85 | |
| | | | |
| DBusMessage *create_message; | | DBusMessage *create_message; | |
| | | | |
| LIST_FIELDS(Machine, gc_queue); | | LIST_FIELDS(Machine, gc_queue); | |
| }; | | }; | |
| | | | |
| Machine* machine_new(Manager *manager, const char *name); | | Machine* machine_new(Manager *manager, const char *name); | |
| void machine_free(Machine *m); | | void machine_free(Machine *m); | |
| int machine_check_gc(Machine *m, bool drop_not_started); | | int machine_check_gc(Machine *m, bool drop_not_started); | |
| void machine_add_to_gc_queue(Machine *m); | | void machine_add_to_gc_queue(Machine *m); | |
|
| int machine_start(Machine *m); | | int machine_start(Machine *m, DBusMessageIter *iter); | |
| int machine_stop(Machine *m); | | int machine_stop(Machine *m); | |
| int machine_save(Machine *m); | | int machine_save(Machine *m); | |
| int machine_load(Machine *m); | | int machine_load(Machine *m); | |
| int machine_kill(Machine *m, KillWho who, int signo); | | int machine_kill(Machine *m, KillWho who, int signo); | |
| | | | |
| char *machine_bus_path(Machine *s); | | char *machine_bus_path(Machine *s); | |
| | | | |
| MachineState machine_get_state(Machine *u); | | MachineState machine_get_state(Machine *u); | |
| | | | |
| extern const DBusObjectPathVTable bus_machine_vtable; | | extern const DBusObjectPathVTable bus_machine_vtable; | |
| | | | |
End of changes. 1 change blocks. |
| 1 lines changed or deleted | | 1 lines changed or added | |
|
| machined.h | | machined.h | |
| | | | |
| skipping to change at line 70 | | skipping to change at line 70 | |
| int manager_run(Manager *m); | | int manager_run(Manager *m); | |
| | | | |
| void manager_gc(Manager *m, bool drop_not_started); | | void manager_gc(Manager *m, bool drop_not_started); | |
| | | | |
| int manager_get_machine_by_pid(Manager *m, pid_t pid, Machine **machine); | | int manager_get_machine_by_pid(Manager *m, pid_t pid, Machine **machine); | |
| | | | |
| extern const DBusObjectPathVTable bus_manager_vtable; | | extern const DBusObjectPathVTable bus_manager_vtable; | |
| | | | |
| DBusHandlerResult bus_message_filter(DBusConnection *c, DBusMessage *messag
e, void *userdata); | | DBusHandlerResult bus_message_filter(DBusConnection *c, DBusMessage *messag
e, void *userdata); | |
| | | | |
|
| int manager_start_scope(Manager *manager, const char *scope, pid_t pid, con
st char *slice, const char *description, DBusError *error, char **job); | | int manager_start_scope(Manager *manager, const char *scope, pid_t pid, con
st char *slice, const char *description, DBusMessageIter *more_properties,
DBusError *error, char **job); | |
| int manager_stop_unit(Manager *manager, const char *unit, DBusError *error,
char **job); | | int manager_stop_unit(Manager *manager, const char *unit, DBusError *error,
char **job); | |
| int manager_kill_unit(Manager *manager, const char *unit, KillWho who, int
signo, DBusError *error); | | int manager_kill_unit(Manager *manager, const char *unit, KillWho who, int
signo, DBusError *error); | |
| int manager_unit_is_active(Manager *manager, const char *unit); | | int manager_unit_is_active(Manager *manager, const char *unit); | |
| | | | |
End of changes. 1 change blocks. |
| 1 lines changed or deleted | | 1 lines changed or added | |
|
| manager.h | | manager.h | |
| | | | |
| skipping to change at line 66 | | skipping to change at line 66 | |
| WATCH_NOTIFY, | | WATCH_NOTIFY, | |
| WATCH_FD, | | WATCH_FD, | |
| WATCH_UNIT_TIMER, | | WATCH_UNIT_TIMER, | |
| WATCH_JOB_TIMER, | | WATCH_JOB_TIMER, | |
| WATCH_MOUNT, | | WATCH_MOUNT, | |
| WATCH_SWAP, | | WATCH_SWAP, | |
| WATCH_UDEV, | | WATCH_UDEV, | |
| WATCH_DBUS_WATCH, | | WATCH_DBUS_WATCH, | |
| WATCH_DBUS_TIMEOUT, | | WATCH_DBUS_TIMEOUT, | |
| WATCH_TIME_CHANGE, | | WATCH_TIME_CHANGE, | |
|
| WATCH_JOBS_IN_PROGRESS | | WATCH_JOBS_IN_PROGRESS, | |
| | | WATCH_IDLE_PIPE, | |
| }; | | }; | |
| | | | |
| struct Watch { | | struct Watch { | |
| int fd; | | int fd; | |
| WatchType type; | | WatchType type; | |
| union { | | union { | |
| struct Unit *unit; | | struct Unit *unit; | |
| struct Job *job; | | struct Job *job; | |
| DBusWatch *bus_watch; | | DBusWatch *bus_watch; | |
| DBusTimeout *bus_timeout; | | DBusTimeout *bus_timeout; | |
| | | | |
| skipping to change at line 138 | | skipping to change at line 139 | |
| LIST_HEAD(Unit, cgroup_queue); | | LIST_HEAD(Unit, cgroup_queue); | |
| | | | |
| Hashmap *watch_pids; /* pid => Unit object n:1 */ | | Hashmap *watch_pids; /* pid => Unit object n:1 */ | |
| | | | |
| char *notify_socket; | | char *notify_socket; | |
| | | | |
| Watch notify_watch; | | Watch notify_watch; | |
| Watch signal_watch; | | Watch signal_watch; | |
| Watch time_change_watch; | | Watch time_change_watch; | |
| Watch jobs_in_progress_watch; | | Watch jobs_in_progress_watch; | |
|
| | | Watch idle_pipe_watch; | |
| | | | |
| int epoll_fd; | | int epoll_fd; | |
| | | | |
| unsigned n_snapshots; | | unsigned n_snapshots; | |
| | | | |
| LookupPaths lookup_paths; | | LookupPaths lookup_paths; | |
| Set *unit_path_cache; | | Set *unit_path_cache; | |
| | | | |
| char **environment; | | char **environment; | |
| | | | |
| | | | |
| skipping to change at line 198 | | skipping to change at line 200 | |
| * before the reload we queue the | | * before the reload we queue the | |
| * reply message here, and | | * reply message here, and | |
| * afterwards we send it */ | | * afterwards we send it */ | |
| DBusConnection *queued_message_connection; /* The connection to sen
d the queued message on */ | | DBusConnection *queued_message_connection; /* The connection to sen
d the queued message on */ | |
| | | | |
| Hashmap *watch_bus; /* D-Bus names => Unit object n:1 */ | | Hashmap *watch_bus; /* D-Bus names => Unit object n:1 */ | |
| int32_t name_data_slot; | | int32_t name_data_slot; | |
| int32_t conn_data_slot; | | int32_t conn_data_slot; | |
| int32_t subscribed_data_slot; | | int32_t subscribed_data_slot; | |
| | | | |
|
| | | bool send_reloading_done; | |
| | | | |
| uint32_t current_job_id; | | uint32_t current_job_id; | |
| uint32_t default_unit_job_id; | | uint32_t default_unit_job_id; | |
| | | | |
| /* Data specific to the Automount subsystem */ | | /* Data specific to the Automount subsystem */ | |
| int dev_autofs_fd; | | int dev_autofs_fd; | |
| | | | |
| /* Data specific to the cgroup subsystem */ | | /* Data specific to the cgroup subsystem */ | |
| Hashmap *cgroup_unit; | | Hashmap *cgroup_unit; | |
| CGroupControllerMask cgroup_supported; | | CGroupControllerMask cgroup_supported; | |
| char *cgroup_root; | | char *cgroup_root; | |
| | | | |
| skipping to change at line 228 | | skipping to change at line 232 | |
| ManagerExitCode exit_code:5; | | ManagerExitCode exit_code:5; | |
| | | | |
| bool dispatching_load_queue:1; | | bool dispatching_load_queue:1; | |
| bool dispatching_run_queue:1; | | bool dispatching_run_queue:1; | |
| bool dispatching_dbus_queue:1; | | bool dispatching_dbus_queue:1; | |
| | | | |
| bool taint_usr:1; | | bool taint_usr:1; | |
| | | | |
| bool show_status; | | bool show_status; | |
| bool confirm_spawn; | | bool confirm_spawn; | |
|
| | | bool no_console_output; | |
| | | | |
| ExecOutput default_std_output, default_std_error; | | ExecOutput default_std_output, default_std_error; | |
| | | | |
| struct rlimit *rlimit[RLIMIT_NLIMITS]; | | struct rlimit *rlimit[RLIMIT_NLIMITS]; | |
| | | | |
| /* non-zero if we are reloading or reexecuting, */ | | /* non-zero if we are reloading or reexecuting, */ | |
| int n_reloading; | | int n_reloading; | |
| | | | |
| unsigned n_installed_jobs; | | unsigned n_installed_jobs; | |
| unsigned n_failed_jobs; | | unsigned n_failed_jobs; | |
| | | | |
| /* Jobs in progress watching */ | | /* Jobs in progress watching */ | |
| unsigned n_running_jobs; | | unsigned n_running_jobs; | |
| unsigned n_on_console; | | unsigned n_on_console; | |
| unsigned jobs_in_progress_iteration; | | unsigned jobs_in_progress_iteration; | |
| | | | |
| /* Type=idle pipes */ | | /* Type=idle pipes */ | |
|
| int idle_pipe[2]; | | int idle_pipe[4]; | |
| | | | |
| char *switch_root; | | char *switch_root; | |
| char *switch_root_init; | | char *switch_root_init; | |
| }; | | }; | |
| | | | |
|
| int manager_new(SystemdRunningAs running_as, Manager **m); | | int manager_new(SystemdRunningAs running_as, bool reexecuting, Manager **m)
; | |
| void manager_free(Manager *m); | | void manager_free(Manager *m); | |
| | | | |
| int manager_enumerate(Manager *m); | | int manager_enumerate(Manager *m); | |
| int manager_coldplug(Manager *m); | | int manager_coldplug(Manager *m); | |
| int manager_startup(Manager *m, FILE *serialization, FDSet *fds); | | int manager_startup(Manager *m, FILE *serialization, FDSet *fds); | |
| | | | |
| Job *manager_get_job(Manager *m, uint32_t id); | | Job *manager_get_job(Manager *m, uint32_t id); | |
| Unit *manager_get_unit(Manager *m, const char *name); | | Unit *manager_get_unit(Manager *m, const char *name); | |
| | | | |
| int manager_get_job_from_dbus_path(Manager *m, const char *s, Job **_j); | | int manager_get_job_from_dbus_path(Manager *m, const char *s, Job **_j); | |
| | | | |
End of changes. 6 change blocks. |
| 3 lines changed or deleted | | 8 lines changed or added | |
|
| pyutil.h | | pyutil.h | |
| | | | |
| skipping to change at line 33 | | skipping to change at line 33 | |
| | | | |
| #ifndef Py_TYPE | | #ifndef Py_TYPE | |
| /* avoid duplication warnings from errors in Python 2.7 headers */ | | /* avoid duplication warnings from errors in Python 2.7 headers */ | |
| # include <Python.h> | | # include <Python.h> | |
| #endif | | #endif | |
| | | | |
| void cleanup_Py_DECREFp(PyObject **p); | | void cleanup_Py_DECREFp(PyObject **p); | |
| PyObject* absolute_timeout(uint64_t t); | | PyObject* absolute_timeout(uint64_t t); | |
| int set_error(int r, const char* path, const char* invalid_message); | | int set_error(int r, const char* path, const char* invalid_message); | |
| | | | |
|
| | | #if PY_MAJOR_VERSION >=3 && PY_MINOR_VERSION >= 1 | |
| | | int Unicode_FSConverter(PyObject* obj, void *_result); | |
| | | #endif | |
| | | | |
| #define _cleanup_Py_DECREF_ __attribute__((cleanup(cleanup_Py_DECREFp))) | | #define _cleanup_Py_DECREF_ __attribute__((cleanup(cleanup_Py_DECREFp))) | |
| | | | |
| #if PY_MAJOR_VERSION >=3 | | #if PY_MAJOR_VERSION >=3 | |
| # define unicode_FromStringAndSize PyUnicode_FromStringAndSize | | # define unicode_FromStringAndSize PyUnicode_FromStringAndSize | |
| # define unicode_FromString PyUnicode_FromString | | # define unicode_FromString PyUnicode_FromString | |
| # define long_FromLong PyLong_FromLong | | # define long_FromLong PyLong_FromLong | |
| # define long_FromSize_t PyLong_FromSize_t | | # define long_FromSize_t PyLong_FromSize_t | |
| # define long_Check PyLong_Check | | # define long_Check PyLong_Check | |
| # define long_AsLong PyLong_AsLong | | # define long_AsLong PyLong_AsLong | |
| #else | | #else | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 4 lines changed or added | |
|
| syscall-from-name.h | | syscall-from-name.h | |
| /* ANSI-C code produced by gperf version 3.0.4 */ | | /* ANSI-C code produced by gperf version 3.0.4 */ | |
|
| /* Command-line: /usr/bin/gperf -L ANSI-C -t --ignore-case -N lookup_syscal
l -H hash_syscall_name -p -C */ | | /* Command-line: gperf -L ANSI-C -t --ignore-case -N lookup_syscall -H hash
_syscall_name -p -C */ | |
| /* Computed positions: -k'1-2,4-9,$' */ | | /* Computed positions: -k'1-2,4-9,$' */ | |
| | | | |
| #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ | | #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ | |
| && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \ | | && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \ | |
| && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \ | | && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \ | |
| && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \ | | && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \ | |
| && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \ | | && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \ | |
| && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \ | | && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \ | |
| && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \ | | && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \ | |
| && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \ | | && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \ | |
| | | | |
End of changes. 1 change blocks. |
| 1 lines changed or deleted | | 1 lines changed or added | |
|
| udev.h | | udev.h | |
| | | | |
| skipping to change at line 75 | | skipping to change at line 75 | |
| int handle; | | int handle; | |
| char *name; | | char *name; | |
| }; | | }; | |
| | | | |
| /* udev-rules.c */ | | /* udev-rules.c */ | |
| struct udev_rules; | | struct udev_rules; | |
| struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names); | | struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names); | |
| struct udev_rules *udev_rules_unref(struct udev_rules *rules); | | struct udev_rules *udev_rules_unref(struct udev_rules *rules); | |
| bool udev_rules_check_timestamp(struct udev_rules *rules); | | bool udev_rules_check_timestamp(struct udev_rules *rules); | |
| int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *
event, const sigset_t *sigmask); | | int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *
event, const sigset_t *sigmask); | |
|
| void udev_rules_apply_static_dev_perms(struct udev_rules *rules); | | int udev_rules_apply_static_dev_perms(struct udev_rules *rules); | |
| | | | |
| /* udev-event.c */ | | /* udev-event.c */ | |
| struct udev_event *udev_event_new(struct udev_device *dev); | | struct udev_event *udev_event_new(struct udev_device *dev); | |
| void udev_event_unref(struct udev_event *event); | | void udev_event_unref(struct udev_event *event); | |
| size_t udev_event_apply_format(struct udev_event *event, const char *src, c
har *dest, size_t size); | | size_t udev_event_apply_format(struct udev_event *event, const char *src, c
har *dest, size_t size); | |
| int udev_event_apply_subsys_kernel(struct udev_event *event, const char *st
ring, | | int udev_event_apply_subsys_kernel(struct udev_event *event, const char *st
ring, | |
| char *result, size_t maxsize, int read_v
alue); | | char *result, size_t maxsize, int read_v
alue); | |
| int udev_event_spawn(struct udev_event *event, | | int udev_event_spawn(struct udev_event *event, | |
| const char *cmd, char **envp, const sigset_t *sigmask, | | const char *cmd, char **envp, const sigset_t *sigmask, | |
| char *result, size_t ressize); | | char *result, size_t ressize); | |
| | | | |
| skipping to change at line 148 | | skipping to change at line 148 | |
| enum udev_builtin_cmd { | | enum udev_builtin_cmd { | |
| #ifdef HAVE_BLKID | | #ifdef HAVE_BLKID | |
| UDEV_BUILTIN_BLKID, | | UDEV_BUILTIN_BLKID, | |
| #endif | | #endif | |
| UDEV_BUILTIN_BTRFS, | | UDEV_BUILTIN_BTRFS, | |
| #ifdef HAVE_FIRMWARE | | #ifdef HAVE_FIRMWARE | |
| UDEV_BUILTIN_FIRMWARE, | | UDEV_BUILTIN_FIRMWARE, | |
| #endif | | #endif | |
| UDEV_BUILTIN_HWDB, | | UDEV_BUILTIN_HWDB, | |
| UDEV_BUILTIN_INPUT_ID, | | UDEV_BUILTIN_INPUT_ID, | |
|
| | | UDEV_BUILTIN_KEYBOARD, | |
| #ifdef HAVE_KMOD | | #ifdef HAVE_KMOD | |
| UDEV_BUILTIN_KMOD, | | UDEV_BUILTIN_KMOD, | |
| #endif | | #endif | |
| UDEV_BUILTIN_NET_ID, | | UDEV_BUILTIN_NET_ID, | |
| UDEV_BUILTIN_PATH_ID, | | UDEV_BUILTIN_PATH_ID, | |
| UDEV_BUILTIN_USB_ID, | | UDEV_BUILTIN_USB_ID, | |
| #ifdef HAVE_ACL | | #ifdef HAVE_ACL | |
| UDEV_BUILTIN_UACCESS, | | UDEV_BUILTIN_UACCESS, | |
| #endif | | #endif | |
| UDEV_BUILTIN_MAX | | UDEV_BUILTIN_MAX | |
| | | | |
| skipping to change at line 177 | | skipping to change at line 178 | |
| }; | | }; | |
| #ifdef HAVE_BLKID | | #ifdef HAVE_BLKID | |
| extern const struct udev_builtin udev_builtin_blkid; | | extern const struct udev_builtin udev_builtin_blkid; | |
| #endif | | #endif | |
| extern const struct udev_builtin udev_builtin_btrfs; | | extern const struct udev_builtin udev_builtin_btrfs; | |
| #ifdef HAVE_FIRMWARE | | #ifdef HAVE_FIRMWARE | |
| extern const struct udev_builtin udev_builtin_firmware; | | extern const struct udev_builtin udev_builtin_firmware; | |
| #endif | | #endif | |
| extern const struct udev_builtin udev_builtin_hwdb; | | extern const struct udev_builtin udev_builtin_hwdb; | |
| extern const struct udev_builtin udev_builtin_input_id; | | extern const struct udev_builtin udev_builtin_input_id; | |
|
| | | extern const struct udev_builtin udev_builtin_keyboard; | |
| #ifdef HAVE_KMOD | | #ifdef HAVE_KMOD | |
| extern const struct udev_builtin udev_builtin_kmod; | | extern const struct udev_builtin udev_builtin_kmod; | |
| #endif | | #endif | |
| extern const struct udev_builtin udev_builtin_net_id; | | extern const struct udev_builtin udev_builtin_net_id; | |
| extern const struct udev_builtin udev_builtin_path_id; | | extern const struct udev_builtin udev_builtin_path_id; | |
| extern const struct udev_builtin udev_builtin_usb_id; | | extern const struct udev_builtin udev_builtin_usb_id; | |
| extern const struct udev_builtin udev_builtin_uaccess; | | extern const struct udev_builtin udev_builtin_uaccess; | |
| void udev_builtin_init(struct udev *udev); | | void udev_builtin_init(struct udev *udev); | |
| void udev_builtin_exit(struct udev *udev); | | void udev_builtin_exit(struct udev *udev); | |
| enum udev_builtin_cmd udev_builtin_lookup(const char *command); | | enum udev_builtin_cmd udev_builtin_lookup(const char *command); | |
| const char *udev_builtin_name(enum udev_builtin_cmd cmd); | | const char *udev_builtin_name(enum udev_builtin_cmd cmd); | |
| bool udev_builtin_run_once(enum udev_builtin_cmd cmd); | | bool udev_builtin_run_once(enum udev_builtin_cmd cmd); | |
| int udev_builtin_run(struct udev_device *dev, enum udev_builtin_cmd cmd, co
nst char *command, bool test); | | int udev_builtin_run(struct udev_device *dev, enum udev_builtin_cmd cmd, co
nst char *command, bool test); | |
| void udev_builtin_list(struct udev *udev); | | void udev_builtin_list(struct udev *udev); | |
| bool udev_builtin_validate(struct udev *udev); | | bool udev_builtin_validate(struct udev *udev); | |
| int udev_builtin_add_property(struct udev_device *dev, bool test, const cha
r *key, const char *val); | | int udev_builtin_add_property(struct udev_device *dev, bool test, const cha
r *key, const char *val); | |
|
| int udev_builtin_hwdb_lookup(struct udev_device *dev, const char *modalias, | | int udev_builtin_hwdb_lookup(struct udev_device *dev, const char *prefix, c | |
| const char *filter, bool test); | | onst char *modalias, | |
| | | const char *filter, bool test); | |
| | | | |
| /* udev logging */ | | /* udev logging */ | |
| void udev_main_log(struct udev *udev, int priority, | | void udev_main_log(struct udev *udev, int priority, | |
| const char *file, int line, const char *fn, | | const char *file, int line, const char *fn, | |
| const char *format, va_list args) _printf_attr_(6, 0); | | const char *format, va_list args) _printf_attr_(6, 0); | |
| | | | |
| /* udevadm commands */ | | /* udevadm commands */ | |
| struct udevadm_cmd { | | struct udevadm_cmd { | |
| const char *name; | | const char *name; | |
| int (*cmd)(struct udev *udev, int argc, char *argv[]); | | int (*cmd)(struct udev *udev, int argc, char *argv[]); | |
| | | | |
End of changes. 4 change blocks. |
| 3 lines changed or deleted | | 6 lines changed or added | |
|
| unit.h | | unit.h | |
| | | | |
| skipping to change at line 601 | | skipping to change at line 601 | |
| | | | |
| int unit_add_one_mount_link(Unit *u, Mount *m); | | int unit_add_one_mount_link(Unit *u, Mount *m); | |
| int unit_add_mount_links(Unit *u); | | int unit_add_mount_links(Unit *u); | |
| | | | |
| int unit_exec_context_defaults(Unit *u, ExecContext *c); | | int unit_exec_context_defaults(Unit *u, ExecContext *c); | |
| | | | |
| ExecContext *unit_get_exec_context(Unit *u) _pure_; | | ExecContext *unit_get_exec_context(Unit *u) _pure_; | |
| CGroupContext *unit_get_cgroup_context(Unit *u) _pure_; | | CGroupContext *unit_get_cgroup_context(Unit *u) _pure_; | |
| | | | |
| int unit_write_drop_in(Unit *u, UnitSetPropertiesMode mode, const char *nam
e, const char *data); | | int unit_write_drop_in(Unit *u, UnitSetPropertiesMode mode, const char *nam
e, const char *data); | |
|
| int unit_write_drop_in_private_section(Unit *u, UnitSetPropertiesMode mode, | | int unit_write_drop_in_format(Unit *u, UnitSetPropertiesMode mode, const ch | |
| const char *name, const char *data); | | ar *name, const char *format, ...) _printf_attr_(4,5); | |
| | | | |
| | | int unit_write_drop_in_private(Unit *u, UnitSetPropertiesMode mode, const c | |
| | | har *name, const char *data); | |
| | | int unit_write_drop_in_private_format(Unit *u, UnitSetPropertiesMode mode, | |
| | | const char *name, const char *format, ...) _printf_attr_(4,5); | |
| | | | |
| int unit_remove_drop_in(Unit *u, UnitSetPropertiesMode mode, const char *na
me); | | int unit_remove_drop_in(Unit *u, UnitSetPropertiesMode mode, const char *na
me); | |
| | | | |
| int unit_kill_context(Unit *u, KillContext *c, bool sigkill, pid_t main_pid
, pid_t control_pid, bool main_pid_alien); | | int unit_kill_context(Unit *u, KillContext *c, bool sigkill, pid_t main_pid
, pid_t control_pid, bool main_pid_alien); | |
| | | | |
| int unit_make_transient(Unit *u); | | int unit_make_transient(Unit *u); | |
| | | | |
| const char *unit_active_state_to_string(UnitActiveState i) _const_; | | const char *unit_active_state_to_string(UnitActiveState i) _const_; | |
| UnitActiveState unit_active_state_from_string(const char *s) _pure_; | | UnitActiveState unit_active_state_from_string(const char *s) _pure_; | |
| | | | |
| const char *unit_dependency_to_string(UnitDependency i) _const_; | | const char *unit_dependency_to_string(UnitDependency i) _const_; | |
| | | | |
End of changes. 1 change blocks. |
| 2 lines changed or deleted | | 8 lines changed or added | |
|
| util.h | | util.h | |
| | | | |
| skipping to change at line 213 | | skipping to change at line 213 | |
| | | | |
| char *file_in_same_dir(const char *path, const char *filename); | | char *file_in_same_dir(const char *path, const char *filename); | |
| | | | |
| int rmdir_parents(const char *path, const char *stop); | | int rmdir_parents(const char *path, const char *stop); | |
| | | | |
| int get_process_comm(pid_t pid, char **name); | | int get_process_comm(pid_t pid, char **name); | |
| int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, c
har **line); | | int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, c
har **line); | |
| int get_process_exe(pid_t pid, char **name); | | int get_process_exe(pid_t pid, char **name); | |
| int get_process_uid(pid_t pid, uid_t *uid); | | int get_process_uid(pid_t pid, uid_t *uid); | |
| int get_process_gid(pid_t pid, gid_t *gid); | | int get_process_gid(pid_t pid, gid_t *gid); | |
|
| | | int get_process_capeff(pid_t pid, char **capeff); | |
| | | | |
| char hexchar(int x) _const_; | | char hexchar(int x) _const_; | |
| int unhexchar(char c) _const_; | | int unhexchar(char c) _const_; | |
| char octchar(int x) _const_; | | char octchar(int x) _const_; | |
| int unoctchar(char c) _const_; | | int unoctchar(char c) _const_; | |
| char decchar(int x) _const_; | | char decchar(int x) _const_; | |
| int undecchar(char c) _const_; | | int undecchar(char c) _const_; | |
| | | | |
| char *cescape(const char *s); | | char *cescape(const char *s); | |
| char *cunescape(const char *s); | | char *cunescape(const char *s); | |
| | | | |
| skipping to change at line 737 | | skipping to change at line 738 | |
| PROTECT_ERRNO; \ | | PROTECT_ERRNO; \ | |
| _saved_locale_.new_locale = newlocale((mask),
(loc), (locale_t) 0); \ | | _saved_locale_.new_locale = newlocale((mask),
(loc), (locale_t) 0); \ | |
| if (_saved_locale_.new_locale != (locale_t) 0)
\ | | if (_saved_locale_.new_locale != (locale_t) 0)
\ | |
| _saved_locale_.saved_locale = uselocal
e(_saved_locale_.new_locale); \ | | _saved_locale_.saved_locale = uselocal
e(_saved_locale_.new_locale); \ | |
| } \ | | } \ | |
| !_saved_locale_.quit; }) ; \ | | !_saved_locale_.quit; }) ; \ | |
| _saved_locale_.quit = true) | | _saved_locale_.quit = true) | |
| | | | |
| bool id128_is_valid(const char *s) _pure_; | | bool id128_is_valid(const char *s) _pure_; | |
| void parse_user_at_host(char *arg, char **user, char **host); | | void parse_user_at_host(char *arg, char **user, char **host); | |
|
| | | | |
| | | int split_pair(const char *s, const char *sep, char **l, char **r); | |
| | | | |
End of changes. 2 change blocks. |
| 0 lines changed or deleted | | 1 lines changed or added | |
|