luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-10 03:04:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

gquark: simplify g_intern_string/g_intern_static_string

Browse Source 
Move the common code to a quark_intern_string_locked function. This has
no effect on the generated code but makes codebase a bit cleaner.

https://bugzilla.gnome.org/show_bug.cgi?id=768507
This commit is contained in:
Natanael Copa
2016-07-06 17:05:16 +02:00
committed by Philip Withnall
parent 2f07630b43
commit d933cf99bf
1 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
glib/gquark.c
View File

@@ -299,6 +299,24 @@ quark_new (gchar *string)
return quark; return quark;
} }
static inline const gchar *
quark_intern_string_locked (const gchar *string,
gboolean duplicate)
{
const gchar *result;
GQuark quark;
if (!string)
return NULL;
G_LOCK (quark_global);
quark = quark_from_string (string, duplicate);
result = quarks[quark];
G_UNLOCK (quark_global);
return result;
}
/** /**
* g_intern_string: * g_intern_string:
* @string: (nullable): a string * @string: (nullable): a string
@@ -314,18 +332,7 @@ quark_new (gchar *string)
const gchar * const gchar *
g_intern_string (const gchar *string) g_intern_string (const gchar *string)
{ {
const gchar *result; return quark_intern_string_locked (string, TRUE);
GQuark quark;
if (!string)
return NULL;
G_LOCK (quark_global);
quark = quark_from_string (string, TRUE);
result = quarks[quark];
G_UNLOCK (quark_global);
return result;
} }
/** /**
@@ -344,16 +351,5 @@ g_intern_string (const gchar *string)
const gchar * const gchar *
g_intern_static_string (const gchar *string) g_intern_static_string (const gchar *string)
{ {
GQuark quark; return quark_intern_string_locked (string, FALSE);
const gchar *result;
if (!string)
return NULL;
G_LOCK (quark_global);
quark = quark_from_string (string, FALSE);
result = quarks[quark];
G_UNLOCK (quark_global);
return result;
} }