luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 15:36:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove most use of G_GNUC_INTERNAL

Browse Source 
Now that we use an explicit list of symbols to export, the
G_GNUC_INTERNAL is redundant.

https://bugzilla.gnome.org/show_bug.cgi?id=688681
This commit is contained in:
Colin Walters 2012-11-28 12:00:40 -05:00 committed by Ryan Lortie
parent dbf447292d
commit 6f8f1f7097
18 changed files with 16 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gio/gapplicationimpl.h
View File

@ -11,10 +11,8 @@ typedef struct
GVariant *state; GVariant *state;
} RemoteActionInfo; } RemoteActionInfo;
G_GNUC_INTERNAL
void g_application_impl_destroy (GApplicationImpl *impl); void g_application_impl_destroy (GApplicationImpl *impl);
G_GNUC_INTERNAL
GApplicationImpl * g_application_impl_register (GApplication *application, GApplicationImpl * g_application_impl_register (GApplication *application,
const gchar *appid, const gchar *appid,
GApplicationFlags flags, GApplicationFlags flags,
@ -23,27 +21,21 @@ GApplicationImpl * g_application_impl_register (GApplic
GCancellable *cancellable, GCancellable *cancellable,
GError **error); GError **error);
G_GNUC_INTERNAL
void g_application_impl_activate (GApplicationImpl *impl, void g_application_impl_activate (GApplicationImpl *impl,
GVariant *platform_data); GVariant *platform_data);
G_GNUC_INTERNAL
void g_application_impl_open (GApplicationImpl *impl, void g_application_impl_open (GApplicationImpl *impl,
GFile **files, GFile **files,
gint n_files, gint n_files,
const gchar *hint, const gchar *hint,
GVariant *platform_data); GVariant *platform_data);
G_GNUC_INTERNAL
int g_application_impl_command_line (GApplicationImpl *impl, int g_application_impl_command_line (GApplicationImpl *impl,
gchar **arguments, gchar **arguments,
GVariant *platform_data); GVariant *platform_data);
G_GNUC_INTERNAL
void g_application_impl_flush (GApplicationImpl *impl); void g_application_impl_flush (GApplicationImpl *impl);
G_GNUC_INTERNAL
GDBusConnection * g_application_impl_get_dbus_connection (GApplicationImpl *impl); GDBusConnection * g_application_impl_get_dbus_connection (GApplicationImpl *impl);
G_GNUC_INTERNAL
const gchar * g_application_impl_get_dbus_object_path (GApplicationImpl *impl); const gchar * g_application_impl_get_dbus_object_path (GApplicationImpl *impl);

2
gio/gdbusactiongroup.c
View File

@ -505,7 +505,7 @@ g_dbus_action_group_get (GDBusConnection *connection,
return group; return group;
} }
G_GNUC_INTERNAL gboolean gboolean
g_dbus_action_group_sync (GDBusActionGroup *group, g_dbus_action_group_sync (GDBusActionGroup *group,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)

5
gio/gdelayedsettingsbackend.h
View File

@ -56,17 +56,12 @@ struct _GDelayedSettingsBackend
GDelayedSettingsBackendPrivate *priv; GDelayedSettingsBackendPrivate *priv;
}; };
G_GNUC_INTERNAL
GType g_delayed_settings_backend_get_type (void); GType g_delayed_settings_backend_get_type (void);
G_GNUC_INTERNAL
GDelayedSettingsBackend * g_delayed_settings_backend_new (GSettingsBackend *backend, GDelayedSettingsBackend * g_delayed_settings_backend_new (GSettingsBackend *backend,
gpointer owner, gpointer owner,
GMainContext *owner_context); GMainContext *owner_context);
G_GNUC_INTERNAL
void g_delayed_settings_backend_revert (GDelayedSettingsBackend *delayed); void g_delayed_settings_backend_revert (GDelayedSettingsBackend *delayed);
G_GNUC_INTERNAL
void g_delayed_settings_backend_apply (GDelayedSettingsBackend *delayed); void g_delayed_settings_backend_apply (GDelayedSettingsBackend *delayed);
G_GNUC_INTERNAL
gboolean g_delayed_settings_backend_get_has_unapplied (GDelayedSettingsBackend *delayed); gboolean g_delayed_settings_backend_get_has_unapplied (GDelayedSettingsBackend *delayed);
#endif /* __G_DELAYED_SETTINGS_BACKEND_H__ */ #endif /* __G_DELAYED_SETTINGS_BACKEND_H__ */

