bus-errors.h   bus-errors.h 
skipping to change at line 46 skipping to change at line 46
#define BUS_ERROR_ONLY_BY_DEPENDENCY "org.freedesktop.systemd1.OnlyByDepend ency" #define BUS_ERROR_ONLY_BY_DEPENDENCY "org.freedesktop.systemd1.OnlyByDepend ency"
#define BUS_ERROR_NO_ISOLATION "org.freedesktop.systemd1.NoIsolation" #define BUS_ERROR_NO_ISOLATION "org.freedesktop.systemd1.NoIsolation"
#define BUS_ERROR_LOAD_FAILED "org.freedesktop.systemd1.LoadFailed" #define BUS_ERROR_LOAD_FAILED "org.freedesktop.systemd1.LoadFailed"
#define BUS_ERROR_MASKED "org.freedesktop.systemd1.Masked" #define BUS_ERROR_MASKED "org.freedesktop.systemd1.Masked"
#define BUS_ERROR_JOB_TYPE_NOT_APPLICABLE "org.freedesktop.systemd1.JobType NotApplicable" #define BUS_ERROR_JOB_TYPE_NOT_APPLICABLE "org.freedesktop.systemd1.JobType NotApplicable"
#define BUS_ERROR_TRANSACTION_IS_DESTRUCTIVE "org.freedesktop.systemd1.Tran sactionIsDestructive" #define BUS_ERROR_TRANSACTION_IS_DESTRUCTIVE "org.freedesktop.systemd1.Tran sactionIsDestructive"
#define BUS_ERROR_TRANSACTION_JOBS_CONFLICTING "org.freedesktop.systemd1.Tr ansactionJobsConflicting" #define BUS_ERROR_TRANSACTION_JOBS_CONFLICTING "org.freedesktop.systemd1.Tr ansactionJobsConflicting"
#define BUS_ERROR_TRANSACTION_ORDER_IS_CYCLIC "org.freedesktop.systemd1.Tra nsactionOrderIsCyclic" #define BUS_ERROR_TRANSACTION_ORDER_IS_CYCLIC "org.freedesktop.systemd1.Tra nsactionOrderIsCyclic"
#define BUS_ERROR_SHUTTING_DOWN "org.freedesktop.systemd1.ShuttingDown" #define BUS_ERROR_SHUTTING_DOWN "org.freedesktop.systemd1.ShuttingDown"
#define BUS_ERROR_NO_SUCH_PROCESS "org.freedesktop.systemd1.NoSuchProcess" #define BUS_ERROR_NO_SUCH_PROCESS "org.freedesktop.systemd1.NoSuchProcess"
#define BUS_ERROR_ACCESS_DENIED "org.freedesktop.systemd1.AccessDenied"
static inline const char *bus_error(const DBusError *e, int r) { static inline const char *bus_error(const DBusError *e, int r) {
if (e && e->message) if (e && e->message)
return e->message; return e->message;
if (r >= 0) if (r >= 0)
return strerror(r); return strerror(r);
return strerror(-r); return strerror(-r);
} }
 End of changes. 1 change blocks. 
1 lines changed or deleted 0 lines changed or added


 config.h   config.h 
