diff options
author | Ray Strode <rstrode@redhat.com> | 2007-05-03 00:40:07 -0400 |
---|---|---|
committer | Ray Strode <rstrode@redhat.com> | 2007-05-03 00:40:07 -0400 |
commit | 642146d353de179276f88e17083b63755d2c7feb (patch) | |
tree | def5d9c69922d8b74b2c0e988bece8e520405abe | |
parent | 8542d0c31a3b6be3588223416c0268ca0ad70665 (diff) |
add asserts
-rw-r--r-- | src/pop-transaction.c | 48 | ||||
-rw-r--r-- | src/pop-transaction.h | 1 |
2 files changed, 45 insertions, 4 deletions
diff --git a/src/pop-transaction.c b/src/pop-transaction.c index d1a1d7b..987a080 100644 --- a/src/pop-transaction.c +++ b/src/pop-transaction.c @@ -161,6 +161,8 @@ pop_transaction_class_install_properties (PopTransactionClass *transaction_class static void pop_transaction_init (PopTransaction *transaction) { + g_assert (POP_IS_TRANSACTION (transaction)); + transaction->priv = G_TYPE_INSTANCE_GET_PRIVATE (transaction, POP_TYPE_TRANSACTION, PopTransactionPrivate); @@ -169,11 +171,12 @@ pop_transaction_init (PopTransaction *transaction) } static void -pop_transaction_finalize (GObject * object) +pop_transaction_finalize (GObject *object) { PopTransaction *transaction; GObjectClass *parent_class; + g_assert (POP_IS_TRANSACTION (object)); transaction = POP_TRANSACTION (object); parent_class = G_OBJECT_CLASS (pop_transaction_parent_class); @@ -188,6 +191,8 @@ static void pop_transaction_set_completion_closure (PopTransaction *transaction, GClosure *closure) { + g_assert (POP_IS_TRANSACTION (transaction)); + g_assert (closure != NULL); g_assert (transaction->priv->completion_closure == NULL); transaction->priv->completion_closure = g_closure_ref (closure); @@ -200,7 +205,11 @@ pop_transaction_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - PopTransaction *transaction = POP_TRANSACTION (object); + PopTransaction *transaction; + + g_assert (POP_IS_TRANSACTION (object)); + + transaction = POP_TRANSACTION (object); switch (prop_id) { @@ -221,7 +230,11 @@ pop_transaction_get_property (GObject *object, GValue *value, GParamSpec *pspec) { - PopTransaction *transaction = POP_TRANSACTION (object); + PopTransaction *transaction; + + g_assert (POP_IS_TRANSACTION (object)); + + transaction = POP_TRANSACTION (object); switch (prop_id) { @@ -268,6 +281,8 @@ pop_action_new (PopActionProcessFunc action_process_func, static void pop_action_free (PopAction *action) { + g_assert (action != NULL); + g_slice_free (PopAction, action); } @@ -311,6 +326,8 @@ pop_transaction_resume (PopTransaction *transaction) static gboolean pop_transaction_is_in_action (PopTransaction *transaction) { + g_return_if_fail (POP_IS_TRANSACTION (transaction)); + if (transaction->priv->is_in_action) { g_assert (transaction->priv->state >= POP_TRANSACTION_STATE_PROCESSING); @@ -402,6 +419,7 @@ pop_transaction_wait_a_while (PopTransaction *transaction, int milliseconds) { GSource *source; + g_return_if_fail (POP_IS_TRANSACTION (transaction)); g_return_if_fail (pop_transaction_is_in_action (transaction)); @@ -422,6 +440,8 @@ pop_transaction_call_on_idle (PopTransaction *transaction, GSource *source; guint idle_id; + g_assert (POP_IS_TRANSACTION (transaction)); + source = g_idle_source_new (); g_object_ref (transaction); g_source_set_callback (source, (GSourceFunc) callback, transaction, @@ -438,6 +458,7 @@ pop_transaction_is_at_first_action (PopTransaction *transaction) { GList *first_action_node; + g_assert (POP_IS_TRANSACTION (transaction)); g_assert (transaction->priv->current_action_node != NULL); first_action_node = g_queue_peek_head_link (transaction->priv->actions); @@ -448,6 +469,8 @@ pop_transaction_is_at_first_action (PopTransaction *transaction) static gboolean pop_transaction_rewind (PopTransaction *transaction) { + g_assert (POP_IS_TRANSACTION (transaction)); + if (pop_transaction_is_at_first_action (transaction)) return FALSE; @@ -460,6 +483,7 @@ pop_transaction_rewind (PopTransaction *transaction) static gboolean pop_transaction_seek_forward (PopTransaction *transaction) { + g_assert (POP_IS_TRANSACTION (transaction)); g_assert (transaction->priv->current_action_node != NULL); transaction->priv->current_action_node = @@ -473,6 +497,8 @@ pop_transaction_complete (PopTransaction *transaction) { GValue arguments[2] = { 0 }; + g_assert (POP_IS_TRANSACTION (transaction)); + transaction->priv->state = POP_TRANSACTION_STATE_FINISHED; /* The below is a cryptic way of saying @@ -497,6 +523,7 @@ pop_transaction_process_current_action_and_seek_forward (PopTransaction *transac PopActionProcessStatus status; gboolean should_continue; + g_assert (POP_IS_TRANSACTION (transaction)); g_assert (transaction->priv->current_action_node != NULL); if (transaction->priv->state == POP_TRANSACTION_STATE_COMMITED) @@ -558,6 +585,8 @@ pop_transaction_process_current_action_and_seek_forward (PopTransaction *transac static void pop_transaction_process_on_idle (PopTransaction *transaction) { + g_assert (POP_IS_TRANSACTION (transaction)); + transaction->priv->current_action_node = g_queue_peek_head_link (transaction->priv->actions); @@ -573,6 +602,7 @@ pop_transaction_rollback_current_action_and_rewind (PopTransaction *transaction) PopActionRollbackStatus status; gboolean should_continue; + g_assert (POP_IS_TRANSACTION (transaction)); g_assert (transaction->priv->current_action_node != NULL); if (transaction->priv->state == POP_TRANSACTION_STATE_PROCESSING) @@ -623,6 +653,8 @@ pop_transaction_rollback_current_action_and_rewind (PopTransaction *transaction) static void pop_transaction_rollback_on_idle (PopTransaction *transaction) { + g_assert (POP_IS_TRANSACTION (transaction)); + transaction->priv->current_action_node = transaction->priv->current_action_node->prev; transaction->priv->rollback_idle_id = @@ -633,6 +665,8 @@ pop_transaction_rollback_on_idle (PopTransaction *transaction) static void pop_transaction_rollback_and_complete (PopTransaction *transaction) { + g_assert (POP_IS_TRANSACTION (transaction)); + if (pop_transaction_is_at_first_action (transaction)) { pop_transaction_complete (transaction); @@ -646,6 +680,8 @@ static void pop_transaction_fail (PopTransaction *transaction) { + g_assert (POP_IS_TRANSACTION (transaction)); + transaction->priv->status = POP_TRANSACTION_STATUS_FAILED; pop_transaction_rollback_and_complete (transaction); } @@ -653,6 +689,8 @@ pop_transaction_fail (PopTransaction *transaction) static gboolean pop_transaction_is_attached (PopTransaction *transaction) { + g_assert (POP_IS_TRANSACTION (transaction)); + return transaction->priv->context != NULL; } @@ -669,12 +707,16 @@ pop_transaction_attach (PopTransaction *transaction, static gboolean pop_transaction_is_empty (PopTransaction *transaction) { + g_assert (POP_IS_TRANSACTION (transaction)); + return g_queue_is_empty (transaction->priv->actions); } static gboolean pop_transaction_is_committed (PopTransaction *transaction) { + g_assert (POP_IS_TRANSACTION (transaction)); + return transaction->priv->state >= POP_TRANSACTION_STATE_COMMITED; } diff --git a/src/pop-transaction.h b/src/pop-transaction.h index cf7db80..a5f9dfc 100644 --- a/src/pop-transaction.h +++ b/src/pop-transaction.h @@ -98,7 +98,6 @@ void pop_transaction_wait_for_fd (PopTransaction *transaction, void pop_transaction_wait_a_while (PopTransaction *transaction, int milliseconds); -void pop_transaction_wait_for_source (PopTransaction *transaction, GSource *source); void pop_transaction_attach (PopTransaction *transaction, GMainContext *context); |