| config.h | | config.h | |
| | | | |
| skipping to change at line 114 | | skipping to change at line 114 | |
| /* 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 187" | | #define PACKAGE_STRING "systemd 188" | |
| | | | |
| /* 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 "187" | | #define PACKAGE_VERSION "188" | |
| | | | |
| /* Define to 1 if you have the ANSI C header files. */ | | /* Define to 1 if you have the ANSI C header files. */ | |
| #define STDC_HEADERS 1 | | #define STDC_HEADERS 1 | |
| | | | |
| /* Target is ALTLinux */ | | /* Target is ALTLinux */ | |
| /* #undef TARGET_ALTLINUX */ | | /* #undef TARGET_ALTLINUX */ | |
| | | | |
| /* Target is Ångström */ | | /* Target is Ångström */ | |
| /* #undef TARGET_ANGSTROM */ | | /* #undef TARGET_ANGSTROM */ | |
| | | | |
| | | | |
| skipping to change at line 189 | | skipping to change at line 189 | |
| /* 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 "187" | | #define VERSION "188" | |
| | | | |
| /* 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. 3 change blocks. |
| 3 lines changed or deleted | | 3 lines changed or added | |
|
| dbus-common.h | | dbus-common.h | |
| | | | |
| skipping to change at line 206 | | skipping to change at line 206 | |
| | | | |
| int bus_iter_get_basic_and_next(DBusMessageIter *iter, int type, void *data
, bool next); | | int bus_iter_get_basic_and_next(DBusMessageIter *iter, int type, void *data
, bool next); | |
| | | | |
| int generic_print_property(const char *name, DBusMessageIter *iter, bool al
l); | | int generic_print_property(const char *name, DBusMessageIter *iter, bool al
l); | |
| | | | |
| void bus_async_unregister_and_exit(DBusConnection *bus, const char *name); | | void bus_async_unregister_and_exit(DBusConnection *bus, const char *name); | |
| | | | |
| DBusHandlerResult bus_exit_idle_filter(DBusConnection *bus, DBusMessage *m,
void *userdata); | | DBusHandlerResult bus_exit_idle_filter(DBusConnection *bus, DBusMessage *m,
void *userdata); | |
| | | | |
| pid_t bus_get_unix_process_id(DBusConnection *connection, const char *name,
DBusError *error); | | pid_t bus_get_unix_process_id(DBusConnection *connection, const char *name,
DBusError *error); | |
|
| | | | |
| | | bool bus_error_is_no_service(const DBusError *error); | |
| | | int bus_method_call_with_reply(DBusConnection *bus, | |
| | | const char *destination, | |
| | | const char *path, | |
| | | const char *interface, | |
| | | const char *method, | |
| | | DBusMessage **return_reply, | |
| | | DBusError *return_error, | |
| | | int first_arg_type, ...); | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 0 lines changed or added | |
|
| log.h | | log.h | |
| | | | |
| skipping to change at line 27 | | skipping to change at line 27 | |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| Lesser General Public License for more details. | | Lesser General Public License for more details. | |
| | | | |
| You should have received a copy of the GNU Lesser 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/>. | |
| ***/ | | ***/ | |
| | | | |
| #include <syslog.h> | | #include <syslog.h> | |
| #include <stdbool.h> | | #include <stdbool.h> | |
| #include <stdarg.h> | | #include <stdarg.h> | |
|
| | | #include <errno.h> | |
| | | | |
| #include "macro.h" | | #include "macro.h" | |
| | | | |
| typedef enum LogTarget{ | | typedef enum LogTarget{ | |
| LOG_TARGET_CONSOLE, | | LOG_TARGET_CONSOLE, | |
| LOG_TARGET_KMSG, | | LOG_TARGET_KMSG, | |
| LOG_TARGET_JOURNAL, | | LOG_TARGET_JOURNAL, | |
| LOG_TARGET_JOURNAL_OR_KMSG, | | LOG_TARGET_JOURNAL_OR_KMSG, | |
| LOG_TARGET_SYSLOG, | | LOG_TARGET_SYSLOG, | |
| LOG_TARGET_SYSLOG_OR_KMSG, | | LOG_TARGET_SYSLOG_OR_KMSG, | |
| | | | |
| skipping to change at line 105 | | skipping to change at line 106 | |
| char *buffer); | | char *buffer); | |
| | | | |
| #define log_full(level, ...) log_meta(level, __FILE__, __LINE__, __func__
, __VA_ARGS__) | | #define log_full(level, ...) log_meta(level, __FILE__, __LINE__, __func__
, __VA_ARGS__) | |
| | | | |
| #define log_debug(...) log_meta(LOG_DEBUG, __FILE__, __LINE__, __func__
, __VA_ARGS__) | | #define log_debug(...) log_meta(LOG_DEBUG, __FILE__, __LINE__, __func__
, __VA_ARGS__) | |
| #define log_info(...) log_meta(LOG_INFO, __FILE__, __LINE__, __func__
, __VA_ARGS__) | | #define log_info(...) log_meta(LOG_INFO, __FILE__, __LINE__, __func__
, __VA_ARGS__) | |
| #define log_notice(...) log_meta(LOG_NOTICE, __FILE__, __LINE__, __func__
, __VA_ARGS__) | | #define log_notice(...) log_meta(LOG_NOTICE, __FILE__, __LINE__, __func__
, __VA_ARGS__) | |
| #define log_warning(...) log_meta(LOG_WARNING, __FILE__, __LINE__, __func__
, __VA_ARGS__) | | #define log_warning(...) log_meta(LOG_WARNING, __FILE__, __LINE__, __func__
, __VA_ARGS__) | |
| #define log_error(...) log_meta(LOG_ERR, __FILE__, __LINE__, __func__
, __VA_ARGS__) | | #define log_error(...) log_meta(LOG_ERR, __FILE__, __LINE__, __func__
, __VA_ARGS__) | |
| | | | |
|
| | | int __log_oom(const char *file, int line, const char *func); | |
| | | #define log_oom() __log_oom(__FILE__, __LINE__, __func__) | |
| | | | |
| /* This modifies the buffer passed! */ | | /* This modifies the buffer passed! */ | |
| #define log_dump(level, buffer) log_dump_internal(level, __FILE__, __LINE__
, __func__, buffer) | | #define log_dump(level, buffer) log_dump_internal(level, __FILE__, __LINE__
, __func__, buffer) | |
| | | | |
| const char *log_target_to_string(LogTarget target); | | const char *log_target_to_string(LogTarget target); | |
| LogTarget log_target_from_string(const char *s); | | LogTarget log_target_from_string(const char *s); | |
| | | | |
End of changes. 2 change blocks. |
| 0 lines changed or deleted | | 4 lines changed or added | |
|
| logs-show.h | | logs-show.h | |
| | | | |
| skipping to change at line 42 | | skipping to change at line 42 | |
| OUTPUT_SHORT_MONOTONIC, | | OUTPUT_SHORT_MONOTONIC, | |
| OUTPUT_VERBOSE, | | OUTPUT_VERBOSE, | |
| OUTPUT_EXPORT, | | OUTPUT_EXPORT, | |
| OUTPUT_JSON, | | OUTPUT_JSON, | |
| OUTPUT_CAT, | | OUTPUT_CAT, | |
| _OUTPUT_MODE_MAX, | | _OUTPUT_MODE_MAX, | |
| _OUTPUT_MODE_INVALID = -1 | | _OUTPUT_MODE_INVALID = -1 | |
| } OutputMode; | | } OutputMode; | |
| | | | |
| typedef enum OutputFlags { | | typedef enum OutputFlags { | |
|
| OUTPUT_SHOW_ALL = 1 << 0, | | OUTPUT_SHOW_ALL = 1 << 0, | |
| OUTPUT_MONOTONIC_MODE = 1 << 1, | | OUTPUT_MONOTONIC_MODE = 1 << 1, | |
|
| OUTPUT_FOLLOW = 1 << 2, | | OUTPUT_FOLLOW = 1 << 2, | |
| OUTPUT_WARN_CUTOFF = 1 << 3, | | OUTPUT_WARN_CUTOFF = 1 << 3, | |
| OUTPUT_FULL_WIDTH = 1 << 4, | | OUTPUT_FULL_WIDTH = 1 << 4, | |
| | | OUTPUT_COLOR = 1 << 5 | |
| } OutputFlags; | | } OutputFlags; | |
| | | | |
| int output_journal(sd_journal *j, OutputMode mode, unsigned line, | | int output_journal(sd_journal *j, OutputMode mode, unsigned line, | |
| unsigned n_columns, OutputFlags flags); | | unsigned n_columns, OutputFlags flags); | |
| | | | |
| int show_journal_by_unit( | | int show_journal_by_unit( | |
| const char *unit, | | const char *unit, | |
| OutputMode mode, | | OutputMode mode, | |
| unsigned n_columns, | | unsigned n_columns, | |
| usec_t not_before, | | usec_t not_before, | |
| | | | |
End of changes. 2 change blocks. |
| 4 lines changed or deleted | | 5 lines changed or added | |
|
| sd-journal.h | | sd-journal.h | |
| | | | |
| skipping to change at line 44 | | skipping to change at line 44 | |
| extern "C" { | | extern "C" { | |
| #endif | | #endif | |
| | | | |
| /* Journal APIs. See sd-journal(3) for more information. */ | | /* Journal APIs. See sd-journal(3) for more information. */ | |
| | | | |
| /* Write to daemon */ | | /* Write to daemon */ | |
| int sd_journal_print(int priority, const char *format, ...) __attribute__ (
(format (printf, 2, 3))); | | int sd_journal_print(int priority, const char *format, ...) __attribute__ (
(format (printf, 2, 3))); | |
| int sd_journal_printv(int priority, const char *format, va_list ap); | | int sd_journal_printv(int priority, const char *format, va_list ap); | |
| int sd_journal_send(const char *format, ...) __attribute__((sentinel)); | | int sd_journal_send(const char *format, ...) __attribute__((sentinel)); | |
| int sd_journal_sendv(const struct iovec *iov, int n); | | int sd_journal_sendv(const struct iovec *iov, int n); | |
|
| | | int sd_journal_perror(const char *message); | |
| | | | |
| /* Used by the macros below. Don't call this directly. */ | | /* Used by the macros below. Don't call this directly. */ | |
| int sd_journal_print_with_location(int priority, const char *file, const ch
ar *line, const char *func, const char *format, ...) __attribute__ ((format
(printf, 5, 6))); | | int sd_journal_print_with_location(int priority, const char *file, const ch
ar *line, const char *func, const char *format, ...) __attribute__ ((format
(printf, 5, 6))); | |
| int sd_journal_printv_with_location(int priority, const char *file, const c
har *line, const char *func, const char *format, va_list ap); | | int sd_journal_printv_with_location(int priority, const char *file, const c
har *line, const char *func, const char *format, va_list ap); | |
| int sd_journal_send_with_location(const char *file, const char *line, const
char *func, const char *format, ...) __attribute__((sentinel)); | | int sd_journal_send_with_location(const char *file, const char *line, const
char *func, const char *format, ...) __attribute__((sentinel)); | |
| int sd_journal_sendv_with_location(const char *file, const char *line, cons
t char *func, const struct iovec *iov, int n); | | int sd_journal_sendv_with_location(const char *file, const char *line, cons
t char *func, const struct iovec *iov, int n); | |
|
| | | int sd_journal_perror_with_location(const char *file, const char *line, con
st char *func, const char *message); | |
| | | | |
| /* implicitly add code location to messages sent, if this is enabled */ | | /* implicitly add code location to messages sent, if this is enabled */ | |
| #ifndef SD_JOURNAL_SUPPRESS_LOCATION | | #ifndef SD_JOURNAL_SUPPRESS_LOCATION | |
| | | | |
| #define _sd_XSTRINGIFY(x) #x | | #define _sd_XSTRINGIFY(x) #x | |
| #define _sd_STRINGIFY(x) _sd_XSTRINGIFY(x) | | #define _sd_STRINGIFY(x) _sd_XSTRINGIFY(x) | |
| | | | |
| #define sd_journal_print(priority, ...) sd_journal_print_with_location(prio
rity, "CODE_FILE=" __FILE__, "CODE_LINE=" _sd_STRINGIFY(__LINE__), __func__
, __VA_ARGS__) | | #define sd_journal_print(priority, ...) sd_journal_print_with_location(prio
rity, "CODE_FILE=" __FILE__, "CODE_LINE=" _sd_STRINGIFY(__LINE__), __func__
, __VA_ARGS__) | |
| #define sd_journal_printv(priority, format, ap) sd_journal_printv_with_loca
tion(priority, "CODE_FILE=" __FILE__, "CODE_LINE=" _sd_STRINGIFY(__LINE__),
__func__, format, ap) | | #define sd_journal_printv(priority, format, ap) sd_journal_printv_with_loca
tion(priority, "CODE_FILE=" __FILE__, "CODE_LINE=" _sd_STRINGIFY(__LINE__),
__func__, format, ap) | |
| #define sd_journal_send(...) sd_journal_send_with_location("CODE_FILE=" __F
ILE__, "CODE_LINE=" _sd_STRINGIFY(__LINE__), __func__, __VA_ARGS__) | | #define sd_journal_send(...) sd_journal_send_with_location("CODE_FILE=" __F
ILE__, "CODE_LINE=" _sd_STRINGIFY(__LINE__), __func__, __VA_ARGS__) | |
| #define sd_journal_sendv(iovec, n) sd_journal_sendv_with_location("CODE_FIL
E=" __FILE__, "CODE_LINE=" _sd_STRINGIFY(__LINE__), __func__, iovec, n) | | #define sd_journal_sendv(iovec, n) sd_journal_sendv_with_location("CODE_FIL
E=" __FILE__, "CODE_LINE=" _sd_STRINGIFY(__LINE__), __func__, iovec, n) | |
|
| | | #define sd_journal_perror(message) sd_journal_perror_with_location("CODE_FI
LE=" __FILE__, "CODE_LINE=" _sd_STRINGIFY(__LINE__), __func__, message) | |
| | | | |
| #endif | | #endif | |
| | | | |
| int sd_journal_stream_fd(const char *identifier, int priority, int level_pr
efix); | | int sd_journal_stream_fd(const char *identifier, int priority, int level_pr
efix); | |
| | | | |
| /* Browse journal stream */ | | /* Browse journal stream */ | |
| | | | |
| typedef struct sd_journal sd_journal; | | typedef struct sd_journal sd_journal; | |
| | | | |
| enum { | | enum { | |
| | | | |
End of changes. 3 change blocks. |
| 0 lines changed or deleted | | 3 lines changed or added | |
|
| unit-name.h | | unit-name.h | |
| | | | |
| skipping to change at line 82 | | skipping to change at line 82 | |
| char *unit_name_change_suffix(const char *n, const char *suffix); | | char *unit_name_change_suffix(const char *n, const char *suffix); | |
| | | | |
| char *unit_name_build(const char *prefix, const char *instance, const char
*suffix); | | char *unit_name_build(const char *prefix, const char *instance, const char
*suffix); | |
| | | | |
| char *unit_name_escape(const char *f); | | char *unit_name_escape(const char *f); | |
| char *unit_name_unescape(const char *f); | | char *unit_name_unescape(const char *f); | |
| char *unit_name_path_escape(const char *f); | | char *unit_name_path_escape(const char *f); | |
| char *unit_name_path_unescape(const char *f); | | char *unit_name_path_unescape(const char *f); | |
| | | | |
| bool unit_name_is_template(const char *n); | | bool unit_name_is_template(const char *n); | |
|
| | | bool unit_name_is_instance(const char *n); | |
| | | | |
| char *unit_name_replace_instance(const char *f, const char *i); | | char *unit_name_replace_instance(const char *f, const char *i); | |
| | | | |
| char *unit_name_template(const char *f); | | char *unit_name_template(const char *f); | |
| | | | |
| char *unit_name_from_path(const char *path, const char *suffix); | | char *unit_name_from_path(const char *path, const char *suffix); | |
| char *unit_name_from_path_instance(const char *prefix, const char *path, co
nst char *suffix); | | char *unit_name_from_path_instance(const char *prefix, const char *path, co
nst char *suffix); | |
| char *unit_name_to_path(const char *name); | | char *unit_name_to_path(const char *name); | |
| | | | |
| char *unit_dbus_path_from_name(const char *name); | | char *unit_dbus_path_from_name(const char *name); | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 1 lines changed or added | |
|
| unit.h | | unit.h | |
| | | | |
| skipping to change at line 78 | | skipping to change at line 78 | |
| } | | } | |
| | | | |
| enum UnitDependency { | | enum UnitDependency { | |
| /* Positive dependencies */ | | /* Positive dependencies */ | |
| UNIT_REQUIRES, | | UNIT_REQUIRES, | |
| UNIT_REQUIRES_OVERRIDABLE, | | UNIT_REQUIRES_OVERRIDABLE, | |
| UNIT_REQUISITE, | | UNIT_REQUISITE, | |
| UNIT_REQUISITE_OVERRIDABLE, | | UNIT_REQUISITE_OVERRIDABLE, | |
| UNIT_WANTS, | | UNIT_WANTS, | |
| UNIT_BINDS_TO, | | UNIT_BINDS_TO, | |
|
| | | UNIT_PART_OF, | |
| | | | |
| /* Inverse of the above */ | | /* Inverse of the above */ | |
| UNIT_REQUIRED_BY, /* inverse of 'requires' and 'requisi
te' is 'required_by' */ | | UNIT_REQUIRED_BY, /* inverse of 'requires' and 'requisi
te' is 'required_by' */ | |
| UNIT_REQUIRED_BY_OVERRIDABLE, /* inverse of 'requires_overridable'
and 'requisite_overridable' is 'soft_required_by' */ | | UNIT_REQUIRED_BY_OVERRIDABLE, /* inverse of 'requires_overridable'
and 'requisite_overridable' is 'soft_required_by' */ | |
| UNIT_WANTED_BY, /* inverse of 'wants' */ | | UNIT_WANTED_BY, /* inverse of 'wants' */ | |
| UNIT_BOUND_BY, /* inverse of 'binds_to' */ | | UNIT_BOUND_BY, /* inverse of 'binds_to' */ | |
|
| | | UNIT_CONSISTS_OF, /* inverse of 'part_of' */ | |
| | | | |
| /* Negative dependencies */ | | /* Negative dependencies */ | |
| UNIT_CONFLICTS, /* inverse of 'conflicts' is 'conflic
ted_by' */ | | UNIT_CONFLICTS, /* inverse of 'conflicts' is 'conflic
ted_by' */ | |
| UNIT_CONFLICTED_BY, | | UNIT_CONFLICTED_BY, | |
| | | | |
| /* Order */ | | /* Order */ | |
| UNIT_BEFORE, /* inverse of 'before' is 'after' and
vice versa */ | | UNIT_BEFORE, /* inverse of 'before' is 'after' and
vice versa */ | |
| UNIT_AFTER, | | UNIT_AFTER, | |
| | | | |
| /* On Failure */ | | /* On Failure */ | |
| | | | |
End of changes. 2 change blocks. |
| 0 lines changed or deleted | | 2 lines changed or added | |
|
| util.h | | util.h | |
| | | | |
| skipping to change at line 377 | | skipping to change at line 377 | |
| int pipe_eof(int fd); | | int pipe_eof(int fd); | |
| | | | |
| cpu_set_t* cpu_set_malloc(unsigned *ncpus); | | cpu_set_t* cpu_set_malloc(unsigned *ncpus); | |
| | | | |
| void status_vprintf(const char *status, bool ellipse, const char *format, v
a_list ap); | | void status_vprintf(const char *status, bool ellipse, const char *format, v
a_list ap); | |
| void status_printf(const char *status, bool ellipse, const char *format, ..
.); | | void status_printf(const char *status, bool ellipse, const char *format, ..
.); | |
| void status_welcome(void); | | void status_welcome(void); | |
| | | | |
| int fd_columns(int fd); | | int fd_columns(int fd); | |
| unsigned columns(void); | | unsigned columns(void); | |
|
| | | unsigned columns_uncached(void); | |
| | | | |
| int fd_lines(int fd); | | int fd_lines(int fd); | |
| unsigned lines(void); | | unsigned lines(void); | |
| | | | |
| int running_in_chroot(void); | | int running_in_chroot(void); | |
| | | | |
| char *ellipsize(const char *s, size_t length, unsigned percent); | | char *ellipsize(const char *s, size_t length, unsigned percent); | |
| char *ellipsize_mem(const char *s, size_t old_length, size_t new_length, un
signed percent); | | char *ellipsize_mem(const char *s, size_t old_length, size_t new_length, un
signed percent); | |
| | | | |
| int touch(const char *path); | | int touch(const char *path); | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 1 lines changed or added | |
|