[Spice-devel] [PATCH spice-gtk 12/15] Add missing includes & make some functions static

[Daniel P. Berrange]

From: "Daniel P. Berrange" <berrange at redhat.com>

A number of functions were used without prior declaration. In
some cases this was due to missing include files. In other cases
the functions should have just been static.

Ideally this would allow -Wmissing-declarations to be enabled, but
the files generated by spice_codegen.py will still trip up on this.
---
 common/marshaller.c       |    2 +-
 common/quic_family_tmpl.c |    4 ++--
 common/ssl_verify.c       |    4 ++--
 gtk/channel-display.c     |    4 ++--
 gtk/display/gnome-rr.c    |    2 +-
 gtk/spice-client.c        |    2 ++
 gtk/spice-util.c          |    1 +
 7 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/common/marshaller.c b/common/marshaller.c
index 8bf3427..57ca32e 100644
--- a/common/marshaller.c
+++ b/common/marshaller.c
@@ -391,7 +391,7 @@ SpiceMarshaller *spice_marshaller_get_ptr_submarshaller(SpiceMarshaller *m, int
     return m2;
 }
 
-uint8_t *lookup_ref(MarshallerRef *ref)
+static uint8_t *lookup_ref(MarshallerRef *ref)
 {
     MarshallerItem *item;
 
diff --git a/common/quic_family_tmpl.c b/common/quic_family_tmpl.c
index 5547c4d..e07596b 100644
--- a/common/quic_family_tmpl.c
+++ b/common/quic_family_tmpl.c
@@ -53,8 +53,8 @@ static void FNAME(golomb_coding)(const BYTE n, const unsigned int l, unsigned in
     }
 }
 
-unsigned int FNAME(golomb_decoding)(const unsigned int l, const unsigned int bits,
-                                    unsigned int * const codewordlen)
+static unsigned int FNAME(golomb_decoding)(const unsigned int l, const unsigned int bits,
+                                           unsigned int * const codewordlen)
 {
     if (bits > VNAME(family).notGRprefixmask[l]) { /*GR*/
         const unsigned int zeroprefix = cnt_l_zeroes(bits);       /* leading zeroes in codeword */
diff --git a/common/ssl_verify.c b/common/ssl_verify.c
index 02e7a20..b19a323 100644
--- a/common/ssl_verify.c
+++ b/common/ssl_verify.c
@@ -258,7 +258,7 @@ static int verify_hostname(X509* cert, const char *hostname)
     return cn_match;
 }
 
-X509_NAME* subject_to_x509_name(const char *subject, int *nentries)
+static X509_NAME* subject_to_x509_name(const char *subject, int *nentries)
 {
     X509_NAME* in_subject;
     const char *p;
@@ -343,7 +343,7 @@ fail:
     return NULL;
 }
 
-int verify_subject(X509* cert, SpiceOpenSSLVerify* verify)
+static int verify_subject(X509* cert, SpiceOpenSSLVerify* verify)
 {
     X509_NAME *cert_subject = NULL;
     int ret;
diff --git a/gtk/channel-display.c b/gtk/channel-display.c
index d728fef..152d6a7 100644
--- a/gtk/channel-display.c
+++ b/gtk/channel-display.c
@@ -549,8 +549,8 @@ static pixman_image_t* image_get_lossless(SpiceImageCache *cache, uint64_t id)
 }
 #endif
 
-SpiceCanvas *surfaces_get(SpiceImageSurfaces *surfaces,
-                          uint32_t surface_id)
+static SpiceCanvas *surfaces_get(SpiceImageSurfaces *surfaces,
+                                 uint32_t surface_id)
 {
     SpiceDisplayChannelPrivate *c =
         SPICE_CONTAINEROF(surfaces, SpiceDisplayChannelPrivate, image_surfaces);
diff --git a/gtk/display/gnome-rr.c b/gtk/display/gnome-rr.c
index 0e02d3e..b1327bd 100644
--- a/gtk/display/gnome-rr.c
+++ b/gtk/display/gnome-rr.c
@@ -195,7 +195,7 @@ screen_info_free (ScreenInfo *info)
     g_free (info);
 }
 
-gboolean
+static gboolean
 has_similar_mode (GnomeRROutput *output, GnomeRRMode *mode)
 {
     int i;
diff --git a/gtk/spice-client.c b/gtk/spice-client.c
index 443bb69..59f2918 100644
--- a/gtk/spice-client.c
+++ b/gtk/spice-client.c
@@ -17,6 +17,8 @@
 */
 #include <glib.h>
 
+#include "spice-client.h"
+
 GQuark spice_client_error_quark(void)
 {
     return g_quark_from_static_string("spice-client-error-quark");
diff --git a/gtk/spice-util.c b/gtk/spice-util.c
index 65454ef..6092a80 100644
--- a/gtk/spice-util.c
+++ b/gtk/spice-util.c
@@ -22,6 +22,7 @@
 #include <glib-object.h>
 #include "spice-util-priv.h"
 #include "spice-util.h"
+#include "spice-util-priv.h"
 
 /**
  * SECTION:spice-util
-- 
1.7.7.6