Handle error. Refs midgardprojectgh-25

piotras · Jan 23, 2012 · c6515f9 · c6515f9
1 parent da2707e
commit c6515f9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 16 deletions.
diff --git a/src/midgard_query_result.c b/src/midgard_query_result.c
@@ -26,60 +26,64 @@ struct _MidgardQueryResult {
  * midgard_query_result_get_objects:
  * @self: #MidgardQueryResult instance
  * @n_objects: (element-type GObject) (array length=n_objects) (transfer full): pointer to store number of returned objects
+ * @error: pointer to store returned error
  *
  * Returns: array of objects available in this result or %NULL
  *
  * Since: 10.06
  */ 
 GObject**
-midgard_query_result_get_objects (MidgardQueryResult *self, guint *n_objects)
+midgard_query_result_get_objects (MidgardQueryResult *self, guint *n_objects, GError **error)
 {
-	MIDGARD_QUERY_RESULT_GET_INTERFACE (self)->get_objects (self, n_objects);
+	MIDGARD_QUERY_RESULT_GET_INTERFACE (self)->get_objects (self, n_objects, error);
 }
 
 /**
  * midgard_query_result_get_columns:
  * @self: #MidgardQueryResult instance
  * @n_objects: (element-type MidgardQueryColumn) (array length=n_objects) (transfer full): pointer to store number of returned objects
+ * @error: pointer to store returned error
  *
  * Returns: array of #MidgardQueryColumn columns available in this result or %NULL
  *
  * Since: 10.06
  */ 
 MidgardQueryColumn**
-midgard_query_result_get_columns (MidgardQueryResult *self, guint *n_objects)
+midgard_query_result_get_columns (MidgardQueryResult *self, guint *n_objects, GError **error)
 {
-	MIDGARD_QUERY_RESULT_GET_INTERFACE (self)->get_columns (self, n_objects);
+	MIDGARD_QUERY_RESULT_GET_INTERFACE (self)->get_columns (self, n_objects, error);
 }
 
 /**
  * midgard_query_result_get_rows:
  * @self: #MidgardQueryResult instance
  * @n_objects: (element-type MidgardQueryRow) (array length=n_objects) (transfer full): pointer to store number of returned objects
+ * @error: pointer to store returned error
  *
  * Returns: array of #MidgardQueryRow rows available in this result or %NULL
  *
  * Since: 10.06
  */ 
 MidgardQueryRow**
-midgard_query_result_get_rows (MidgardQueryResult *self, guint *n_objects)
+midgard_query_result_get_rows (MidgardQueryResult *self, guint *n_objects, GError **error)
 {
-	MIDGARD_QUERY_RESULT_GET_INTERFACE (self)->get_rows (self, n_objects);
+	MIDGARD_QUERY_RESULT_GET_INTERFACE (self)->get_rows (self, n_objects, error);
 }
 
 /**
  * midgard_query_result_get_column_names:
  * @self: #MidgardQueryResult instance
  * @n_names: (array length=n_names) (transfer container): pointer to store number of returned names
+ * @error: pointer to store returned error
  *
  * Returns: array of column names available in this result or %NULL
  *
  * Since: 10.06
  */ 
 gchar**
-midgard_query_result_get_column_names (MidgardQueryResult *self, guint *n_names)
+midgard_query_result_get_column_names (MidgardQueryResult *self, guint *n_names, GError **error)
 {
-	MIDGARD_QUERY_RESULT_GET_INTERFACE (self)->get_column_names (self, n_names);
+	MIDGARD_QUERY_RESULT_GET_INTERFACE (self)->get_column_names (self, n_names, error);
 }
 
 /* GOBJECT ROUTINES */

diff --git a/src/midgard_query_result.h b/src/midgard_query_result.h
@@ -37,17 +37,17 @@ typedef struct _MidgardQueryResultIFace MidgardQueryResultIFace;
 struct _MidgardQueryResultIFace {
 	GTypeInterface parent;
 
-	GObject**		(*get_objects)		(MidgardQueryResult *self, guint *n_objects);
-	MidgardQueryColumn**	(*get_columns)		(MidgardQueryResult *self, guint *n_objects);
-	MidgardQueryRow**	(*get_rows)		(MidgardQueryResult *self, guint *n_objects);
-	gchar**			(*get_column_names)	(MidgardQueryResult *self, guint *n_names);
+	GObject**		(*get_objects)		(MidgardQueryResult *self, guint *n_objects, GError **error);
+	MidgardQueryColumn**	(*get_columns)		(MidgardQueryResult *self, guint *n_objects, GError **error);
+	MidgardQueryRow**	(*get_rows)		(MidgardQueryResult *self, guint *n_objects, GError **error);
+	gchar**			(*get_column_names)	(MidgardQueryResult *self, guint *n_names, GError **error);
 };
 
 GType 			midgard_query_result_get_type		(void);
-GObject**		midgard_query_result_get_objects	(MidgardQueryResult *self, guint *n_objects);
-MidgardQueryColumn**	midgard_query_result_get_columns	(MidgardQueryResult *self, guint *n_objects);
-MidgardQueryRow**	midgard_query_result_get_rows		(MidgardQueryResult *self, guint *n_objects);
-gchar**			midgard_query_result_get_column_names	(MidgardQueryResult *self, guint *n_names);
+GObject**		midgard_query_result_get_objects	(MidgardQueryResult *self, guint *n_objects, GError **error);
+MidgardQueryColumn**	midgard_query_result_get_columns	(MidgardQueryResult *self, guint *n_objects, GError **error);
+MidgardQueryRow**	midgard_query_result_get_rows		(MidgardQueryResult *self, guint *n_objects, GError **error);
+gchar**			midgard_query_result_get_column_names	(MidgardQueryResult *self, guint *n_names, GError **error);
 
 G_END_DECLS