[libgda] DDL: removed gda_ddl_base_free() and GI annotations updates



commit e0e5cc25eef1a6208a031b314ac138ecb04ad918
Author: Daniel Espinosa <esodan gmail com>
Date:   Mon Sep 10 18:08:32 2018 -0500

    DDL: removed gda_ddl_base_free() and GI annotations updates

 libgda/gda-ddl-base.c      | 19 ++-----------------
 libgda/gda-ddl-buildable.c |  4 ++--
 libgda/gda-ddl-creator.c   |  8 ++++----
 3 files changed, 8 insertions(+), 23 deletions(-)
---
diff --git a/libgda/gda-ddl-base.c b/libgda/gda-ddl-base.c
index 843f08c2e..b587a6f92 100644
--- a/libgda/gda-ddl-base.c
+++ b/libgda/gda-ddl-base.c
@@ -90,8 +90,8 @@ gda_ddl_base_init (GdaDdlBase *self)
 /**
  * gda_ddl_base_set_names:
  * @self: a #GdaDdlBase object
- * @catalog: a catalog name associated with the table
- * @schema: a schema name associated with the table
+ * @catalog: (nullable): a catalog name associated with the table
+ * @schema: (nullable): a schema name associated with the table
  * @name: a table name associated with the table
  *
  * Sets database object names. @catalog and @schema can be %NULL but
@@ -243,21 +243,6 @@ gda_ddl_base_get_name (GdaDdlBase  *self)
   return priv->m_name;
 }
 
-/**
- * gda_ddl_base_free:
- * @self: a #GdaDdlBase instance to free.
- *
- * A convenient method to free the memory.
- * It is a wrapper around g_clear_object().
- *
- * Since: 6.0
- */
-void
-gda_ddl_base_free (GdaDdlBase *self)
-{
-  g_clear_object (&self);
-}
-
 /**
  * gda_ddl_base_set_catalog:
  * @self: a #GdaDdlBase instance
diff --git a/libgda/gda-ddl-buildable.c b/libgda/gda-ddl-buildable.c
index 761534a82..3b5dc7321 100644
--- a/libgda/gda-ddl-buildable.c
+++ b/libgda/gda-ddl-buildable.c
@@ -45,7 +45,7 @@ gda_ddl_buildable_default_init (GdaDdlBuildableInterface *iface)
  * gda_ddl_buildable_parse_node:
  * @self: an instance of #GdaDdlBuildable where parsed data should be storred
  * @node: a node to parse
- * @error: an object to store error
+ * @error: (nullable): an object to store error
  *
  * Parse xml node
  *
@@ -72,7 +72,7 @@ gda_ddl_buildable_parse_node (GdaDdlBuildable  *self,
  * gda_ddl_buildable_write_node:
  * @self: an instance of #GdaDdlBuildable where data should be taken 
  * @node: a node to write data in
- * @error: an object to store error
+ * @error: (nullable): an object to store error
  *
  * Write content from the @self to the @node 
  *
diff --git a/libgda/gda-ddl-creator.c b/libgda/gda-ddl-creator.c
index a3815c7e4..fef83d242 100644
--- a/libgda/gda-ddl-creator.c
+++ b/libgda/gda-ddl-creator.c
@@ -499,11 +499,11 @@ gda_ddl_creator_get_table (GdaDdlCreator *self,
   for (it = priv->mp_tables; it; it = it->next)
       if (!gda_ddl_base_compare (iobj,GDA_DDL_BASE(it->data)))
         {
-          gda_ddl_base_free (iobj);
+          g_object_unref (iobj);
           return GDA_DDL_TABLE(it->data);
         }
 
-  gda_ddl_base_free (iobj);
+  g_object_unref (iobj);
   return NULL;
 }
 
@@ -533,11 +533,11 @@ gda_ddl_creator_get_view (GdaDdlCreator *self,
   for (it = priv->mp_views; it; it = it->next)
     if (!gda_ddl_base_compare (iobj,GDA_DDL_BASE(it)))
       {
-        gda_ddl_base_free (iobj);
+        g_object_unref (iobj);
       return GDA_DDL_VIEW(it);
       }
 
-  gda_ddl_base_free (iobj);
+  g_object_unref (iobj);
   return NULL;
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]