[Spice-devel] [PATCH spice-server] Removed some not necessary headers inclusions

Frediano Ziglio fziglio at redhat.com
Fri Feb 22 10:03:34 UTC 2019


> On Thu, 2019-02-21 at 14:41 +0000, Frediano Ziglio wrote:
> > Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
> > ---
> >  server/display-channel.h | 3 ---
> >  server/inputs-channel.h  | 1 -
> >  server/main-dispatcher.h | 1 -
> >  server/red-channel.h     | 1 -
> >  server/red-parse-qxl.h   | 1 -
> >  server/red-record-qxl.h  | 1 -
> >  6 files changed, 8 deletions(-)
> > 
> > diff --git a/server/display-channel.h b/server/display-channel.h
> > index 948018cf3..be853e891 100644
> > --- a/server/display-channel.h
> > +++ b/server/display-channel.h
> > @@ -24,13 +24,10 @@
> >  
> >  #include "reds.h"
> >  #include "red-parse-qxl.h"
> > -#include "red-channel.h"
> >  #include "main-channel.h"
> > -#include "spice-bitmap-utils.h"
> >  #include "tree.h"
> >  #include "video-stream.h"
> >  #include "dcc.h"
> > -#include "image-encoders.h"
> >  #include "common-graphics-channel.h"
> 
> Seems that display-channel.h uses a GlzImageRetention type which is
> defined in image-encoders.h. And BitmapGradualType which is defined in
> spice-bitmap-utils.h. Presumably these headers are indirectly pulled in
> via other includes, but it's unwise to rely on that.
> 
> Other ones below have similar issues. How did you decide to remove
> these headers?
> 
> Reviewed-by: Jonathon Jongsma <jjongsma at redhat.com>
> 

I'll review it, came from an old patch, at a first sight was fine.
I think including spice.h and red-common.h does not make sense, 
including red-common.h means that you know that some headers are
included so there's no reason to include them again.

Frediano

> 
> >  
> >  G_BEGIN_DECLS
> > diff --git a/server/inputs-channel.h b/server/inputs-channel.h
> > index 945ba6173..b771eb1af 100644
> > --- a/server/inputs-channel.h
> > +++ b/server/inputs-channel.h
> > @@ -23,7 +23,6 @@
> >  
> >  #include <stdint.h>
> >  #include <glib-object.h>
> > -#include <spice/vd_agent.h>
> >  
> >  #include "red-channel.h"
> >  
> > diff --git a/server/main-dispatcher.h b/server/main-dispatcher.h
> > index e1244f836..ba3efa2da 100644
> > --- a/server/main-dispatcher.h
> > +++ b/server/main-dispatcher.h
> > @@ -19,7 +19,6 @@
> >  #ifndef MAIN_DISPATCHER_H_
> >  #define MAIN_DISPATCHER_H_
> >  
> > -#include "spice.h"
> >  #include "dispatcher.h"
> >  #include "red-channel.h"
> >  
> > diff --git a/server/red-channel.h b/server/red-channel.h
> > index bb3a95e8b..25ade8579 100644
> > --- a/server/red-channel.h
> > +++ b/server/red-channel.h
> > @@ -29,7 +29,6 @@
> >  #include <common/marshaller.h>
> >  #include <common/demarshallers.h>
> >  
> > -#include "spice.h"
> >  #include "red-common.h"
> >  #include "red-stream.h"
> >  #include "stat.h"
> > diff --git a/server/red-parse-qxl.h b/server/red-parse-qxl.h
> > index 61c71d6e4..d3cacc08f 100644
> > --- a/server/red-parse-qxl.h
> > +++ b/server/red-parse-qxl.h
> > @@ -21,7 +21,6 @@
> >  
> >  #include <spice/qxl_dev.h>
> >  
> > -#include "red-common.h"
> >  #include "memslot.h"
> >  
> >  typedef struct RedDrawable {
> > diff --git a/server/red-record-qxl.h b/server/red-record-qxl.h
> > index d19843279..b40922c86 100644
> > --- a/server/red-record-qxl.h
> > +++ b/server/red-record-qxl.h
> > @@ -21,7 +21,6 @@
> >  
> >  #include <spice/qxl_dev.h>
> >  
> > -#include "red-common.h"
> >  #include "memslot.h"
> >  #include "utils.h"
> >  
> 
> 


More information about the Spice-devel mailing list