[libgda] GdaMetaContext API return values fixes and deleting unused declarations to avoid warnings
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda] GdaMetaContext API return values fixes and deleting unused declarations to avoid warnings
- Date: Tue, 14 Feb 2012 20:27:57 +0000 (UTC)
commit 4b19d1fd8e82846aa3317b06f82199f2f4d53bd4
Author: Daniel Espinosa <despinosa src gnome org>
Date: Mon Feb 13 12:32:51 2012 -0600
GdaMetaContext API return values fixes and deleting unused declarations
to avoid warnings
libgda/gda-data-select.c | 8 ++++----
libgda/gda-meta-store.c | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/libgda/gda-data-select.c b/libgda/gda-data-select.c
index b47e1af..f34cb5f 100644
--- a/libgda/gda-data-select.c
+++ b/libgda/gda-data-select.c
@@ -1884,7 +1884,7 @@ static const GValue *
gda_data_select_get_value_at (GdaDataModel *model, gint col, gint row, GError **error)
{
GdaRow *prow;
- gint int_row, irow;
+ gint int_row;
GdaDataSelect *imodel;
imodel = (GdaDataSelect *) model;
@@ -2119,7 +2119,7 @@ gda_data_select_iter_next (GdaDataModel *model, GdaDataModelIter *iter)
GdaDataSelect *imodel;
GdaRow *prow = NULL;
gint target_iter_row;
- gint irow, int_row;
+ gint int_row;
imodel = (GdaDataSelect *) model;
g_return_val_if_fail (imodel->priv, FALSE);
@@ -2165,7 +2165,7 @@ gda_data_select_iter_prev (GdaDataModel *model, GdaDataModelIter *iter)
GdaDataSelect *imodel;
GdaRow *prow = NULL;
gint target_iter_row;
- gint irow, int_row;
+ gint int_row;
imodel = (GdaDataSelect *) model;
g_return_val_if_fail (imodel->priv, FALSE);
@@ -2213,7 +2213,7 @@ gda_data_select_iter_at_row (GdaDataModel *model, GdaDataModelIter *iter, gint r
{
GdaDataSelect *imodel;
GdaRow *prow = NULL;
- gint irow, int_row, *ptr;
+ gint int_row;
imodel = (GdaDataSelect *) model;
g_return_val_if_fail (imodel->priv, FALSE);
diff --git a/libgda/gda-meta-store.c b/libgda/gda-meta-store.c
index 1f9828d..289e915 100644
--- a/libgda/gda-meta-store.c
+++ b/libgda/gda-meta-store.c
@@ -113,7 +113,7 @@ _gda_meta_context_get_type (void)
GdaMetaContext*
gda_meta_context_new (const gchar* table_name)
{
- g_return_if_fail (table_name);
+ g_return_val_if_fail (table_name, null);
GdaMetaContext *ctx = g_new0 (GdaMetaContext, 1);
ctx->table_name = g_strdup (table_name);
ctx->columns = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify) g_free,
@@ -149,7 +149,7 @@ gda_meta_context_set_table (GdaMetaContext *ctx, const gchar *table_name)
const gchar*
gda_meta_context_get_table (GdaMetaContext *ctx)
{
- g_return_if_fail (ctx);
+ g_return_val_if_fail (ctx, null);
return ctx->table_name;
}
@@ -532,7 +532,7 @@ gda_meta_store_class_init (GdaMetaStoreClass *klass)
/**
* GdaMetaStore::suggest-update:
* @store: the #GdaMetaStore instance that emitted the signal
- * @suggest: the suggested update, as a #GdaMetaContext structure
+ * @suggest: (type Gda.MetaContext): the suggested update, as a #GdaMetaContext structure
*
* This signal is emitted when the contents of a table should be updated (data to update or insert only;
* deleting data is done automatically). This signal is used for internal purposes by the #GdaConnection
@@ -548,7 +548,7 @@ gda_meta_store_class_init (GdaMetaStoreClass *klass)
G_STRUCT_OFFSET (GdaMetaStoreClass, suggest_update),
suggest_update_accumulator, NULL,
_gda_marshal_ERROR__METACONTEXT, G_TYPE_ERROR,
- 1, GDA_TYPE_META_CONTEXT);
+ 1, G_TYPE_POINTER);
/**
* GdaMetaStore::meta-changed:
* @store: the #GdaMetaStore instance that emitted the signal
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]