On Thu, Mar 30, 2017 at 12:26:58PM -0500, Jeremy White wrote: > Hi, > > On 03/16/2017 10:02 AM, Christophe Fergeau wrote: > > The code to enable/disable on a TCP socket is duplicated in multiple > > places in the code base, this commit replaces this duplicated code with > > a helper in RedsStream. > > > > Signed-off-by: Christophe Fergeau <cfergeau@xxxxxxxxxx> > > --- > > server/Makefile.am | 2 ++ > > server/common-graphics-channel.c | 13 ++-------- > > server/net-utils.c | 54 ++++++++++++++++++++++++++++++++++++++++ > > server/net-utils.h | 25 +++++++++++++++++++ > > server/red-channel-client.c | 17 ++----------- > > server/reds-stream.c | 14 +++++++++++ > > server/reds-stream.h | 1 + > > server/reds.c | 8 +++--- > > server/sound.c | 8 +----- > > 9 files changed, 104 insertions(+), 38 deletions(-) > > create mode 100644 server/net-utils.c > > create mode 100644 server/net-utils.h > > > > diff --git a/server/Makefile.am b/server/Makefile.am > > index 49c0822..a771911 100644 > > --- a/server/Makefile.am > > +++ b/server/Makefile.am > > @@ -166,6 +166,8 @@ libserver_la_SOURCES = \ > > image-encoders.c \ > > image-encoders.h \ > > glib-compat.h \ > > + net-utils.c \ > > + net-utils.h \ > > $(spice_built_sources) \ > > $(NULL) > > This didn't apply for me to current tip; looks like there was some > alphabetizing that went in after your patch. > > Also, I needed to include <stdio.h> to get net-utils.c to compile > without error on Debian. Yes, just fixed locally the Makefile.am conflict, I can resend if needed. The missing #include <stdio.h> is the spice-common patch I just sent. Christophe
Attachment:
signature.asc
Description: PGP signature
_______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/spice-devel