Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix enums in pxd files because macro creates enums that are _1_ base… #308

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/vendor/inc/c_amqp_management.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ cimport c_async_operation
cdef extern from "azure_uamqp_c/amqp_management.h":

cdef enum AMQP_MANAGEMENT_EXECUTE_OPERATION_RESULT_TAG:
AMQP_MANAGEMENT_EXECUTE_OPERATION_OK,
AMQP_MANAGEMENT_EXECUTE_OPERATION_OK = 1, # because C code uses `MU_DEFINE_ENUM`
AMQP_MANAGEMENT_EXECUTE_OPERATION_ERROR,
AMQP_MANAGEMENT_EXECUTE_OPERATION_FAILED_BAD_STATUS,
AMQP_MANAGEMENT_EXECUTE_OPERATION_INSTANCE_CLOSED

cdef enum AMQP_MANAGEMENT_OPEN_RESULT_TAG:
AMQP_MANAGEMENT_OPEN_OK,
AMQP_MANAGEMENT_OPEN_OK = 1, # because C code uses `MU_DEFINE_ENUM`
AMQP_MANAGEMENT_OPEN_ERROR,
AMQP_MANAGEMENT_OPEN_CANCELLED

Expand Down
2 changes: 1 addition & 1 deletion src/vendor/inc/c_amqpvalue.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cdef extern from "azure_uamqp_c/amqpvalue_to_string.h":
cdef extern from "azure_uamqp_c/amqp_types.h":

cdef enum AMQP_TYPE_TAG:
AMQP_TYPE_NULL,
AMQP_TYPE_NULL = 1, # because C code uses `MU_DEFINE_ENUM`
AMQP_TYPE_BOOL,
AMQP_TYPE_UBYTE,
AMQP_TYPE_USHORT,
Expand Down
4 changes: 2 additions & 2 deletions src/vendor/inc/c_cbs.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ cdef enum AUTH_STATUS:
cdef extern from "azure_uamqp_c/cbs.h":

cdef enum CBS_OPERATION_RESULT_TAG:
CBS_OPERATION_RESULT_OK,
CBS_OPERATION_RESULT_OK = 1, # because C code uses `MU_DEFINE_ENUM`
CBS_OPERATION_RESULT_CBS_ERROR,
CBS_OPERATION_RESULT_OPERATION_FAILED,
CBS_OPERATION_RESULT_INSTANCE_CLOSED

cdef enum CBS_OPEN_COMPLETE_RESULT_TAG:
CBS_OPEN_OK,
CBS_OPEN_OK = 1, # because C code uses `MU_DEFINE_ENUM`
CBS_OPEN_ERROR,
CBS_OPEN_CANCELLED

Expand Down
2 changes: 1 addition & 1 deletion src/vendor/inc/c_connection.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ cdef extern from "azure_uamqp_c/connection.h":
pass

cdef enum CONNECTION_STATE_TAG:
CONNECTION_STATE_START,
CONNECTION_STATE_START = 0, # because C code uses `typedef enum`
CONNECTION_STATE_HDR_RCVD,
CONNECTION_STATE_HDR_SENT,
CONNECTION_STATE_HDR_EXCH,
Expand Down
6 changes: 3 additions & 3 deletions src/vendor/inc/c_link.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@ cdef extern from "azure_uamqp_c/link.h":
pass

cdef enum LINK_STATE_TAG:
LINK_STATE_DETACHED,
LINK_STATE_DETACHED = 1, # because C code uses `MU_DEFINE_ENUM`
LINK_STATE_HALF_ATTACHED_ATTACH_SENT,
LINK_STATE_HALF_ATTACHED_ATTACH_RECEIVED,
LINK_STATE_ATTACHED,
LINK_STATE_ERROR

cdef enum LINK_TRANSFER_RESULT_TAG:
LINK_TRANSFER_ERROR,
LINK_TRANSFER_ERROR = 1, # because C code uses `MU_DEFINE_ENUM`
LINK_TRANSFER_BUSY

cdef enum LINK_DELIVERY_SETTLE_REASON_TAG:
LINK_DELIVERY_SETTLE_REASON_DISPOSITION_RECEIVED,
LINK_DELIVERY_SETTLE_REASON_DISPOSITION_RECEIVED = 1, # because C code uses `MU_DEFINE_ENUM`
LINK_DELIVERY_SETTLE_REASON_SETTLED,
LINK_DELIVERY_SETTLE_REASON_NOT_DELIVERED,
LINK_DELIVERY_SETTLE_REASON_TIMEOUT,
Expand Down
2 changes: 1 addition & 1 deletion src/vendor/inc/c_message.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ cdef extern from "azure_uamqp_c/messaging.h":
cdef extern from "azure_uamqp_c/message.h":

