[Spice-devel] [spice-common v2 3/3] build: Remove spice_common.h

[Christophe Fergeau]

Most users of spice_common.h don't need it, or only need log.h. It only
has a few users outside of spice-common. It's not very well defined
which headers it should contain. This commit removes spice_common.h in
favour of direct inclusion of the needed headers.

Signed-off-by: Christophe Fergeau <cfergeau at redhat.com>
---
 common/Makefile.am    |  1 -
 common/backtrace.c    |  4 ++--
 common/canvas_utils.c |  1 -
 common/lz.c           |  1 -
 common/mem.c          |  1 -
 common/meson.build    |  1 -
 common/pixman_utils.c |  1 -
 common/quic.c         |  2 +-
 common/ring.h         |  2 +-
 common/rop3.c         |  1 -
 common/spice_common.h | 31 -------------------------------
 11 files changed, 4 insertions(+), 42 deletions(-)
 delete mode 100644 common/spice_common.h

diff --git a/common/Makefile.am b/common/Makefile.am
index 3cbc49f..5332c77 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -51,7 +51,6 @@ libspice_common_la_SOURCES =		\
 	rop3.h				\
 	snd_codec.c			\
 	snd_codec.h			\
-	spice_common.h			\
 	verify.h			\
 	$(NULL)
 
diff --git a/common/backtrace.c b/common/backtrace.c
index 6e0d61b..c4edde1 100644
--- a/common/backtrace.c
+++ b/common/backtrace.c
@@ -24,10 +24,10 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "spice_common.h"
 
-#include <unistd.h>
 #include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
 #ifndef __MINGW32__
diff --git a/common/canvas_utils.c b/common/canvas_utils.c
index a95501f..e5f4efb 100644
--- a/common/canvas_utils.c
+++ b/common/canvas_utils.c
@@ -18,7 +18,6 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "spice_common.h"
 
 #include "canvas_utils.h"
 #include "mem.h"
diff --git a/common/lz.c b/common/lz.c
index b7e7d48..87c13db 100644
--- a/common/lz.c
+++ b/common/lz.c
@@ -47,7 +47,6 @@
 #include <config.h>
 #endif
 
-#include "spice_common.h"
 #include "lz.h"
 
 #define HASH_LOG 13
diff --git a/common/mem.c b/common/mem.c
index 8b96548..8779282 100644
--- a/common/mem.c
+++ b/common/mem.c
@@ -19,7 +19,6 @@
 #include <config.h>
 #endif
 
-#include "spice_common.h"
 #include "mem.h"
 
 #include <string.h>
diff --git a/common/meson.build b/common/meson.build
index 22dcbb8..9044aa9 100644
--- a/common/meson.build
+++ b/common/meson.build
@@ -34,7 +34,6 @@ spice_common_sources = [
   'rop3.h',
   'snd_codec.c',
   'snd_codec.h',
-  'spice_common.h',
   'verify.h'
 ]
 
diff --git a/common/pixman_utils.c b/common/pixman_utils.c
index 5d1c15c..b7cf25c 100644
--- a/common/pixman_utils.c
+++ b/common/pixman_utils.c
@@ -18,7 +18,6 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "spice_common.h"
 
 #include "pixman_utils.h"
 
diff --git a/common/quic.c b/common/quic.c
index 90aac85..a2934cb 100644
--- a/common/quic.c
+++ b/common/quic.c
@@ -26,7 +26,7 @@
 #include <glib.h>
 
 #include "quic.h"
-#include "spice_common.h"
+#include "log.h"
 
 /* ASCII "QUIC" */
 #define QUIC_MAGIC 0x43495551
diff --git a/common/ring.h b/common/ring.h
index 1ed3576..4fd35ef 100644
--- a/common/ring.h
+++ b/common/ring.h
@@ -19,7 +19,7 @@
 #ifndef _H_RING2
 #define _H_RING2
 
-#include "spice_common.h"
+#include "log.h"
 
 SPICE_BEGIN_DECLS
 
diff --git a/common/rop3.c b/common/rop3.c
index 2a0a167..75fec12 100644
--- a/common/rop3.c
+++ b/common/rop3.c
@@ -20,7 +20,6 @@
 #endif
 
 #include "rop3.h"
-#include "spice_common.h"
 
 typedef void (*rop3_with_pattern_handler_t)(pixman_image_t *d, pixman_image_t *s,
                                             SpicePoint *src_pos, pixman_image_t *p,
diff --git a/common/spice_common.h b/common/spice_common.h
deleted file mode 100644
index c7b6e8e..0000000
--- a/common/spice_common.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-   Copyright (C) 2009 Red Hat, Inc.
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef H_SPICE_COMMON
-#define H_SPICE_COMMON
-
-#include <stdio.h>
-#include <stdint.h>
-#include <time.h>
-#include <stdlib.h>
-#include <stddef.h>
-
-#include <spice/macros.h>
-#include "backtrace.h"
-#include "log.h"
-
-#endif
-- 
2.17.1