1
gio/gregistrysettingsbackend.h
View File

@ -24,7 +24,6 @@
#include <glib-object.h> #include <glib-object.h>
G_GNUC_INTERNAL
GType g_registry_backend_get_type (void); GType g_registry_backend_get_type (void);

3
gio/gsettings-mapping.h
View File

@ -24,15 +24,12 @@
#include <glib-object.h> #include <glib-object.h>
G_GNUC_INTERNAL
GVariant * g_settings_set_mapping (const GValue *value, GVariant * g_settings_set_mapping (const GValue *value,
const GVariantType *expected_type, const GVariantType *expected_type,
gpointer user_data); gpointer user_data);
G_GNUC_INTERNAL
gboolean g_settings_get_mapping (GValue *value, gboolean g_settings_get_mapping (GValue *value,
GVariant *variant, GVariant *variant,
gpointer user_data); gpointer user_data);
G_GNUC_INTERNAL
gboolean g_settings_mapping_is_compatible (GType gvalue_type, gboolean g_settings_mapping_is_compatible (GType gvalue_type,
const GVariantType *variant_type); const GVariantType *variant_type);

15
gio/gsettingsbackendinternal.h
View File

@ -49,59 +49,44 @@ typedef struct
const gchar *path); const gchar *path);
} GSettingsListenerVTable; } GSettingsListenerVTable;
G_GNUC_INTERNAL
void g_settings_backend_watch (GSettingsBackend *backend, void g_settings_backend_watch (GSettingsBackend *backend,
const GSettingsListenerVTable *vtable, const GSettingsListenerVTable *vtable,
GObject *target, GObject *target,
GMainContext *context); GMainContext *context);
G_GNUC_INTERNAL
void g_settings_backend_unwatch (GSettingsBackend *backend, void g_settings_backend_unwatch (GSettingsBackend *backend,
GObject *target); GObject *target);
G_GNUC_INTERNAL
GTree * g_settings_backend_create_tree (void); GTree * g_settings_backend_create_tree (void);
G_GNUC_INTERNAL
GVariant * g_settings_backend_read (GSettingsBackend *backend, GVariant * g_settings_backend_read (GSettingsBackend *backend,
const gchar *key, const gchar *key,
const GVariantType *expected_type, const GVariantType *expected_type,
gboolean default_value); gboolean default_value);
G_GNUC_INTERNAL
gboolean g_settings_backend_write (GSettingsBackend *backend, gboolean g_settings_backend_write (GSettingsBackend *backend,
const gchar *key, const gchar *key,
GVariant *value, GVariant *value,
gpointer origin_tag); gpointer origin_tag);
G_GNUC_INTERNAL
gboolean g_settings_backend_write_tree (GSettingsBackend *backend, gboolean g_settings_backend_write_tree (GSettingsBackend *backend,
GTree *tree, GTree *tree,
gpointer origin_tag); gpointer origin_tag);
G_GNUC_INTERNAL
void g_settings_backend_reset (GSettingsBackend *backend, void g_settings_backend_reset (GSettingsBackend *backend,
const gchar *key, const gchar *key,
gpointer origin_tag); gpointer origin_tag);
G_GNUC_INTERNAL
gboolean g_settings_backend_get_writable (GSettingsBackend *backend, gboolean g_settings_backend_get_writable (GSettingsBackend *backend,
const char *key); const char *key);
G_GNUC_INTERNAL
void g_settings_backend_unsubscribe (GSettingsBackend *backend, void g_settings_backend_unsubscribe (GSettingsBackend *backend,
const char *name); const char *name);
G_GNUC_INTERNAL
void g_settings_backend_subscribe (GSettingsBackend *backend, void g_settings_backend_subscribe (GSettingsBackend *backend,
const char *name); const char *name);
G_GNUC_INTERNAL
GPermission * g_settings_backend_get_permission (GSettingsBackend *backend, GPermission * g_settings_backend_get_permission (GSettingsBackend *backend,
const gchar *path); const gchar *path);
G_GNUC_INTERNAL
void g_settings_backend_sync_default (void); void g_settings_backend_sync_default (void);
G_GNUC_INTERNAL
GType g_null_settings_backend_get_type (void); GType g_null_settings_backend_get_type (void);
G_GNUC_INTERNAL
GType g_memory_settings_backend_get_type (void); GType g_memory_settings_backend_get_type (void);
#ifdef HAVE_COCOA #ifdef HAVE_COCOA
G_GNUC_INTERNAL
GType g_nextstep_settings_backend_get_type (void); GType g_nextstep_settings_backend_get_type (void);
#endif #endif

