| config.h | config.h | |||
|---|---|---|---|---|
| skipping to change at line 63 | skipping to change at line 63 | |||
| /* Have tcpwrap? */ | /* Have tcpwrap? */ | |||
| #define HAVE_LIBWRAP /**/ | #define HAVE_LIBWRAP /**/ | |||
| /* Logind support available */ | /* Logind support available */ | |||
| #define HAVE_LOGIND 1 | #define HAVE_LOGIND 1 | |||
| /* Define to 1 if you have the <memory.h> header file. */ | /* Define to 1 if you have the <memory.h> header file. */ | |||
| #define HAVE_MEMORY_H 1 | #define HAVE_MEMORY_H 1 | |||
| /* Define if microhttpd is available */ | ||||
| #define HAVE_MICROHTTPD 1 | ||||
| /* Define to 1 if you have the `name_to_handle_at' function. */ | /* Define to 1 if you have the `name_to_handle_at' function. */ | |||
| /* #undef HAVE_NAME_TO_HANDLE_AT */ | /* #undef HAVE_NAME_TO_HANDLE_AT */ | |||
| /* PAM available */ | /* PAM available */ | |||
| #define HAVE_PAM 1 | #define HAVE_PAM 1 | |||
| /* Define if qrencode is available */ | /* Define if qrencode is available */ | |||
| #define HAVE_QRENCODE 1 | #define HAVE_QRENCODE 1 | |||
| /* Define to 1 if you have the `secure_getenv' function. */ | /* Define to 1 if you have the `secure_getenv' function. */ | |||
| skipping to change at line 143 | skipping to change at line 146 | |||
| /* 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 192" | #define PACKAGE_STRING "systemd 193" | |||
| /* 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 "192" | #define PACKAGE_VERSION "193" | |||
| /* 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 218 | skipping to change at line 221 | |||
| /* 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 "192" | #define VERSION "193" | |||
| /* 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. | ||||
| 3 lines changed or deleted | 6 lines changed or added | |||
| logs-show.h | logs-show.h | |||
|---|---|---|---|---|
| skipping to change at line 50 | skipping to change at line 50 | |||
| } OutputMode; | } OutputMode; | |||
| typedef enum OutputFlags { | typedef enum OutputFlags { | |||
| OUTPUT_SHOW_ALL = 1 << 0, | OUTPUT_SHOW_ALL = 1 << 0, | |||
| OUTPUT_FOLLOW = 1 << 1, | OUTPUT_FOLLOW = 1 << 1, | |||
| OUTPUT_WARN_CUTOFF = 1 << 2, | OUTPUT_WARN_CUTOFF = 1 << 2, | |||
| OUTPUT_FULL_WIDTH = 1 << 3, | OUTPUT_FULL_WIDTH = 1 << 3, | |||
| OUTPUT_COLOR = 1 << 4 | OUTPUT_COLOR = 1 << 4 | |||
| } OutputFlags; | } OutputFlags; | |||
| int output_journal(sd_journal *j, OutputMode mode, unsigned line, | int output_journal( | |||
| unsigned n_columns, OutputFlags flags); | FILE *f, | |||
| sd_journal *j, | ||||
| OutputMode mode, | ||||
| unsigned n_columns, | ||||
| OutputFlags flags); | ||||
| int show_journal_by_unit( | int show_journal_by_unit( | |||
| FILE *f, | ||||
| const char *unit, | const char *unit, | |||
| OutputMode mode, | OutputMode mode, | |||
| unsigned n_columns, | unsigned n_columns, | |||
| usec_t not_before, | usec_t not_before, | |||
| unsigned how_many, | unsigned how_many, | |||
| OutputFlags flags); | OutputFlags flags); | |||
| const char* output_mode_to_string(OutputMode m); | const char* output_mode_to_string(OutputMode m); | |||
| OutputMode output_mode_from_string(const char *s); | OutputMode output_mode_from_string(const char *s); | |||
| End of changes. 2 change blocks. | ||||
| 2 lines changed or deleted | 7 lines changed or added | |||