cdef enum MESSAGE_BODY_TYPE_TAG:
MESSAGE_BODY_TYPE_NONE,
MESSAGE_BODY_TYPE_NONE = 1, # because C code uses `MU_DEFINE_ENUM`
MESSAGE_BODY_TYPE_DATA,
MESSAGE_BODY_TYPE_SEQUENCE,
MESSAGE_BODY_TYPE_VALUE,
Expand Down
2 changes: 1 addition & 1 deletion src/vendor/inc/c_message_receiver.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ cimport c_amqpvalue
cdef extern from "azure_uamqp_c/message_receiver.h":

cdef enum MESSAGE_RECEIVER_STATE_TAG:
MESSAGE_RECEIVER_STATE_IDLE,
MESSAGE_RECEIVER_STATE_IDLE = 1, # because C code uses `MU_DEFINE_ENUM`
MESSAGE_RECEIVER_STATE_OPENING,
MESSAGE_RECEIVER_STATE_OPEN,
MESSAGE_RECEIVER_STATE_CLOSING,
Expand Down
4 changes: 2 additions & 2 deletions src/vendor/inc/c_message_sender.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ cimport c_amqpvalue
cdef extern from "azure_uamqp_c/message_sender.h":

cdef enum MESSAGE_SEND_RESULT_TAG:
MESSAGE_SEND_OK,
MESSAGE_SEND_OK = 1, # because C code uses `MU_DEFINE_ENUM`
MESSAGE_SEND_ERROR,
MESSAGE_SEND_TIMEOUT,
MESSAGE_SEND_CANCELLED

cdef enum MESSAGE_SENDER_STATE_TAG:
MESSAGE_SENDER_STATE_IDLE,
MESSAGE_SENDER_STATE_IDLE = 1, # because C code uses `MU_DEFINE_ENUM`
MESSAGE_SENDER_STATE_OPENING,
MESSAGE_SENDER_STATE_OPEN,
MESSAGE_SENDER_STATE_CLOSING,
Expand Down
2 changes: 1 addition & 1 deletion src/vendor/inc/c_platform.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cimport c_xio
cdef extern from "azure_c_shared_utility/platform.h":

cdef enum PLATFORM_INFO_OPTION_TAG:
PLATFORM_INFO_OPTION_DEFAULT,
PLATFORM_INFO_OPTION_DEFAULT = 1, # because C code uses `MU_DEFINE_ENUM`
PLATFORM_INFO_OPTION_RETRIEVE_SQM,

int platform_init()
Expand Down
4 changes: 2 additions & 2 deletions src/vendor/inc/c_utils.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ cdef extern from "azure_c_shared_utility/buffer_.h":
cdef extern from "azure_c_shared_utility/map.h":

cdef enum MAP_RESULT_TAG:
MAP_OK,
MAP_OK = 1, # because C code uses `MU_DEFINE_ENUM`
MAP_ERROR,
MAP_INVALIDARG,
MAP_KEYEXISTS,
Expand Down Expand Up @@ -99,7 +99,7 @@ cdef extern from "azure_c_shared_utility/doublylinkedlist.h":
cdef extern from "azure_c_shared_utility/optionhandler.h":

cdef enum OPTIONHANDLER_RESULT_TAG:
OPTIONHANDLER_OK,
OPTIONHANDLER_OK = 0, # because code uses MU_DEFINE_ENUM_WITHOUT_INVALID
OPTIONHANDLER_ERROR,
OPTIONHANDLER_INVALIDARG

Expand Down
4 changes: 2 additions & 2 deletions src/vendor/inc/c_xio.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ cdef extern from "azure_c_shared_utility/xio.h":
ctypedef void* XIO_HANDLE

cdef enum IO_SEND_RESULT_TAG:
IO_SEND_OK,
IO_SEND_OK = 1, # because C code uses `MU_DEFINE_ENUM`
IO_SEND_ERROR,
IO_SEND_CANCELLED

cdef enum IO_OPEN_RESULT_TAG:
IO_OPEN_OK,
IO_OPEN_OK = 1, # because C code uses `MU_DEFINE_ENUM`
IO_OPEN_ERROR,
IO_OPEN_CANCELLED

Expand Down
2 changes: 1 addition & 1 deletion src/vendor/inc/c_xlogging.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
cdef extern from "azure_c_shared_utility/xlogging.h":

cdef enum LOG_CATEGORY_TAG:
AZ_LOG_ERROR,
AZ_LOG_ERROR = 0, # because C code uses `typedef enum`
AZ_LOG_INFO,
AZ_LOG_TRACE

Expand Down