chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unify GREEDY_REALLOC and GREEDY_REALLOC_T
[elogind.git]
/
src
/
journal
/
journal-remote.c
diff --git
a/src/journal/journal-remote.c
b/src/journal/journal-remote.c
index 4ece14ee777b9ce9138cc6bfc0fabf851c2ea827..794298fe6f76a1c09431ed5f1e24ee0fbff479b5 100644
(file)
--- a/
src/journal/journal-remote.c
+++ b/
src/journal/journal-remote.c
@@
-226,8
+226,8
@@
typedef struct MHDDaemonWrapper {
typedef struct RemoteServer {
RemoteSource **sources;
typedef struct RemoteServer {
RemoteSource **sources;
- s
s
ize_t sources_size;
- s
s
ize_t active;
+ size_t sources_size;
+ size_t active;
sd_event *events;
sd_event_source *sigterm_event, *sigint_event, *listen_event;
sd_event *events;
sd_event_source *sigterm_event, *sigint_event, *listen_event;
@@
-257,7
+257,7
@@
static int get_source_for_fd(RemoteServer *s, int fd, RemoteSource **source) {
assert(fd >= 0);
assert(source);
assert(fd >= 0);
assert(source);
- if (!GREEDY_REALLOC0
_T
(s->sources, s->sources_size, fd + 1))
+ if (!GREEDY_REALLOC0(s->sources, s->sources_size, fd + 1))
return log_oom();
if (s->sources[fd] == NULL) {
return log_oom();
if (s->sources[fd] == NULL) {
@@
-276,8
+276,7
@@
static int remove_source(RemoteServer *s, int fd) {
RemoteSource *source;
assert(s);
RemoteSource *source;
assert(s);
- assert(fd >= 0);
- assert(fd < s->sources_size);
+ assert(fd >= 0 && fd < (ssize_t) s->sources_size);
source = s->sources[fd];
if (source) {
source = s->sources[fd];
if (source) {
@@
-837,7
+836,7
@@
static int remoteserver_init(RemoteServer *s) {
static int server_destroy(RemoteServer *s) {
int r;
static int server_destroy(RemoteServer *s) {
int r;
- s
s
ize_t i;
+ size_t i;
MHDDaemonWrapper *d;
r = writer_close(&s->writer);
MHDDaemonWrapper *d;
r = writer_close(&s->writer);
@@
-879,7
+878,7
@@
static int dispatch_raw_source_event(sd_event_source *event,
RemoteSource *source;
int r;
RemoteSource *source;
int r;
- assert(fd
<
s->sources_size);
+ assert(fd
>= 0 && fd < (ssize_t)
s->sources_size);
source = s->sources[fd];
assert(source->fd == fd);
source = s->sources[fd];
assert(source->fd == fd);