chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: always explicitly close bus from main programs
[elogind.git]
/
src
/
journal-remote
/
journal-upload-journal.c
diff --git
a/src/journal-remote/journal-upload-journal.c
b/src/journal-remote/journal-upload-journal.c
index a3be1bf8e5d63535eaa3a345f997fbbe167d6c22..1cd52db2c19ae18ff8c3755f1a266b260f23f4cf 100644
(file)
--- a/
src/journal-remote/journal-upload-journal.c
+++ b/
src/journal-remote/journal-upload-journal.c
@@
-21,17
+21,17
@@
static ssize_t write_entry(char *buf, size_t size, Uploader *u) {
switch(u->entry_state) {
case ENTRY_CURSOR: {
switch(u->entry_state) {
case ENTRY_CURSOR: {
- free(u->
las
t_cursor);
- u->
las
t_cursor = NULL;
+ free(u->
curren
t_cursor);
+ u->
curren
t_cursor = NULL;
- r = sd_journal_get_cursor(u->journal, &u->
las
t_cursor);
+ r = sd_journal_get_cursor(u->journal, &u->
curren
t_cursor);
if (r < 0) {
log_error("Failed to get cursor: %s", strerror(-r));
return r;
}
r = snprintf(buf + pos, size - pos,
if (r < 0) {
log_error("Failed to get cursor: %s", strerror(-r));
return r;
}
r = snprintf(buf + pos, size - pos,
- "__CURSOR=%s\n", u->
las
t_cursor);
+ "__CURSOR=%s\n", u->
curren
t_cursor);
if (pos + r > size)
/* not enough space */
return pos;
if (pos + r > size)
/* not enough space */
return pos;
@@
-282,7
+282,7
@@
static size_t journal_input_callback(void *buf, size_t size, size_t nmemb, void
break;
log_debug("Entry %zu (%s) has been uploaded.",
break;
log_debug("Entry %zu (%s) has been uploaded.",
- u->entries_sent, u->
las
t_cursor);
+ u->entries_sent, u->
curren
t_cursor);
}
return filled;
}
return filled;