chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
main: restore an accidentally removed 'else'
[elogind.git]
/
src
/
socket.c
diff --git
a/src/socket.c
b/src/socket.c
index 2a5270f336f96458a621ed5d881912efee631f73..3a371917c51ddaf3eb369c16c3fc138f09bbc731 100644
(file)
--- a/
src/socket.c
+++ b/
src/socket.c
@@
-1,4
+1,4
@@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8
; indent-tabs-mode: nil
-*-*/
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-40,6
+40,7
@@
#include "missing.h"
#include "special.h"
#include "bus-errors.h"
#include "missing.h"
#include "special.h"
#include "bus-errors.h"
+#include "label.h"
static const UnitActiveState state_translation_table[_SOCKET_STATE_MAX] = {
[SOCKET_DEAD] = UNIT_INACTIVE,
static const UnitActiveState state_translation_table[_SOCKET_STATE_MAX] = {
[SOCKET_DEAD] = UNIT_INACTIVE,
@@
-165,6
+166,7
@@
static int socket_instantiate_service(Socket *s) {
if (r < 0)
return r;
if (r < 0)
return r;
+ u->meta.no_gc = true;
s->service = SERVICE(u);
return 0;
}
s->service = SERVICE(u);
return 0;
}
@@
-296,7
+298,7
@@
static int socket_add_default_dependencies(Socket *s) {
if ((r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SYSINIT_TARGET, NULL, true)) < 0)
return r;
if ((r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SYSINIT_TARGET, NULL, true)) < 0)
return r;
- return unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICT
S
, SPECIAL_SHUTDOWN_TARGET, NULL, true);
+ return unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICT
ED_BY
, SPECIAL_SHUTDOWN_TARGET, NULL, true);
}
static int socket_load(Unit *u) {
}
static int socket_load(Unit *u) {
@@
-444,14
+446,14
@@
static void socket_dump(Unit *u, FILE *f, const char *prefix) {
if (p->type == SOCKET_SOCKET) {
const char *t;
int r;
if (p->type == SOCKET_SOCKET) {
const char *t;
int r;
- char *k;
+ char *k
= NULL
;
if ((r = socket_address_print(&p->address, &k)) < 0)
t = strerror(-r);
else
t = k;
if ((r = socket_address_print(&p->address, &k)) < 0)
t = strerror(-r);
else
t = k;
- fprintf(f, "%s%s: %s\n", prefix, listen_lookup(p->address.type),
k
);
+ fprintf(f, "%s%s: %s\n", prefix, listen_lookup(p->address.type),
t
);
free(k);
} else
fprintf(f, "%sListenFIFO: %s\n", prefix, p->path);
free(k);
} else
fprintf(f, "%sListenFIFO: %s\n", prefix, p->path);
@@
-1202,6
+1204,8
@@
static void socket_enter_running(Socket *s, int cfd) {
s->service = NULL;
s->n_accepted ++;
s->service = NULL;
s->n_accepted ++;
+ service->meta.no_gc = false;
+
unit_choose_id(UNIT(service), name);
free(name);
unit_choose_id(UNIT(service), name);
free(name);
@@
-1371,7
+1375,6
@@
static int socket_serialize(Unit *u, FILE *f, FDSet *fds) {
static int socket_deserialize_item(Unit *u, const char *key, const char *value, FDSet *fds) {
Socket *s = SOCKET(u);
static int socket_deserialize_item(Unit *u, const char *key, const char *value, FDSet *fds) {
Socket *s = SOCKET(u);
- int r;
assert(u);
assert(key);
assert(u);
assert(key);
@@
-1396,14
+1399,14
@@
static int socket_deserialize_item(Unit *u, const char *key, const char *value,
} else if (streq(key, "n-accepted")) {
unsigned k;
} else if (streq(key, "n-accepted")) {
unsigned k;
- if (
(r = safe_atou(value, &k)
) < 0)
+ if (
safe_atou(value, &k
) < 0)
log_debug("Failed to parse n-accepted value %s", value);
else
s->n_accepted += k;
} else if (streq(key, "control-pid")) {
pid_t pid;
log_debug("Failed to parse n-accepted value %s", value);
else
s->n_accepted += k;
} else if (streq(key, "control-pid")) {
pid_t pid;
- if (
(r = parse_pid(value, &pid)
) < 0)
+ if (
parse_pid(value, &pid
) < 0)
log_debug("Failed to parse control-pid value %s", value);
else
s->control_pid = pid;
log_debug("Failed to parse control-pid value %s", value);
else
s->control_pid = pid;
@@
-1662,7
+1665,7
@@
int socket_collect_fds(Socket *s, int **fds, unsigned *n_fds) {
if (p->fd >= 0)
rn_fds++;
if (p->fd >= 0)
rn_fds++;
- if (!(rfds = new(int, rn_fds))
< 0
)
+ if (!(rfds = new(int, rn_fds)))
return -ENOMEM;
k = 0;
return -ENOMEM;
k = 0;