motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-12-18 05:28:36 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not use dprintf

Browse source 
dprintf is already claimed by POSIX[1], and on at least one system
is implemented as a macro

[1] http://www.opengroup.org/onlinepubs/9699919799/functions/dprintf.html

Signed-off-by: malc <av1474@comtv.ru>
This commit is contained in:
malc 2010-02-07 02:03:50 +03:00
parent bc4347b883
commit d0f2c4c602
14 changed files with 204 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

36
buffered_file.c
View file

@ -39,10 +39,10 @@ typedef struct QEMUFileBuffered
} QEMUFileBuffered;
#ifdef DEBUG_BUFFERED_FILE
#define dprintf(fmt, ...) \
#define DPRINTF(fmt, ...) \
do { printf("buffered-file: " fmt, ## __VA_ARGS__); } while (0)
#else
#define dprintf(fmt, ...) \
#define DPRINTF(fmt, ...) \
do { } while (0)
#endif
@ -52,7 +52,7 @@ static void buffered_append(QEMUFileBuffered *s,
if (size > (s->buffer_capacity - s->buffer_size)) {
void *tmp;
dprintf("increasing buffer capacity from %zu by %zu\n",
DPRINTF("increasing buffer capacity from %zu by %zu\n",
s->buffer_capacity, size + 1024);
s->buffer_capacity += size + 1024;
@ -75,11 +75,11 @@ static void buffered_flush(QEMUFileBuffered *s)
size_t offset = 0;
if (s->has_error) {
dprintf("flush when error, bailing\n");
DPRINTF("flush when error, bailing\n");
return;
}
dprintf("flushing %zu byte(s) of data\n", s->buffer_size);
DPRINTF("flushing %zu byte(s) of data\n", s->buffer_size);
while (offset < s->buffer_size) {
ssize_t ret;
@ -87,22 +87,22 @@ static void buffered_flush(QEMUFileBuffered *s)
ret = s->put_buffer(s->opaque, s->buffer + offset,
s->buffer_size - offset);
if (ret == -EAGAIN) {
dprintf("backend not ready, freezing\n");
DPRINTF("backend not ready, freezing\n");
s->freeze_output = 1;
break;
}
if (ret <= 0) {
dprintf("error flushing data, %zd\n", ret);
DPRINTF("error flushing data, %zd\n", ret);
s->has_error = 1;
break;
} else {
dprintf("flushed %zd byte(s)\n", ret);
DPRINTF("flushed %zd byte(s)\n", ret);
offset += ret;
}
}
dprintf("flushed %zu of %zu byte(s)\n", offset, s->buffer_size);
DPRINTF("flushed %zu of %zu byte(s)\n", offset, s->buffer_size);
memmove(s->buffer, s->buffer + offset, s->buffer_size - offset);
s->buffer_size -= offset;
}
@ -113,45 +113,45 @@ static int buffered_put_buffer(void *opaque, const uint8_t *buf, int64_t pos, in
int offset = 0;
ssize_t ret;
dprintf("putting %d bytes at %" PRId64 "\n", size, pos);
DPRINTF("putting %d bytes at %" PRId64 "\n", size, pos);
if (s->has_error) {
dprintf("flush when error, bailing\n");
DPRINTF("flush when error, bailing\n");
return -EINVAL;
}
dprintf("unfreezing output\n");
DPRINTF("unfreezing output\n");
s->freeze_output = 0;
buffered_flush(s);
while (!s->freeze_output && offset < size) {
if (s->bytes_xfer > s->xfer_limit) {
dprintf("transfer limit exceeded when putting\n");
DPRINTF("transfer limit exceeded when putting\n");
break;
}
ret = s->put_buffer(s->opaque, buf + offset, size - offset);
if (ret == -EAGAIN) {
dprintf("backend not ready, freezing\n");
DPRINTF("backend not ready, freezing\n");
s->freeze_output = 1;
break;
}
if (ret <= 0) {
dprintf("error putting\n");
DPRINTF("error putting\n");
s->has_error = 1;
offset = -EINVAL;
break;
}
dprintf("put %zd byte(s)\n", ret);
DPRINTF("put %zd byte(s)\n", ret);
offset += ret;
s->bytes_xfer += ret;
}
if (offset >= 0) {
dprintf("buffering %d bytes\n", size - offset);
DPRINTF("buffering %d bytes\n", size - offset);
buffered_append(s, buf + offset, size - offset);
offset = size;
}
@ -164,7 +164,7 @@ static int buffered_close(void *opaque)
QEMUFileBuffered *s = opaque;
int ret;
dprintf("closing\n");
DPRINTF("closing\n");
while (!s->has_error && s->buffer_size) {
buffered_flush(s);