15
gio/gsettingsschema-internal.h
View File

@ -41,49 +41,34 @@ typedef struct
GVariant *default_value; GVariant *default_value;
} GSettingsSchemaKey; } GSettingsSchemaKey;
G_GNUC_INTERNAL
const gchar * g_settings_schema_get_gettext_domain (GSettingsSchema *schema); const gchar * g_settings_schema_get_gettext_domain (GSettingsSchema *schema);
G_GNUC_INTERNAL
GVariantIter * g_settings_schema_get_value (GSettingsSchema *schema, GVariantIter * g_settings_schema_get_value (GSettingsSchema *schema,
const gchar *key); const gchar *key);
G_GNUC_INTERNAL
gboolean g_settings_schema_has_key (GSettingsSchema *schema, gboolean g_settings_schema_has_key (GSettingsSchema *schema,
const gchar *key); const gchar *key);
G_GNUC_INTERNAL
const GQuark * g_settings_schema_list (GSettingsSchema *schema, const GQuark * g_settings_schema_list (GSettingsSchema *schema,
gint *n_items); gint *n_items);
G_GNUC_INTERNAL
const gchar * g_settings_schema_get_string (GSettingsSchema *schema, const gchar * g_settings_schema_get_string (GSettingsSchema *schema,
const gchar *key); const gchar *key);
G_GNUC_INTERNAL
void g_settings_schema_key_init (GSettingsSchemaKey *key, void g_settings_schema_key_init (GSettingsSchemaKey *key,
GSettingsSchema *schema, GSettingsSchema *schema,
const gchar *name); const gchar *name);
G_GNUC_INTERNAL
void g_settings_schema_key_clear (GSettingsSchemaKey *key); void g_settings_schema_key_clear (GSettingsSchemaKey *key);
G_GNUC_INTERNAL
gboolean g_settings_schema_key_type_check (GSettingsSchemaKey *key, gboolean g_settings_schema_key_type_check (GSettingsSchemaKey *key,
GVariant *value); GVariant *value);
G_GNUC_INTERNAL
gboolean g_settings_schema_key_range_check (GSettingsSchemaKey *key, gboolean g_settings_schema_key_range_check (GSettingsSchemaKey *key,
GVariant *value); GVariant *value);
G_GNUC_INTERNAL
GVariant * g_settings_schema_key_range_fixup (GSettingsSchemaKey *key, GVariant * g_settings_schema_key_range_fixup (GSettingsSchemaKey *key,
GVariant *value); GVariant *value);
G_GNUC_INTERNAL
GVariant * g_settings_schema_key_get_translated_default (GSettingsSchemaKey *key); GVariant * g_settings_schema_key_get_translated_default (GSettingsSchemaKey *key);
G_GNUC_INTERNAL
gint g_settings_schema_key_to_enum (GSettingsSchemaKey *key, gint g_settings_schema_key_to_enum (GSettingsSchemaKey *key,
GVariant *value); GVariant *value);
G_GNUC_INTERNAL
GVariant * g_settings_schema_key_from_enum (GSettingsSchemaKey *key, GVariant * g_settings_schema_key_from_enum (GSettingsSchemaKey *key,
gint value); gint value);
G_GNUC_INTERNAL
guint g_settings_schema_key_to_flags (GSettingsSchemaKey *key, guint g_settings_schema_key_to_flags (GSettingsSchemaKey *key,
GVariant *value); GVariant *value);
G_GNUC_INTERNAL
GVariant * g_settings_schema_key_from_flags (GSettingsSchemaKey *key, GVariant * g_settings_schema_key_from_flags (GSettingsSchemaKey *key,
guint value); guint value);

