pxcloud/spice-common
6
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice-common synced 2026-08-08 08:22:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

quic: remove Channel::encoder

Browse Source 
This field is easily accessible from Encoder structure.

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
This commit is contained in:
Frediano Ziglio 2017-08-03 22:09:07 +01:00
parent 3306492247
commit 6a882282f1
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/quic.c
View File

@ -133,8 +133,6 @@ typedef struct FamilyStat {
} FamilyStat;
typedef struct Channel {
Encoder *encoder;
int correlate_row_width;
BYTE *correlate_row;
@ -994,7 +992,6 @@ static int init_channel(Encoder *encoder, Channel *channel)
unsigned int n_buckets;
unsigned int n_buckets_ptrs;
channel->encoder = encoder;
channel->correlate_row_width = 0;
channel->correlate_row = NULL;
@ -1020,9 +1017,9 @@ static int init_channel(Encoder *encoder, Channel *channel)
return TRUE;
}
static void destroy_channel(Channel *channel)
static void destroy_channel(Encoder *encoder, Channel *channel)
{
QuicUsrContext *usr = channel->encoder->usr;
QuicUsrContext *usr = encoder->usr;
if (channel->correlate_row) {
usr->free(usr, channel->correlate_row - 1);
}
@ -1039,7 +1036,7 @@ static int init_encoder(Encoder *encoder, QuicUsrContext *usr)
for (i = 0; i < MAX_CHANNELS; i++) {
if (!init_channel(encoder, &encoder->channels[i])) {
for (--i; i >= 0; i--) {
destroy_channel(&encoder->channels[i]);
destroy_channel(encoder, &encoder->channels[i]);
}
return FALSE;
}
@ -1638,7 +1635,7 @@ void quic_destroy(QuicContext *quic)
}
for (i = 0; i < MAX_CHANNELS; i++) {
destroy_channel(&encoder->channels[i]);
destroy_channel(encoder, &encoder->channels[i]);
}
encoder->usr->free(encoder->usr, encoder);
}