pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-01-10 06:56:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove extra '\n' from red_printf() calls

Browse Source 
red_printf() takes care of adding a newline to all messages; remove the
extra newline from all messages and macros that were doubling them up.

Signed-off-by: Dan McGee <dpmcgee@gmail.com>
This commit is contained in:
Dan McGee 2012-02-14 09:57:54 -06:00 committed by Alon Levy
parent e4a92b177a
commit 08c514ee85
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/spice_common.h
View File

@ -55,7 +55,7 @@
} \
} while (0)
#define WARN(format, ...) red_printf("warning: "format"\n", ##__VA_ARGS__ );
#define WARN(format, ...) red_printf("warning: "format, ##__VA_ARGS__ );
#define WARN_ONCE red_printf_once
#define red_printf_some(every, format, ...) do { \

12
server/dispatcher.c
View File

@ -103,7 +103,7 @@ static int dispatcher_handle_single_read(Dispatcher *dispatcher)
uint32_t ack = ACK;
if ((ret = read_safe(dispatcher->recv_fd, &type, sizeof(type), 0)) == -1) {
red_printf("error reading from dispatcher: %d\n", errno);
red_printf("error reading from dispatcher: %d", errno);
return 0;
}
if (ret == 0) {
@ -112,19 +112,19 @@ static int dispatcher_handle_single_read(Dispatcher *dispatcher)
}
msg = &dispatcher->messages[type];
if (read_safe(dispatcher->recv_fd, payload, msg->size, 1) == -1) {
red_printf("error reading from dispatcher: %d\n", errno);
red_printf("error reading from dispatcher: %d", errno);
/* TODO: close socketpair? */
return 0;
}
if (msg->handler) {
msg->handler(dispatcher->opaque, (void *)payload);
} else {
red_printf("error: no handler for message type %d\n", type);
red_printf("error: no handler for message type %d", type);
}
if (msg->ack == DISPATCHER_ACK) {
if (write_safe(dispatcher->recv_fd,
&ack, sizeof(ack)) == -1) {
red_printf("error writing ack for message %d\n", type);
red_printf("error writing ack for message %d", type);
/* TODO: close socketpair? */
}
} else if (msg->ack == DISPATCHER_ASYNC && dispatcher->handle_async_done) {
@ -156,12 +156,12 @@ void dispatcher_send_message(Dispatcher *dispatcher, uint32_t message_type,
msg = &dispatcher->messages[message_type];
pthread_mutex_lock(&dispatcher->lock);
if (write_safe(send_fd, &message_type, sizeof(message_type)) == -1) {
red_printf("error: failed to send message type for message %d\n",
red_printf("error: failed to send message type for message %d",
message_type);
goto unlock;
}
if (write_safe(send_fd, payload, msg->size) == -1) {
red_printf("error: failed to send message body for message %d\n",
red_printf("error: failed to send message body for message %d",
message_type);
goto unlock;
}

2
server/red_worker.c
View File

@ -10465,7 +10465,7 @@ static void dev_destroy_primary_surface(RedWorker *worker, uint32_t surface_id)
PANIC_ON(surface_id != 0);
if (!worker->surfaces[surface_id].context.canvas) {
red_printf("double destroy of primary surface\n");
red_printf("double destroy of primary surface");
return;
}

2
server/snd_worker.c
View File

@ -204,7 +204,7 @@ static SndChannel *snd_channel_put(SndChannel *channel)
if (!--channel->refs) {
channel->worker->connection = NULL;
free(channel);
red_printf("sound channel freed\n");
red_printf("sound channel freed");
return NULL;
}
return channel;