2
glib/gcharset.c
View File

@ -87,7 +87,7 @@ get_alias_hash (void)
/* As an abuse of the alias table, the following routines gets /* As an abuse of the alias table, the following routines gets
* the charsets that are aliases for the canonical name. * the charsets that are aliases for the canonical name.
*/ */
G_GNUC_INTERNAL const char ** const char **
_g_charset_get_aliases (const char *canonical_name) _g_charset_get_aliases (const char *canonical_name)
{ {
GHashTable *alias_hash = get_alias_hash (); GHashTable *alias_hash = get_alias_hash ();

3
glib/gcharsetprivate.h
View File

@ -25,8 +25,7 @@
G_BEGIN_DECLS G_BEGIN_DECLS
G_GNUC_INTERNAL const char ** _g_charset_get_aliases (const char *canonical_name); const char ** _g_charset_get_aliases (const char *canonical_name);
;
G_END_DECLS G_END_DECLS

2
glib/gconvert.c
View File

@ -229,7 +229,7 @@ try_to_aliases (const char **to_aliases,
return FALSE; return FALSE;
} }
G_GNUC_INTERNAL extern const char ** extern const char **
_g_charset_get_aliases (const char *canonical_name); _g_charset_get_aliases (const char *canonical_name);
/** /**

12
glib/glib-init.h
View File

@ -24,17 +24,17 @@
#include "gmessages.h" #include "gmessages.h"
G_GNUC_INTERNAL extern GLogLevelFlags g_log_always_fatal; extern GLogLevelFlags g_log_always_fatal;
G_GNUC_INTERNAL extern GLogLevelFlags g_log_msg_prefix; extern GLogLevelFlags g_log_msg_prefix;
GLIB_VAR gboolean g_mem_gc_friendly; GLIB_VAR gboolean g_mem_gc_friendly;
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
#include <windows.h> #include <windows.h>
G_GNUC_INTERNAL void g_thread_win32_thread_detach (void); void g_thread_win32_thread_detach (void);
G_GNUC_INTERNAL void g_thread_win32_init (void); void g_thread_win32_init (void);
G_GNUC_INTERNAL void g_clock_win32_init (void); void g_clock_win32_init (void);
G_GNUC_INTERNAL extern HMODULE glib_dll; extern HMODULE glib_dll;
#endif #endif
#endif /* __GLIB_INIT_H__ */ #endif /* __GLIB_INIT_H__ */

3
glib/glib-private.h
View File

@ -23,11 +23,8 @@
#include <glib.h> #include <glib.h>
#include "gwakeup.h" #include "gwakeup.h"
G_GNUC_INTERNAL
GMainContext * g_get_worker_context (void); GMainContext * g_get_worker_context (void);
G_GNUC_INTERNAL
gboolean g_check_setuid (void); gboolean g_check_setuid (void);
G_GNUC_INTERNAL
GMainContext * g_main_context_new_with_next_id (guint next_id); GMainContext * g_main_context_new_with_next_id (guint next_id);
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32

2
glib/gmain.c
View File

@ -2485,7 +2485,7 @@ g_get_real_time (void)
static ULONGLONG (*g_GetTickCount64) (void) = NULL; static ULONGLONG (*g_GetTickCount64) (void) = NULL;
static guint32 g_win32_tick_epoch = 0; static guint32 g_win32_tick_epoch = 0;
G_GNUC_INTERNAL void void
g_clock_win32_init (void) g_clock_win32_init (void)
{ {
HMODULE kernel32; HMODULE kernel32;

2
glib/gmessages.h
View File

@ -116,7 +116,7 @@ GLIB_AVAILABLE_IN_ALL
GLogLevelFlags g_log_set_always_fatal (GLogLevelFlags fatal_mask); GLogLevelFlags g_log_set_always_fatal (GLogLevelFlags fatal_mask);
/* internal */ /* internal */
G_GNUC_INTERNAL void _g_log_fallback_handler (const gchar *log_domain, void _g_log_fallback_handler (const gchar *log_domain,
GLogLevelFlags log_level, GLogLevelFlags log_level,
const gchar *message, const gchar *message,
gpointer unused_data); gpointer unused_data);

4
glib/gthread-win32.c
View File

@ -983,7 +983,7 @@ g_thread_lookup_native_funcs (void)
return TRUE; return TRUE;
} }
G_GNUC_INTERNAL void void
g_thread_win32_init (void) g_thread_win32_init (void)
{ {
if (!g_thread_lookup_native_funcs ()) if (!g_thread_lookup_native_funcs ())
@ -992,7 +992,7 @@ g_thread_win32_init (void)
InitializeCriticalSection (&g_private_lock); InitializeCriticalSection (&g_private_lock);
} }
G_GNUC_INTERNAL void void
g_thread_win32_thread_detach (void) g_thread_win32_thread_detach (void)
{ {
gboolean dtors_called; gboolean dtors_called;

7
glib/gthreadprivate.h
View File

@ -37,24 +37,18 @@ struct _GRealThread
}; };
/* system thread implementation (gthread-posix.c, gthread-win32.c) */ /* system thread implementation (gthread-posix.c, gthread-win32.c) */
G_GNUC_INTERNAL
void g_system_thread_wait (GRealThread *thread); void g_system_thread_wait (GRealThread *thread);
G_GNUC_INTERNAL
GRealThread * g_system_thread_new (GThreadFunc func, GRealThread * g_system_thread_new (GThreadFunc func,
gulong stack_size, gulong stack_size,
GError **error); GError **error);
G_GNUC_INTERNAL
void g_system_thread_free (GRealThread *thread); void g_system_thread_free (GRealThread *thread);
G_GNUC_INTERNAL
void g_system_thread_exit (void); void g_system_thread_exit (void);
G_GNUC_INTERNAL
void g_system_thread_set_name (const gchar *name); void g_system_thread_set_name (const gchar *name);
/* gthread.c */ /* gthread.c */
G_GNUC_INTERNAL
GThread * g_thread_new_internal (const gchar *name, GThread * g_thread_new_internal (const gchar *name,
GThreadFunc proxy, GThreadFunc proxy,
GThreadFunc func, GThreadFunc func,
@ -62,7 +56,6 @@ GThread * g_thread_new_internal (const gchar *name,
gsize stack_size, gsize stack_size,
GError **error); GError **error);
G_GNUC_INTERNAL
gpointer g_thread_proxy (gpointer thread); gpointer g_thread_proxy (gpointer thread);
#endif /* __G_THREADPRIVATE_H__ */ #endif /* __G_THREADPRIVATE_H__ */

5
glib/gunicodeprivate.h
View File

@ -25,9 +25,8 @@
G_BEGIN_DECLS G_BEGIN_DECLS
G_GNUC_INTERNAL gunichar *_g_utf8_normalize_wc gunichar *_g_utf8_normalize_wc (const gchar *str,
(const gchar *str, gssize max_len,
gssize max_len,
GNormalizeMode mode); GNormalizeMode mode);
G_END_DECLS G_END_DECLS

3
glib/gvariant-core.h
View File

@ -27,16 +27,13 @@
/* gvariant-core.c */ /* gvariant-core.c */
G_GNUC_INTERNAL
GVariant * g_variant_new_from_children (const GVariantType *type, GVariant * g_variant_new_from_children (const GVariantType *type,
GVariant **children, GVariant **children,
gsize n_children, gsize n_children,
gboolean trusted); gboolean trusted);
G_GNUC_INTERNAL
gboolean g_variant_is_trusted (GVariant *value); gboolean g_variant_is_trusted (GVariant *value);
G_GNUC_INTERNAL
GVariantTypeInfo * g_variant_get_type_info (GVariant *value); GVariantTypeInfo * g_variant_get_type_info (GVariant *value);
#endif /* __G_VARIANT_CORE_H__ */ #endif /* __G_VARIANT_CORE_H__ */