[Spice-devel] [PATCH 00/15] Misc cleanup and fixes

Christophe Fergeau cfergeau at redhat.com
Thu Apr 21 04:53:25 PDT 2011


Hi,

Here are more cleanup and fixes I did while looking at spice code.
The main changes are fixes for --enable/--disable in configure.ac,
and the removal of the .cpp wrappers for files from common/ in client/
I assume these wrappers were present to avoid linking issues between
C/C++ code, adding extern "C" fixes this in a cleaner way. I'll
be readding some of these wrappers later on though :-/

The "client: make building client optional" patch might actually not
be wanted, it adds a --enable-client/--disable-client switch to
configure to disable building the spice client (when using spice-gtk).
I'm ok with dropping if you think it's not something we want.

Some of the patches in this series are here to prepare things for the
other patch series I'm about to send which refactors our Makefile.am

This is available as a git tree at http://cgit.freedesktop.org/~teuf/spice/
(careful with this tree, I consider it as a development tree and rewrite
history regularly)

Cheers,

Christophe

Christophe Fergeau (15):
  server: use is_primary_surface
  configure.ac: fix make dist
  configure.ac: fix use of AC_ARG_ENABLE
  configure.ac: remove unused dynamic linkage flag
  configure.ac: replace tab with spaces
  client: make building client optional
  common: add extern "C" guards to headers
  common: add missing header guards to gl_canvas.h
  client: remove c++ wrappers
  server: remove extra arg in reds_on_main_agent_start call
  use foo(void) instead of foo() in prototypes
  server: s/desable/disable
  common: don't try to redefine PANIC if it already exists
  server: add missing GPL header to source files
  add missing licence headers to source files

 Makefile.am                      |    6 ++-
 client/Makefile.am               |   12 ------
 client/canvas_utils.cpp          |   25 ------------
 client/gdi_canvas.cpp            |   24 ------------
 client/gl_canvas.cpp             |   20 ----------
 client/glc.cpp                   |   20 ----------
 client/gui/gui.cpp               |   17 ++++++++
 client/gui/gui.h                 |   17 ++++++++
 client/gui/resource_provider.cpp |   17 ++++++++
 client/gui/resource_provider.h   |   17 ++++++++
 client/gui/softrenderer.cpp      |   17 ++++++++
 client/gui/softrenderer.h        |   17 ++++++++
 client/gui/softtexture.cpp       |   17 ++++++++
 client/gui/softtexture.h         |   16 ++++++++
 client/lines.cpp                 |   24 ------------
 client/lz.cpp                    |   20 ----------
 client/marshaller.cpp            |   24 ------------
 client/mem.cpp                   |   24 ------------
 client/pixman_utils.cpp          |   25 ------------
 client/quic.cpp                  |   20 ----------
 client/region.cpp                |   20 ----------
 client/rop3.cpp                  |   20 ----------
 client/smartcard_channel.cpp     |   16 ++++++++
 client/smartcard_channel.h       |   16 ++++++++
 client/sw_canvas.cpp             |   24 ------------
 client/windows/Makefile.am       |   29 +++++++-------
 client/x11/Makefile.am           |   24 ++++++------
 client/zlib_decoder.cpp          |   16 ++++++++
 common/canvas_base.c             |    2 +
 common/canvas_base.h             |    8 ++++
 common/canvas_utils.h            |    8 ++++
 common/draw.h                    |    8 ++++
 common/gdi_canvas.c              |    2 +-
 common/gdi_canvas.h              |   10 ++++-
 common/gl_canvas.c               |    2 +-
 common/gl_canvas.h               |   14 ++++++-
 common/gl_utils.h                |    8 ++++
 common/glc.h                     |    8 ++++
 common/lines.h                   |    8 ++++
 common/lz.h                      |    7 +++
 common/lz_common.h               |    7 +++
 common/marshaller.h              |    8 ++++
 common/mem.h                     |    7 +++
 common/messages.h                |   10 ++++-
 common/mutex.h                   |    9 ++++
 common/ogl_ctx.h                 |    8 ++++
 common/pixman_utils.h            |    8 ++++
 common/quic.c                    |    2 +-
 common/quic.h                    |   10 ++++-
 common/quic_config.h             |    8 ++++
 common/rect.h                    |    8 ++++
 common/region.h                  |    8 ++++
 common/ring.h                    |    8 ++++
 common/rop3.c                    |    2 +-
 common/rop3.h                    |   11 +++++-
 common/spice_common.h            |    2 +-
 common/sw_canvas.c               |    2 +-
 common/sw_canvas.h               |   10 ++++-
 configure.ac                     |   78 +++++++++++++++++++++-----------------
 server/main_channel.c            |    2 +-
 server/main_channel.h            |    2 +-
 server/red_dispatcher.c          |   14 +++---
 server/red_dispatcher.h          |   10 ++--
 server/red_worker.c              |   11 ++---
 server/reds.c                    |   12 +++---
 server/reds.h                    |   12 +++---
 server/smartcard.c               |   19 +++++++++-
 server/smartcard.h               |   19 +++++++++-
 server/snd_worker.c              |    6 +-
 server/snd_worker.h              |    2 +-
 server/zlib_encoder.c            |   17 ++++++++
 71 files changed, 544 insertions(+), 417 deletions(-)
 delete mode 100644 client/canvas_utils.cpp
 delete mode 100644 client/gdi_canvas.cpp
 delete mode 100644 client/gl_canvas.cpp
 delete mode 100644 client/glc.cpp
 delete mode 100644 client/lines.cpp
 delete mode 100644 client/lz.cpp
 delete mode 100644 client/marshaller.cpp
 delete mode 100644 client/mem.cpp
 delete mode 100644 client/pixman_utils.cpp
 delete mode 100644 client/quic.cpp
 delete mode 100644 client/region.cpp
 delete mode 100644 client/rop3.cpp
 delete mode 100644 client/sw_canvas.cpp

-- 
1.7.4.4



More information about the Spice-devel mailing list