chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
exec: also evaluate working_directory_missing_ok when not applying chroots
[elogind.git]
/
src
/
journal-remote
/
journal-remote.c
diff --git
a/src/journal-remote/journal-remote.c
b/src/journal-remote/journal-remote.c
index 5050616d84180e6ddc461be83ba90bed55701048..8f32a9a988e94d65896b89393f06c18d5db69c1d 100644
(file)
--- a/
src/journal-remote/journal-remote.c
+++ b/
src/journal-remote/journal-remote.c
@@
-406,7
+406,7
@@
static int add_source(RemoteServer *s, int fd, char* name, bool own_name) {
static int add_raw_socket(RemoteServer *s, int fd) {
int r;
_cleanup_close_ int fd_ = fd;
static int add_raw_socket(RemoteServer *s, int fd) {
int r;
_cleanup_close_ int fd_ = fd;
- char name[s
trlen("raw-socket-") + DECIMAL_STR_MAX(int)
];
+ char name[s
izeof("raw-socket-")-1 + DECIMAL_STR_MAX(int) + 1
];
assert(fd >= 0);
assert(fd >= 0);
@@
-416,7
+416,7
@@
static int add_raw_socket(RemoteServer *s, int fd) {
if (r < 0)
return r;
if (r < 0)
return r;
-
snprintf(name, sizeof(name)
, "raw-socket-%d", fd);
+
xsprintf(name
, "raw-socket-%d", fd);
r = sd_event_source_set_description(s->listen_event, name);
if (r < 0)
r = sd_event_source_set_description(s->listen_event, name);
if (r < 0)
@@
-885,7
+885,7
@@
static int remoteserver_init(RemoteServer *s,
if (arg_url) {
const char *url, *hostname;
if (arg_url) {
const char *url, *hostname;
- url = str
append
a(arg_url, "/entries");
+ url = str
join
a(arg_url, "/entries");
if (arg_getter) {
log_info("Spawning getter %s...", url);
if (arg_getter) {
log_info("Spawning getter %s...", url);
@@
-1021,7
+1021,7
@@
static int dispatch_raw_source_event(sd_event_source *event,
if (remaining > 0)
log_warning("Premature EOF. %zu bytes lost.", remaining);
remove_source(s, source->fd);
if (remaining > 0)
log_warning("Premature EOF. %zu bytes lost.", remaining);
remove_source(s, source->fd);
- log_info("%z
d
active sources remaining", s->active);
+ log_info("%z
u
active sources remaining", s->active);
return 0;
} else if (r == -E2BIG) {
log_error("Entry too big, skipped");
return 0;
} else if (r == -E2BIG) {
log_error("Entry too big, skipped");