RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-05-16 14:58:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: libbtrfs: switch to bare fprintf for error messages

Browse Source 
Don't use the internal message helpers and remove the dependency on
messages.h.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2021-09-22 18:46:04 +02:00
parent 35882be40a
commit 22c2fbd86d
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libbtrfs/send-stream.c
View File

@ -61,7 +61,7 @@ static int read_buf(struct btrfs_send_stream *sctx, char *buf, size_t len)
rbytes = read(sctx->fd, buf + pos, len - pos);
if (rbytes < 0) {
ret = -errno;
error("read from stream failed: %m");
fprintf(stderr, "ERROR: read from stream failed: %m\n");
goto out;
}
if (rbytes == 0) {
@ -74,7 +74,8 @@ static int read_buf(struct btrfs_send_stream *sctx, char *buf, size_t len)
out_eof:
if (0 < pos && pos < len) {
error("short read from stream: expected %zu read %zu", len, pos);
fprintf(stderr, "ERROR: short read from stream: expected %zu read %zu\n",
len, pos);
ret = -EIO;
} else {
sctx->stream_pos += pos;
@ -110,7 +111,7 @@ static int read_cmd(struct btrfs_send_stream *sctx)
goto out;
if (ret) {
ret = -EINVAL;
error("unexpected EOF in stream");
fprintf(stderr, "ERROR: unexpected EOF in stream\n");
goto out;
}
@ -120,7 +121,7 @@ static int read_cmd(struct btrfs_send_stream *sctx)
if (cmd_len + sizeof(*sctx->cmd_hdr) >= sizeof(sctx->read_buf)) {
ret = -EINVAL;
error("command length %u too big for buffer %zu",
fprintf(stderr, "ERROR: command length %u too big for buffer %zu\n",
cmd_len, sizeof(sctx->read_buf));
goto out;
}
@ -131,7 +132,7 @@ static int read_cmd(struct btrfs_send_stream *sctx)
goto out;
if (ret) {
ret = -EINVAL;
error("unexpected EOF in stream");
fprintf(stderr, "ERROR: unexpected EOF in stream\n");
goto out;
}
@ -143,7 +144,7 @@ static int read_cmd(struct btrfs_send_stream *sctx)
if (crc != crc2) {
ret = -EINVAL;
error("crc32 mismatch in command");
fprintf(stderr, "ERROR: crc32 mismatch in command\n");
goto out;
}
@ -158,8 +159,9 @@ static int read_cmd(struct btrfs_send_stream *sctx)
tlv_len = le16_to_cpu(tlv_hdr->tlv_len);
if (tlv_type == 0 || tlv_type > BTRFS_SEND_A_MAX) {
error("invalid tlv in cmd tlv_type = %hu, tlv_len = %hu",
tlv_type, tlv_len);
fprintf(stderr,
"ERROR: invalid tlv in cmd tlv_type = %hu, tlv_len = %hu\n",
tlv_type, tlv_len);
ret = -EINVAL;
goto out;
}
@ -183,14 +185,16 @@ static int tlv_get(struct btrfs_send_stream *sctx, int attr, void **data, int *l
struct btrfs_tlv_header *hdr;
if (attr <= 0 || attr > BTRFS_SEND_A_MAX) {
error("invalid attribute requested, attr = %d", attr);
fprintf(stderr, "ERROR: invalid attribute requested, attr = %d\n",
attr);
ret = -EINVAL;
goto out;
}
hdr = sctx->cmd_attrs[attr];
if (!hdr) {
error("attribute %d requested but not present", attr);
fprintf(stderr, "ERROR: attribute %d requested but not present\n",
attr);
ret = -ENOENT;
goto out;
}
@ -220,8 +224,8 @@ out:
#define TLV_CHECK_LEN(expected, got) \
do { \
if (expected != got) { \
error("invalid size for attribute, " \
"expected = %d, got = %d", \
fprintf(stderr, "ERROR: invalid size for attribute, " \
"expected = %d, got = %d\n", \
(int)expected, (int)got); \
ret = -EINVAL; \
goto tlv_get_failed; \
@ -496,15 +500,16 @@ int btrfs_read_and_process_send_stream(int fd,
if (strcmp(hdr.magic, BTRFS_SEND_STREAM_MAGIC)) {
ret = -EINVAL;
error("unexpected header");
fprintf(stderr, "ERROR: unexpected header\n");
goto out;
}
sctx.version = le32_to_cpu(hdr.version);
if (sctx.version > BTRFS_SEND_STREAM_VERSION) {
ret = -EINVAL;
error("stream version %d not supported, please use newer version",
sctx.version);
fprintf(stderr,
"ERROR: stream version %d not supported, please use newer version\n",
sctx.version);
goto out;
}

3
libbtrfs/send-utils.c
View File

@ -25,7 +25,6 @@
#include "kernel-shared/ctree.h"
#include "libbtrfs/send-utils.h"
#include "common/messages.h"
#include "common/utils.h"
#include "ioctl.h"
#include "btrfs-list.h"
@ -49,7 +48,7 @@ static int btrfs_get_root_id_by_sub_path(int mnt_fd, const char *sub_path,
ret = lookup_path_rootid(subvol_fd, root_id);
if (ret) {
errno = -ret;
error("cannot resolve rootid for path: %m");
fprintf(stderr, "ERROR: cannot resolve rootid for path: %m\n");
}
close(subvol_fd);
return ret;