diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2011-02-09 21:44:45 +0100 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2011-02-28 16:36:35 +0100 |
| commit | 76dc27f08a15bd2cb0e0f536972e361e6d7acc25 (patch) | |
| tree | d44181ebb3408f1573b9e782e2f23d5704d1518a /server/inputs_channel.c | |
| parent | 1a4923c2107c89314714718ca1431d232cc23edf (diff) | |
| download | spice-76dc27f08a15bd2cb0e0f536972e361e6d7acc25.tar.gz spice-76dc27f08a15bd2cb0e0f536972e361e6d7acc25.tar.xz spice-76dc27f08a15bd2cb0e0f536972e361e6d7acc25.zip | |
server: rename s/peer/stream
This is stylish change again. We are talking about a RedStream object,
so let's just name the variable "stream" everywhere, to avoid
confusion with a non existent RedPeer object.
https://bugs.freedesktop.org/show_bug.cgi?id=34795
Diffstat (limited to 'server/inputs_channel.c')
| -rw-r--r-- | server/inputs_channel.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/server/inputs_channel.c b/server/inputs_channel.c index ebf915c1..551da27e 100644 --- a/server/inputs_channel.c +++ b/server/inputs_channel.c @@ -494,14 +494,14 @@ static int inputs_channel_config_socket(RedChannel *channel) int flags; int delay_val = 1; - if (setsockopt(channel->peer->socket, IPPROTO_TCP, TCP_NODELAY, + if (setsockopt(channel->stream->socket, IPPROTO_TCP, TCP_NODELAY, &delay_val, sizeof(delay_val)) == -1) { red_printf("setsockopt failed, %s", strerror(errno)); return FALSE; } - if ((flags = fcntl(channel->peer->socket, F_GETFL)) == -1 || - fcntl(channel->peer->socket, F_SETFL, flags | O_ASYNC) == -1) { + if ((flags = fcntl(channel->stream->socket, F_GETFL)) == -1 || + fcntl(channel->stream->socket, F_SETFL, flags | O_ASYNC) == -1) { red_printf("fcntl failed, %s", strerror(errno)); return FALSE; } @@ -512,7 +512,7 @@ static void inputs_channel_hold_pipe_item(PipeItem *item) { } -static void inputs_link(Channel *channel, RedsStream *peer, int migration, +static void inputs_link(Channel *channel, RedsStream *stream, int migration, int num_common_caps, uint32_t *common_caps, int num_caps, uint32_t *caps) { @@ -521,7 +521,7 @@ static void inputs_link(Channel *channel, RedsStream *peer, int migration, ASSERT(channel->data == NULL); g_inputs_channel = inputs_channel = (InputsChannel*)red_channel_create_parser( - sizeof(*inputs_channel), peer, core, migration, FALSE /* handle_acks */ + sizeof(*inputs_channel), stream, core, migration, FALSE /* handle_acks */ ,inputs_channel_config_socket ,spice_get_client_channel_parser(SPICE_CHANNEL_INPUTS, NULL) ,inputs_channel_handle_parsed |