skipping to change at line 143 skipping to change at line 143
/* 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 190" #define PACKAGE_STRING "systemd 192"
/* 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 "190" #define PACKAGE_VERSION "192"
/* 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 218
/* 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 "190" #define VERSION "192"
/* 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


 journal-verify.h   journal-verify.h 
skipping to change at line 26 skipping to change at line 26
WITHOUT ANY WARRANTY; without even the implied warranty of WITHOUT ANY WARRANTY; without even the implied warranty of
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 "journal-file.h" #include "journal-file.h"
int journal_file_verify(JournalFile *f, const char *key, usec_t *first_vali dated, usec_t *last_validated, usec_t *last_contained, bool show_progress); int journal_file_verify(JournalFile *f, const char *key, usec_t *first_cont ained, usec_t *last_validated, usec_t *last_contained, bool show_progress);
 End of changes. 1 change blocks. 
0 lines changed or deleted 0 lines changed or added


 logind-inhibit.h   logind-inhibit.h 
skipping to change at line 35 skipping to change at line 35
typedef struct Inhibitor Inhibitor; typedef struct Inhibitor Inhibitor;
#include "list.h" #include "list.h"
#include "util.h" #include "util.h"
typedef enum InhibitWhat { typedef enum InhibitWhat {
INHIBIT_SHUTDOWN = 1, INHIBIT_SHUTDOWN = 1,
INHIBIT_SLEEP = 2, INHIBIT_SLEEP = 2,
INHIBIT_IDLE = 4, INHIBIT_IDLE = 4,
INHIBIT_HANDLE_POWER_KEY = 8, INHIBIT_HANDLE_POWER_KEY = 8,
INHIBIT_HANDLE_SLEEP_KEY = 16, INHIBIT_HANDLE_SUSPEND_KEY = 16,
INHIBIT_HANDLE_LID_SWITCH = 32, INHIBIT_HANDLE_HIBERNATE_KEY = 32,
_INHIBIT_WHAT_MAX = 64, INHIBIT_HANDLE_LID_SWITCH = 64,
_INHIBIT_WHAT_MAX = 128,
_INHIBIT_WHAT_INVALID = -1 _INHIBIT_WHAT_INVALID = -1
} InhibitWhat; } InhibitWhat;
typedef enum InhibitMode { typedef enum InhibitMode {
INHIBIT_BLOCK, INHIBIT_BLOCK,
INHIBIT_DELAY, INHIBIT_DELAY,
_INHIBIT_MODE_MAX, _INHIBIT_MODE_MAX,
_INHIBIT_MODE_INVALID = -1 _INHIBIT_MODE_INVALID = -1
} InhibitMode; } InhibitMode;
skipping to change at line 86 skipping to change at line 87
int inhibitor_save(Inhibitor *i); int inhibitor_save(Inhibitor *i);
int inhibitor_load(Inhibitor *i); int inhibitor_load(Inhibitor *i);
int inhibitor_start(Inhibitor *i); int inhibitor_start(Inhibitor *i);
int inhibitor_stop(Inhibitor *i); int inhibitor_stop(Inhibitor *i);
int inhibitor_create_fifo(Inhibitor *i); int inhibitor_create_fifo(Inhibitor *i);
void inhibitor_remove_fifo(Inhibitor *i); void inhibitor_remove_fifo(Inhibitor *i);
InhibitWhat manager_inhibit_what(Manager *m, InhibitMode mm); InhibitWhat manager_inhibit_what(Manager *m, InhibitMode mm);
bool manager_is_inhibited(Manager *m, InhibitWhat w, InhibitMode mm, dual_t imestamp *since, bool only_active); bool manager_is_inhibited(Manager *m, InhibitWhat w, InhibitMode mm, dual_t imestamp *since, bool ignore_inactive, bool ignore_uid, uid_t uid);
const char *inhibit_what_to_string(InhibitWhat k); const char *inhibit_what_to_string(InhibitWhat k);
InhibitWhat inhibit_what_from_string(const char *s); InhibitWhat inhibit_what_from_string(const char *s);
const char *inhibit_mode_to_string(InhibitMode k); const char *inhibit_mode_to_string(InhibitMode k);
InhibitMode inhibit_mode_from_string(const char *s); InhibitMode inhibit_mode_from_string(const char *s);
#endif #endif
 End of changes. 2 change blocks. 
4 lines changed or deleted 5 lines changed or added


 logind.h   logind.h 
skipping to change at line 103 skipping to change at line 103
/* If a shutdown was delayed due to a inhibitor this contains /* If a shutdown was delayed due to a inhibitor this contains
the unit name we are supposed to start after the delay is the unit name we are supposed to start after the delay is
over */ over */
const char *delayed_unit; const char *delayed_unit;
InhibitWhat delayed_what; InhibitWhat delayed_what;
usec_t delayed_timestamp; usec_t delayed_timestamp;
usec_t inhibit_delay_max; usec_t inhibit_delay_max;
HandleButton handle_power_key; HandleButton handle_power_key;
HandleButton handle_sleep_key; HandleButton handle_suspend_key;
HandleButton handle_hibernate_key;
HandleButton handle_lid_switch; HandleButton handle_lid_switch;
bool power_key_ignore_inhibited; bool power_key_ignore_inhibited;
bool sleep_key_ignore_inhibited; bool suspend_key_ignore_inhibited;
bool hibernate_key_ignore_inhibited;
bool lid_switch_ignore_inhibited; bool lid_switch_ignore_inhibited;
}; };
enum { enum {
FD_SEAT_UDEV, FD_SEAT_UDEV,
FD_VCSA_UDEV, FD_VCSA_UDEV,
FD_BUTTON_UDEV, FD_BUTTON_UDEV,
FD_CONSOLE, FD_CONSOLE,
FD_BUS, FD_BUS,
FD_OTHER_BASE FD_OTHER_BASE
 End of changes. 2 change blocks. 
2 lines changed or deleted 4 lines changed or added


