luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-10-31 08:22:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

gvdb-reader: correct whitespace damage

Browse Source
This commit is contained in:
Ryan Lortie
2012-07-05 19:13:58 -04:00
parent 7683c2b796
commit 4e77b52ad8
1 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
gvdb-reader.c
View File

@@ -128,13 +128,13 @@ gvdb_table_setup_root (GvdbTable *file,
static GvdbTable * static GvdbTable *
new_from_data (const void *data, new_from_data (const void *data,
gsize data_len, gsize data_len,
gboolean trusted, gboolean trusted,
gpointer user_data, gpointer user_data,
GvdbRefFunc ref, GvdbRefFunc ref,
GDestroyNotify unref, GDestroyNotify unref,
const char *filename, const char *filename,
GError **error) GError **error)
{ {
GvdbTable *file; GvdbTable *file;
@@ -163,15 +163,15 @@ new_from_data (const void *data,
else else
{ {
if (filename) if (filename)
g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL, g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL,
"%s: invalid header", filename); "%s: invalid header", filename);
else else
g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL, g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL,
"invalid gvdb header"); "invalid gvdb header");
g_slice_free (GvdbTable, file); g_slice_free (GvdbTable, file);
if (unref) if (unref)
unref (user_data); unref (user_data);
return NULL; return NULL;
} }
@@ -213,13 +213,13 @@ gvdb_table_new (const gchar *filename,
return NULL; return NULL;
return new_from_data (g_mapped_file_get_contents (mapped), return new_from_data (g_mapped_file_get_contents (mapped),
g_mapped_file_get_length (mapped), g_mapped_file_get_length (mapped),
trusted, trusted,
mapped, mapped,
(GvdbRefFunc)g_mapped_file_ref, (GvdbRefFunc)g_mapped_file_ref,
(GDestroyNotify)g_mapped_file_unref, (GDestroyNotify)g_mapped_file_unref,
filename, filename,
error); error);
} }
/** /**
@@ -242,18 +242,18 @@ gvdb_table_new (const gchar *filename,
**/ **/
GvdbTable * GvdbTable *
gvdb_table_new_from_data (const void *data, gvdb_table_new_from_data (const void *data,
gsize data_len, gsize data_len,
gboolean trusted, gboolean trusted,
gpointer user_data, gpointer user_data,
GvdbRefFunc ref, GvdbRefFunc ref,
GDestroyNotify unref, GDestroyNotify unref,
GError **error) GError **error)
{ {
return new_from_data (data, data_len, return new_from_data (data, data_len,
trusted, trusted,
user_data, ref, unref, user_data, ref, unref,
NULL, NULL,
error); error);
} }
static gboolean static gboolean
@@ -618,7 +618,7 @@ gvdb_table_unref (GvdbTable *file)
if (g_atomic_int_dec_and_test (&file->ref_count)) if (g_atomic_int_dec_and_test (&file->ref_count))
{ {
if (file->unref_user_data) if (file->unref_user_data)
file->unref_user_data (file->user_data); file->unref_user_data (file->user_data);
g_slice_free (GvdbTable, file); g_slice_free (GvdbTable, file);
} }
} }