projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix printf-tests on W32 by ifdefing the expected output
[platform/upstream/glib.git]
/
glib
/
gdataset.c
diff --git
a/glib/gdataset.c
b/glib/gdataset.c
index
d3c1cbd
..
f054d32
100644
(file)
--- a/
glib/gdataset.c
+++ b/
glib/gdataset.c
@@
-15,8
+15,7
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
/*
*/
/*
@@
-122,9
+121,9
@@
/**
* GData:
*
/**
* GData:
*
- * The #GData struct is an opaque data structure to represent a
<link
- *
linkend="glib-Keyed-Data-Lists">Keyed Data List</link>. It should
- *
only be
accessed via the following functions.
+ * The #GData struct is an opaque data structure to represent a
+ *
[Keyed Data List][glib-Keyed-Data-Lists]. It should only be
+ * accessed via the following functions.
**/
/**
**/
/**
@@
-136,9
+135,6
@@
* should free any memory and resources allocated for it.
**/
* should free any memory and resources allocated for it.
**/
-/* --- defines --- */
-#define G_QUARK_BLOCK_SIZE (2048)
-
#define G_DATALIST_FLAGS_MASK_INTERNAL 0x7
/* datalist pointer accesses have to be carried out atomically */
#define G_DATALIST_FLAGS_MASK_INTERNAL 0x7
/* datalist pointer accesses have to be carried out atomically */
@@
-285,7
+281,7
@@
g_datalist_clear (GData **datalist)
static inline GDataset*
g_dataset_lookup (gconstpointer dataset_location)
{
static inline GDataset*
g_dataset_lookup (gconstpointer dataset_location)
{
-
register
GDataset *dataset;
+ GDataset *dataset;
if (g_dataset_cached && g_dataset_cached->location == dataset_location)
return g_dataset_cached;
if (g_dataset_cached && g_dataset_cached->location == dataset_location)
return g_dataset_cached;
@@
-301,7
+297,7
@@
g_dataset_lookup (gconstpointer dataset_location)
static void
g_dataset_destroy_internal (GDataset *dataset)
{
static void
g_dataset_destroy_internal (GDataset *dataset)
{
-
register
gconstpointer dataset_location;
+ gconstpointer dataset_location;
dataset_location = dataset->location;
while (dataset)
dataset_location = dataset->location;
while (dataset)
@@
-335,7
+331,7
@@
g_dataset_destroy (gconstpointer dataset_location)
G_LOCK (g_dataset_global);
if (g_dataset_location_ht)
{
G_LOCK (g_dataset_global);
if (g_dataset_location_ht)
{
-
register
GDataset *dataset;
+ GDataset *dataset;
dataset = g_dataset_lookup (dataset_location);
if (dataset)
dataset = g_dataset_lookup (dataset_location);
if (dataset)
@@
-556,7
+552,7
@@
g_dataset_id_set_data_full (gconstpointer dataset_location,
gpointer data,
GDestroyNotify destroy_func)
{
gpointer data,
GDestroyNotify destroy_func)
{
-
register
GDataset *dataset;
+ GDataset *dataset;
g_return_if_fail (dataset_location != NULL);
if (!data)
g_return_if_fail (dataset_location != NULL);
if (!data)
@@
-678,10
+674,11
@@
g_datalist_id_set_data_full (GData **datalist,
* g_dataset_id_remove_no_notify:
* @dataset_location: the location identifying the dataset.
* @key_id: the #GQuark ID identifying the data element.
* g_dataset_id_remove_no_notify:
* @dataset_location: the location identifying the dataset.
* @key_id: the #GQuark ID identifying the data element.
- * @Returns: the data previously stored at @key_id, or %NULL if none.
*
* Removes an element, without calling its destroy notification
* function.
*
* Removes an element, without calling its destroy notification
* function.
+ *
+ * Returns: the data previously stored at @key_id, or %NULL if none.
**/
/**
* g_dataset_remove_no_notify:
**/
/**
* g_dataset_remove_no_notify:
@@
-716,10
+713,11
@@
g_dataset_id_remove_no_notify (gconstpointer dataset_location,
* g_datalist_id_remove_no_notify:
* @datalist: a datalist.
* @key_id: the #GQuark identifying a data element.
* g_datalist_id_remove_no_notify:
* @datalist: a datalist.
* @key_id: the #GQuark identifying a data element.
- * @Returns: the data previously stored at @key_id, or %NULL if none.
*
* Removes an element, without calling its destroy notification
* function.
*
* Removes an element, without calling its destroy notification
* function.
+ *
+ * Returns: the data previously stored at @key_id, or %NULL if none.
**/
/**
* g_datalist_remove_no_notify:
**/
/**
* g_datalist_remove_no_notify:
@@
-746,19
+744,21
@@
g_datalist_id_remove_no_notify (GData **datalist,
* g_dataset_id_get_data:
* @dataset_location: the location identifying the dataset.
* @key_id: the #GQuark id to identify the data element.
* g_dataset_id_get_data:
* @dataset_location: the location identifying the dataset.
* @key_id: the #GQuark id to identify the data element.
- * @Returns: the data element corresponding to the #GQuark, or %NULL if
- * it is not found.
*
* Gets the data element corresponding to a #GQuark.
*
* Gets the data element corresponding to a #GQuark.
+ *
+ * Returns: the data element corresponding to the #GQuark, or %NULL if
+ * it is not found.
**/
/**
* g_dataset_get_data:
* @l: the location identifying the dataset.
* @k: the string identifying the data element.
**/
/**
* g_dataset_get_data:
* @l: the location identifying the dataset.
* @k: the string identifying the data element.
- * @Returns: the data element corresponding to the string, or %NULL if
- * it is not found.
*
* Gets the data element corresponding to a string.
*
* Gets the data element corresponding to a string.
+ *
+ * Returns: the data element corresponding to the string, or %NULL if
+ * it is not found.
**/
gpointer
g_dataset_id_get_data (gconstpointer dataset_location,
**/
gpointer
g_dataset_id_get_data (gconstpointer dataset_location,
@@
-903,7
+903,7
@@
g_datalist_id_dup_data (GData **datalist,
* or may not include using @old_destroy as sometimes replacement
* should not destroy the object in the normal way.
*
* or may not include using @old_destroy as sometimes replacement
* should not destroy the object in the normal way.
*
- * Return: %TRUE if the existing value for @key_id was replaced
+ * Return
s
: %TRUE if the existing value for @key_id was replaced
* by @newval, %FALSE otherwise.
*
* Since: 2.34
* by @newval, %FALSE otherwise.
*
* Since: 2.34
@@
-1004,10
+1004,11
@@
g_datalist_id_replace_data (GData **datalist,
* g_datalist_get_data:
* @datalist: a datalist.
* @key: the string identifying a data element.
* g_datalist_get_data:
* @datalist: a datalist.
* @key: the string identifying a data element.
- * @Returns: the data element, or %NULL if it is not found.
*
* Gets a data element, using its string identifier. This is slower than
* g_datalist_id_get_data() because it compares strings.
*
* Gets a data element, using its string identifier. This is slower than
* g_datalist_id_get_data() because it compares strings.
+ *
+ * Returns: the data element, or %NULL if it is not found.
**/
gpointer
g_datalist_get_data (GData **datalist,
**/
gpointer
g_datalist_get_data (GData **datalist,
@@
-1069,7
+1070,7
@@
g_dataset_foreach (gconstpointer dataset_location,
GDataForeachFunc func,
gpointer user_data)
{
GDataForeachFunc func,
gpointer user_data)
{
-
register
GDataset *dataset;
+ GDataset *dataset;
g_return_if_fail (dataset_location != NULL);
g_return_if_fail (func != NULL);
g_return_if_fail (dataset_location != NULL);
g_return_if_fail (func != NULL);
@@
-1216,7
+1217,7
@@
g_datalist_unset_flags (GData **datalist,
* Gets flags values packed in together with the datalist.
* See g_datalist_set_flags().
*
* Gets flags values packed in together with the datalist.
* See g_datalist_set_flags().
*
- * Return
value
: the flags of the datalist
+ * Return
s
: the flags of the datalist
*
* Since: 2.8
**/
*
* Since: 2.8
**/