 macro.h   macro.h 
skipping to change at line 196 skipping to change at line 196
return k; return k;
} }
#define _cleanup_free_ __attribute__((cleanup(freep))) #define _cleanup_free_ __attribute__((cleanup(freep)))
#define _cleanup_fclose_ __attribute__((cleanup(fclosep))) #define _cleanup_fclose_ __attribute__((cleanup(fclosep)))
#define _cleanup_close_ __attribute__((cleanup(closep))) #define _cleanup_close_ __attribute__((cleanup(closep)))
#define _cleanup_closedir_ __attribute__((cleanup(closedirp))) #define _cleanup_closedir_ __attribute__((cleanup(closedirp)))
#define _cleanup_umask_ __attribute__((cleanup(umaskp))) #define _cleanup_umask_ __attribute__((cleanup(umaskp)))
#define VA_FORMAT_ADVANCE(format, ap) \
do { \
int _argtypes[128]; \
size_t _i, _k; \
_k = parse_printf_format((format), ELEMENTSOF(_argtypes), _argtypes
); \
assert(_k < ELEMENTSOF(_argtypes)); \
for (_i = 0; _i < _k; _i++) { \
if (_argtypes[_i] & PA_FLAG_PTR) { \
(void) va_arg(ap, void*); \
continue; \
} \
\
switch (_argtypes[_i]) { \
case PA_INT: \
case PA_INT|PA_FLAG_SHORT: \
case PA_CHAR: \
(void) va_arg(ap, int); \
break; \
case PA_INT|PA_FLAG_LONG: \
(void) va_arg(ap, long int); \
break; \
case PA_INT|PA_FLAG_LONG_LONG: \
(void) va_arg(ap, long long int); \
break; \
case PA_WCHAR: \
(void) va_arg(ap, wchar_t); \
break; \
case PA_WSTRING: \
case PA_STRING: \
case PA_POINTER: \
(void) va_arg(ap, void*); \
break; \
case PA_FLOAT: \
case PA_DOUBLE: \
(void) va_arg(ap, double); \
break; \
case PA_DOUBLE|PA_FLAG_LONG_DOUBLE: \
(void) va_arg(ap, long double); \
break; \
default: \
assert_not_reached("Unknown format string argument.
"); \
} \
} \
} while(false)
#include "log.h" #include "log.h"
 End of changes. 1 change blocks. 
0 lines changed or deleted 47 lines changed or added


 missing.h   missing.h 
skipping to change at line 212 skipping to change at line 212
#ifndef PR_SET_CHILD_SUBREAPER #ifndef PR_SET_CHILD_SUBREAPER
#define PR_SET_CHILD_SUBREAPER 36 #define PR_SET_CHILD_SUBREAPER 36
#endif #endif
#ifndef MAX_HANDLE_SZ #ifndef MAX_HANDLE_SZ
#define MAX_HANDLE_SZ 128 #define MAX_HANDLE_SZ 128
#endif #endif
#ifdef __x86_64__ #ifdef __x86_64__
# ifndef __NR_name_to_handle # ifndef __NR_name_to_handle_at
# define __NR_name_to_handle 303 # define __NR_name_to_handle_at 303
# endif # endif
#else #else
# ifndef __NR_name_to_handle # ifndef __NR_name_to_handle_at
# define __NR_name_to_handle 341 # define __NR_name_to_handle_at 341
# endif # endif
#endif #endif
#ifndef HAVE_NAME_TO_HANDLE_AT #ifndef HAVE_NAME_TO_HANDLE_AT
struct file_handle { struct file_handle {
unsigned int handle_bytes; unsigned int handle_bytes;
int handle_type; int handle_type;
unsigned char f_handle[0]; unsigned char f_handle[0];
}; };
 End of changes. 2 change blocks. 
4 lines changed or deleted 4 lines changed or added


 mmap-cache.h   mmap-cache.h 
skipping to change at line 25 skipping to change at line 25
systemd is distributed in the hope that it will be useful, but systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of WITHOUT ANY WARRANTY; without even the implied warranty of
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 <inttypes.h> #include <inttypes.h>
#include <stdbool.h>
#include <sys/stat.h>
typedef struct MMapCache MMapCache; typedef struct MMapCache MMapCache;
MMapCache* mmap_cache_new(void); MMapCache* mmap_cache_new(void);
MMapCache* mmap_cache_ref(MMapCache *m); MMapCache* mmap_cache_ref(MMapCache *m);
MMapCache* mmap_cache_unref(MMapCache *m); MMapCache* mmap_cache_unref(MMapCache *m);
int mmap_cache_get(MMapCache *m, int fd, int prot, unsigned context, bool k eep_always, uint64_t offset, uint64_t size, struct stat *st, void **ret); int mmap_cache_get(MMapCache *m, int fd, int prot, unsigned context, bool k eep_always, uint64_t offset, size_t size, struct stat *st, void **ret);
void mmap_cache_close_fd(MMapCache *m, int fd); void mmap_cache_close_fd(MMapCache *m, int fd);
void mmap_cache_close_context(MMapCache *m, unsigned context); void mmap_cache_close_context(MMapCache *m, unsigned context);
 End of changes. 2 change blocks. 
1 lines changed or deleted 3 lines changed or added


 sd-id128.h   sd-id128.h 
skipping to change at line 67 skipping to change at line 67
* expensive function as paramater or an expression with side * expensive function as paramater or an expression with side
* effects */ * effects */
#define SD_ID128_FORMAT_STR "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%0 2x%02x%02x%02x%02x" #define SD_ID128_FORMAT_STR "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%0 2x%02x%02x%02x%02x"
#define SD_ID128_FORMAT_VAL(x) (x).bytes[0], (x).bytes[1], (x).bytes[2], (x ).bytes[3], (x).bytes[4], (x).bytes[5], (x).bytes[6], (x).bytes[7], (x).byt es[8], (x).bytes[9], (x).bytes[10], (x).bytes[11], (x).bytes[12], (x).bytes [13], (x).bytes[14], (x).bytes[15] #define SD_ID128_FORMAT_VAL(x) (x).bytes[0], (x).bytes[1], (x).bytes[2], (x ).bytes[3], (x).bytes[4], (x).bytes[5], (x).bytes[6], (x).bytes[7], (x).byt es[8], (x).bytes[9], (x).bytes[10], (x).bytes[11], (x).bytes[12], (x).bytes [13], (x).bytes[14], (x).bytes[15]
static inline int sd_id128_equal(sd_id128_t a, sd_id128_t b) { static inline int sd_id128_equal(sd_id128_t a, sd_id128_t b) {
return memcmp(&a, &b, 16) == 0; return memcmp(&a, &b, 16) == 0;
} }
#define SD_ID128_NULL ((sd_id128_t) { .qwords = { 0, 0 }})
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 util.h   util.h 
skipping to change at line 388 skipping to change at line 388
cpu_set_t* cpu_set_malloc(unsigned *ncpus); cpu_set_t* cpu_set_malloc(unsigned *ncpus);
int status_vprintf(const char *status, bool ellipse, const char *format, va _list ap); int status_vprintf(const char *status, bool ellipse, const char *format, va _list ap);
int status_printf(const char *status, bool ellipse, const char *format, ... ); int status_printf(const char *status, bool ellipse, const char *format, ... );
int status_welcome(void); int status_welcome(void);
int fd_columns(int fd); int fd_columns(int fd);
unsigned columns(void); unsigned columns(void);
unsigned columns_uncached(void); unsigned columns_uncached(void);
void columns_cache_reset(int _unused_ signum);
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

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/