chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove src/initctl
[elogind.git]
/
src
/
journal
/
compress.c
diff --git
a/src/journal/compress.c
b/src/journal/compress.c
index 9440fcd60ef4638b4aa93d5ba591cdb6eaabe756..383f6a6e9665b84ac280b9d3c57e8f0f847c4f70 100644
(file)
--- a/
src/journal/compress.c
+++ b/
src/journal/compress.c
@@
-19,7
+19,6
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
@@
-356,7
+355,7
@@
int compress_stream_xz(int fdf, int fdt, off_t max_bytes) {
ret = lzma_easy_encoder(&s, LZMA_PRESET_DEFAULT, LZMA_CHECK_CRC64);
if (ret != LZMA_OK) {
ret = lzma_easy_encoder(&s, LZMA_PRESET_DEFAULT, LZMA_CHECK_CRC64);
if (ret != LZMA_OK) {
- log_error("Failed to initialize XZ encoder: code %
d
", ret);
+ log_error("Failed to initialize XZ encoder: code %
u
", ret);
return -EINVAL;
}
return -EINVAL;
}
@@
-391,7
+390,7
@@
int compress_stream_xz(int fdf, int fdt, off_t max_bytes) {
ret = lzma_code(&s, action);
if (ret != LZMA_OK && ret != LZMA_STREAM_END) {
ret = lzma_code(&s, action);
if (ret != LZMA_OK && ret != LZMA_STREAM_END) {
- log_error("Compression failed: code %
d
", ret);
+ log_error("Compression failed: code %
u
", ret);
return -EBADMSG;
}
return -EBADMSG;
}
@@
-512,7
+511,7
@@
int decompress_stream_xz(int fdf, int fdt, off_t max_bytes) {
ret = lzma_stream_decoder(&s, UINT64_MAX, 0);
if (ret != LZMA_OK) {
ret = lzma_stream_decoder(&s, UINT64_MAX, 0);
if (ret != LZMA_OK) {
- log_error("Failed to initialize XZ decoder: code %
d
", ret);
+ log_error("Failed to initialize XZ decoder: code %
u
", ret);
return -ENOMEM;
}
return -ENOMEM;
}
@@
-538,7
+537,7
@@
int decompress_stream_xz(int fdf, int fdt, off_t max_bytes) {
ret = lzma_code(&s, action);
if (ret != LZMA_OK && ret != LZMA_STREAM_END) {
ret = lzma_code(&s, action);
if (ret != LZMA_OK && ret != LZMA_STREAM_END) {
- log_error("Decompression failed: code %
d
", ret);
+ log_error("Decompression failed: code %
u
", ret);
return -EBADMSG;
}
return -EBADMSG;
}
@@
-590,14
+589,12
@@
int decompress_stream_lz4(int fdf, int fdt, off_t max_bytes) {
return log_oom();
for (;;) {
return log_oom();
for (;;) {
- ssize_t
n,
m;
+ ssize_t m;
int r;
int r;
- n = read(fdf, &header, sizeof(header));
- if (n < 0)
- return -errno;
- if (n != sizeof(header))
- return errno ? -errno : -EIO;
+ r = loop_read_exact(fdf, &header, sizeof(header), false);
+ if (r < 0)
+ return r;
m = le32toh(header);
if (m == 0)
m = le32toh(header);
if (m == 0)
@@
-619,12
+616,9
@@
int decompress_stream_lz4(int fdf, int fdt, off_t max_bytes) {
if (!GREEDY_REALLOC(buf, buf_size, m))
return log_oom();
if (!GREEDY_REALLOC(buf, buf_size, m))
return log_oom();
- errno = 0;
- n = loop_read(fdf, buf, m, false);
- if (n < 0)
- return n;
- if (n != m)
- return errno ? -errno : -EIO;
+ r = loop_read_exact(fdf, buf, m, false);
+ if (r < 0)
+ return r;
r = LZ4_decompress_safe_continue(&lz4_data, buf, out, m, 4*LZ4_BUFSIZE);
if (r <= 0)
r = LZ4_decompress_safe_continue(&lz4_data, buf, out, m, 4*LZ4_BUFSIZE);
if (r <= 0)
@@
-637,9
+631,9
@@
int decompress_stream_lz4(int fdf, int fdt, off_t max_bytes) {
return -EFBIG;
}
return -EFBIG;
}
-
n
= loop_write(fdt, out, r, false);
- if (
n
< 0)
- return
n
;
+
r
= loop_write(fdt, out, r, false);
+ if (
r
< 0)
+ return
r
;
}
log_debug("LZ4 decompression finished (%zu -> %zu bytes, %.1f%%)",
}
log_debug("LZ4 decompression finished (%zu -> %zu bytes, %.1f%%)",