[glib] gio static fixups
- From: Ryan Lortie <ryanl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] gio static fixups
- Date: Mon, 17 Oct 2011 01:41:45 +0000 (UTC)
commit 09429e2c820118918e6132d32884eb02203136d4
Author: Ryan Lortie <desrt desrt ca>
Date: Sun Oct 16 21:24:45 2011 -0400
gio static fixups
gio/gapplicationimpl-dbus.c | 2 +-
gio/giomodule.c | 2 +-
gio/gkeyfilesettingsbackend.c | 2 +-
gio/gnetworkaddress.c | 1 +
gio/gnetworkservice.c | 1 +
gio/gsettingsschema.c | 2 ++
gio/gsimpleaction.c | 2 +-
gio/gsocketaddress.c | 1 +
gio/gsocketclient.c | 2 +-
gio/gsrvtarget.c | 2 +-
gio/gtlscertificate.c | 4 ++--
11 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/gio/gapplicationimpl-dbus.c b/gio/gapplicationimpl-dbus.c
index 7be5627..9eeb344 100644
--- a/gio/gapplicationimpl-dbus.c
+++ b/gio/gapplicationimpl-dbus.c
@@ -434,7 +434,7 @@ unwrap_fake_maybe (GVariant **value)
*value = tmp;
}
-RemoteActionInfo *
+static RemoteActionInfo *
remote_action_info_new_from_iter (GVariantIter *iter)
{
RemoteActionInfo *info;
diff --git a/gio/giomodule.c b/gio/giomodule.c
index fa8aea2..eb8b35f 100644
--- a/gio/giomodule.c
+++ b/gio/giomodule.c
@@ -1028,7 +1028,7 @@ g_io_extension_point_get_required_type (GIOExtensionPoint *extension_point)
return extension_point->required_type;
}
-void
+static void
lazy_load_modules (GIOExtensionPoint *extension_point)
{
GIOModule *module;
diff --git a/gio/gkeyfilesettingsbackend.c b/gio/gkeyfilesettingsbackend.c
index f61bb8b..05bb10d 100644
--- a/gio/gkeyfilesettingsbackend.c
+++ b/gio/gkeyfilesettingsbackend.c
@@ -168,7 +168,7 @@ convert_path (GKeyfileSettingsBackend *kfsb,
return TRUE;
}
-gboolean
+static gboolean
path_is_valid (GKeyfileSettingsBackend *kfsb,
const gchar *path)
{
diff --git a/gio/gnetworkaddress.c b/gio/gnetworkaddress.c
index e9a9b98..78ee08b 100644
--- a/gio/gnetworkaddress.c
+++ b/gio/gnetworkaddress.c
@@ -794,6 +794,7 @@ typedef struct {
} GNetworkAddressAddressEnumeratorClass;
+static GType _g_network_address_address_enumerator_get_type (void);
G_DEFINE_TYPE (GNetworkAddressAddressEnumerator, _g_network_address_address_enumerator, G_TYPE_SOCKET_ADDRESS_ENUMERATOR)
static void
diff --git a/gio/gnetworkservice.c b/gio/gnetworkservice.c
index a31433d..febe11b 100644
--- a/gio/gnetworkservice.c
+++ b/gio/gnetworkservice.c
@@ -405,6 +405,7 @@ typedef struct {
} GNetworkServiceAddressEnumeratorClass;
+static GType _g_network_service_address_enumerator_get_type (void);
G_DEFINE_TYPE (GNetworkServiceAddressEnumerator, _g_network_service_address_enumerator, G_TYPE_SOCKET_ADDRESS_ENUMERATOR)
static GSocketAddress *
diff --git a/gio/gsettingsschema.c b/gio/gsettingsschema.c
index c881ebe..bf3243b 100644
--- a/gio/gsettingsschema.c
+++ b/gio/gsettingsschema.c
@@ -20,6 +20,8 @@
#include "config.h"
#include "gsettingsschema.h"
+#include "gsettings.h"
+
#include "gvdb/gvdb-reader.h"
#include <glibintl.h>
diff --git a/gio/gsimpleaction.c b/gio/gsimpleaction.c
index 2456b16..b87f802 100644
--- a/gio/gsimpleaction.c
+++ b/gio/gsimpleaction.c
@@ -80,7 +80,7 @@ g_simple_action_get_name (GAction *action)
return simple->name;
}
-const GVariantType *
+static const GVariantType *
g_simple_action_get_parameter_type (GAction *action)
{
GSimpleAction *simple = G_SIMPLE_ACTION (action);
diff --git a/gio/gsocketaddress.c b/gio/gsocketaddress.c
index 72fdd78..477f720 100644
--- a/gio/gsocketaddress.c
+++ b/gio/gsocketaddress.c
@@ -315,6 +315,7 @@ typedef struct {
} GSocketAddressAddressEnumeratorClass;
+static GType _g_socket_address_address_enumerator_get_type (void);
G_DEFINE_TYPE (GSocketAddressAddressEnumerator, _g_socket_address_address_enumerator, G_TYPE_SOCKET_ADDRESS_ENUMERATOR)
static void
diff --git a/gio/gsocketclient.c b/gio/gsocketclient.c
index 814f0e8..821bcd2 100644
--- a/gio/gsocketclient.c
+++ b/gio/gsocketclient.c
@@ -138,7 +138,7 @@ create_socket (GSocketClient *client,
return socket;
}
-gboolean
+static gboolean
can_use_proxy (GSocketClient *client)
{
GSocketClientPrivate *priv = client->priv;
diff --git a/gio/gsrvtarget.c b/gio/gsrvtarget.c
index 21c0575..3422750 100644
--- a/gio/gsrvtarget.c
+++ b/gio/gsrvtarget.c
@@ -203,7 +203,7 @@ g_srv_target_get_weight (GSrvTarget *target)
return target->weight;
}
-gint
+static gint
compare_target (gconstpointer a, gconstpointer b)
{
GSrvTarget *ta = (GSrvTarget *)a;
diff --git a/gio/gtlscertificate.c b/gio/gtlscertificate.c
index 6e8eaf7..56382d5 100644
--- a/gio/gtlscertificate.c
+++ b/gio/gtlscertificate.c
@@ -209,7 +209,7 @@ g_tls_certificate_new_internal (const gchar *certificate_pem,
#define PEM_PRIVKEY_HEADER "-----BEGIN RSA PRIVATE KEY-----"
#define PEM_PRIVKEY_FOOTER "-----END RSA PRIVATE KEY-----"
-gchar *
+static gchar *
parse_private_key (const gchar *data,
gsize data_len,
gboolean required,
@@ -243,7 +243,7 @@ parse_private_key (const gchar *data,
}
-gchar *
+static gchar *
parse_next_pem_certificate (const gchar **data,
const gchar *data_end,
gboolean required,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]