Skip to content

Commit

Permalink
Alloc an struct when decoding methods w/o fields
Browse files Browse the repository at this point in the history 
For consistency sake, allocate and return a struct when decoding methods that
don't have fields.

Fixes #225
  • Loading branch information
@alanxz
alanxz committed Dec 30, 2014
1 parent fc36a02 commit cf2760d
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 24 deletions.
54 changes: 36 additions & 18 deletions librabbitmq/amqp_framing.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,8 @@ int amqp_decode_method(amqp_method_number_t methodNumber,
return 0;
}
case AMQP_CONNECTION_CLOSE_OK_METHOD: {
amqp_connection_close_ok_t *m = NULL; /* no fields */
amqp_connection_close_ok_t *m = (amqp_connection_close_ok_t *) amqp_pool_alloc(pool, sizeof(amqp_connection_close_ok_t));
if (m == NULL) { return AMQP_STATUS_NO_MEMORY; }
*decoded = m;
return 0;
}
Expand All @@ -341,7 +342,8 @@ int amqp_decode_method(amqp_method_number_t methodNumber,
return 0;
}
case AMQP_CONNECTION_UNBLOCKED_METHOD: {
amqp_connection_unblocked_t *m = NULL; /* no fields */
amqp_connection_unblocked_t *m = (amqp_connection_unblocked_t *) amqp_pool_alloc(pool, sizeof(amqp_connection_unblocked_t));
if (m == NULL) { return AMQP_STATUS_NO_MEMORY; }
*decoded = m;
return 0;
}
Expand Down Expand Up @@ -401,7 +403,8 @@ int amqp_decode_method(amqp_method_number_t methodNumber,
return 0;
}
case AMQP_CHANNEL_CLOSE_OK_METHOD: {
amqp_channel_close_ok_t *m = NULL; /* no fields */
amqp_channel_close_ok_t *m = (amqp_channel_close_ok_t *) amqp_pool_alloc(pool, sizeof(amqp_channel_close_ok_t));
if (m == NULL) { return AMQP_STATUS_NO_MEMORY; }
*decoded = m;
return 0;
}
Expand Down Expand Up @@ -460,7 +463,8 @@ int amqp_decode_method(amqp_method_number_t methodNumber,
return 0;
}
case AMQP_EXCHANGE_DECLARE_OK_METHOD: {
amqp_exchange_declare_ok_t *m = NULL; /* no fields */
amqp_exchange_declare_ok_t *m = (amqp_exchange_declare_ok_t *) amqp_pool_alloc(pool, sizeof(amqp_exchange_declare_ok_t));
if (m == NULL) { return AMQP_STATUS_NO_MEMORY; }
*decoded = m;
return 0;
}
Expand All @@ -481,7 +485,8 @@ int amqp_decode_method(amqp_method_number_t methodNumber,
return 0;
}
case AMQP_EXCHANGE_DELETE_OK_METHOD: {
amqp_exchange_delete_ok_t *m = NULL; /* no fields */
amqp_exchange_delete_ok_t *m = (amqp_exchange_delete_ok_t *) amqp_pool_alloc(pool, sizeof(amqp_exchange_delete_ok_t));
if (m == NULL) { return AMQP_STATUS_NO_MEMORY; }
*decoded = m;
return 0;
}
Expand Down Expand Up @@ -517,7 +522,8 @@ int amqp_decode_method(amqp_method_number_t methodNumber,
return 0;
}
case AMQP_EXCHANGE_BIND_OK_METHOD: {
amqp_exchange_bind_ok_t *m = NULL; /* no fields */
amqp_exchange_bind_ok_t *m = (amqp_exchange_bind_ok_t *) amqp_pool_alloc(pool, sizeof(amqp_exchange_bind_ok_t));
if (m == NULL) { return AMQP_STATUS_NO_MEMORY; }
*decoded = m;
return 0;
}
Expand Down Expand Up @@ -553,7 +559,8 @@ int amqp_decode_method(amqp_method_number_t methodNumber,
return 0;
}
case AMQP_EXCHANGE_UNBIND_OK_METHOD: {
amqp_exchange_unbind_ok_t *m = NULL; /* no fields */
amqp_exchange_unbind_ok_t *m = (amqp_exchange_unbind_ok_t *) amqp_pool_alloc(pool, sizeof(amqp_exchange_unbind_ok_t));
if (m == NULL) { return AMQP_STATUS_NO_MEMORY; }
*decoded = m;
return 0;
}
Expand Down Expand Up @@ -626,7 +633,8 @@ int amqp_decode_method(amqp_method_number_t methodNumber,
return 0;
}
case AMQP_QUEUE_BIND_OK_METHOD: {
amqp_queue_bind_ok_t *m = NULL; /* no fields */
amqp_queue_bind_ok_t *m = (amqp_queue_bind_ok_t *) amqp_pool_alloc(pool, sizeof(amqp_queue_bind_ok_t));
if (m == NULL) { return AMQP_STATUS_NO_MEMORY; }
*decoded = m;
return 0;
}
Expand Down Expand Up @@ -706,7 +714,8 @@ int amqp_decode_method(amqp_method_number_t methodNumber,
return 0;
}
case AMQP_QUEUE_UNBIND_OK_METHOD: {
amqp_queue_unbind_ok_t *m = NULL; /* no fields */
amqp_queue_unbind_ok_t *m = (amqp_queue_unbind_ok_t *) amqp_pool_alloc(pool, sizeof(amqp_queue_unbind_ok_t));
if (m == NULL) { return AMQP_STATUS_NO_MEMORY; }
*decoded = m;
return 0;
}
Expand All @@ -721,7 +730,8 @@ int amqp_decode_method(amqp_method_number_t methodNumber,
return 0;
}
case AMQP_BASIC_QOS_OK_METHOD: {
amqp_basic_qos_ok_t *m = NULL; /* no fields */
amqp_basic_qos_ok_t *m = (amqp_basic_qos_ok_t *) amqp_pool_alloc(pool, sizeof(amqp_basic_qos_ok_t));
if (m == NULL) { return AMQP_STATUS_NO_MEMORY; }
*decoded = m;
return 0;
}
Expand Down Expand Up @@ -949,7 +959,8 @@ int amqp_decode_method(amqp_method_number_t methodNumber,
return 0;
}
case AMQP_BASIC_RECOVER_OK_METHOD: {
amqp_basic_recover_ok_t *m = NULL; /* no fields */
amqp_basic_recover_ok_t *m = (amqp_basic_recover_ok_t *) amqp_pool_alloc(pool, sizeof(amqp_basic_recover_ok_t));
if (m == NULL) { return AMQP_STATUS_NO_MEMORY; }
*decoded = m;
return 0;
}
Expand All @@ -964,32 +975,38 @@ int amqp_decode_method(amqp_method_number_t methodNumber,
return 0;
}
case AMQP_TX_SELECT_METHOD: {
amqp_tx_select_t *m = NULL; /* no fields */
amqp_tx_select_t *m = (amqp_tx_select_t *) amqp_pool_alloc(pool, sizeof(amqp_tx_select_t));
if (m == NULL) { return AMQP_STATUS_NO_MEMORY; }
*decoded = m;
return 0;
}
case AMQP_TX_SELECT_OK_METHOD: {
amqp_tx_select_ok_t *m = NULL; /* no fields */
amqp_tx_select_ok_t *m = (amqp_tx_select_ok_t *) amqp_pool_alloc(pool, sizeof(amqp_tx_select_ok_t));
if (m == NULL) { return AMQP_STATUS_NO_MEMORY; }
*decoded = m;
return 0;
}
case AMQP_TX_COMMIT_METHOD: {
amqp_tx_commit_t *m = NULL; /* no fields */
amqp_tx_commit_t *m = (amqp_tx_commit_t *) amqp_pool_alloc(pool, sizeof(amqp_tx_commit_t));
if (m == NULL) { return AMQP_STATUS_NO_MEMORY; }
*decoded = m;
return 0;
}
case AMQP_TX_COMMIT_OK_METHOD: {
amqp_tx_commit_ok_t *m = NULL; /* no fields */
amqp_tx_commit_ok_t *m = (amqp_tx_commit_ok_t *) amqp_pool_alloc(pool, sizeof(amqp_tx_commit_ok_t));
if (m == NULL) { return AMQP_STATUS_NO_MEMORY; }
*decoded = m;
return 0;
}
case AMQP_TX_ROLLBACK_METHOD: {
amqp_tx_rollback_t *m = NULL; /* no fields */
amqp_tx_rollback_t *m = (amqp_tx_rollback_t *) amqp_pool_alloc(pool, sizeof(amqp_tx_rollback_t));
if (m == NULL) { return AMQP_STATUS_NO_MEMORY; }
*decoded = m;
return 0;
}
case AMQP_TX_ROLLBACK_OK_METHOD: {
amqp_tx_rollback_ok_t *m = NULL; /* no fields */
amqp_tx_rollback_ok_t *m = (amqp_tx_rollback_ok_t *) amqp_pool_alloc(pool, sizeof(amqp_tx_rollback_ok_t));
if (m == NULL) { return AMQP_STATUS_NO_MEMORY; }
*decoded = m;
return 0;
}
Expand All @@ -1002,7 +1019,8 @@ int amqp_decode_method(amqp_method_number_t methodNumber,
return 0;
}
case AMQP_CONFIRM_SELECT_OK_METHOD: {
amqp_confirm_select_ok_t *m = NULL; /* no fields */
amqp_confirm_select_ok_t *m = (amqp_confirm_select_ok_t *) amqp_pool_alloc(pool, sizeof(amqp_confirm_select_ok_t));
if (m == NULL) { return AMQP_STATUS_NO_MEMORY; }
*decoded = m;
return 0;
}
Expand Down
9 changes: 3 additions & 6 deletions librabbitmq/codegen.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,12 +284,9 @@ def genLookupMethodName(m):

def genDecodeMethodFields(m):
print " case %s: {" % (m.defName(),)
if m.arguments:
print " %s *m = (%s *) amqp_pool_alloc(pool, sizeof(%s));" % \
(m.structName(), m.structName(), m.structName())
print " if (m == NULL) { return AMQP_STATUS_NO_MEMORY; }"
else:
print " %s *m = NULL; /* no fields */" % (m.structName(),)
print " %s *m = (%s *) amqp_pool_alloc(pool, sizeof(%s));" % \
(m.structName(), m.structName(), m.structName())
print " if (m == NULL) { return AMQP_STATUS_NO_MEMORY; }"

emitter = BitDecoder(Emitter(" "))
for f in m.arguments:
Expand Down

0 comments on commit cf2760d

Please sign in to comment.