Skip to content

Commit 0bce2d8

Browse files
author
Shubham
committed
Suffix listener function types with '_t' to indicate that they are 'types' in Python code
1 parent 58a7fa0 commit 0bce2d8

2 files changed

Lines changed: 25 additions & 19 deletions

File tree

objectbox/c.py

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1185,13 +1185,13 @@ class OBX_sync_msg_objects_builder(ctypes.Structure):
11851185
OBX_sync_msg_objects_builder_p = ctypes.POINTER(OBX_sync_msg_objects_builder)
11861186

11871187
# Define callback types for sync listeners
1188-
OBX_sync_listener_connect = ctypes.CFUNCTYPE(None, ctypes.c_void_p)
1189-
OBX_sync_listener_disconnect = ctypes.CFUNCTYPE(None, ctypes.c_void_p)
1190-
OBX_sync_listener_login = ctypes.CFUNCTYPE(None, ctypes.c_void_p)
1191-
OBX_sync_listener_login_failure = ctypes.CFUNCTYPE(None, ctypes.c_void_p, ctypes.c_int) # arg, OBXSyncCode
1192-
OBX_sync_listener_complete = ctypes.CFUNCTYPE(None, ctypes.c_void_p)
1193-
OBX_sync_listener_error = ctypes.CFUNCTYPE(None, ctypes.c_void_p, ctypes.c_int) # arg, OBXSyncError
1194-
OBX_sync_listener_change = ctypes.CFUNCTYPE(None, ctypes.c_void_p, ctypes.POINTER(OBX_sync_change_array))
1188+
OBX_sync_listener_connect_t = ctypes.CFUNCTYPE(None, ctypes.c_void_p)
1189+
OBX_sync_listener_disconnect_t = ctypes.CFUNCTYPE(None, ctypes.c_void_p)
1190+
OBX_sync_listener_login_t = ctypes.CFUNCTYPE(None, ctypes.c_void_p)
1191+
OBX_sync_listener_login_failure_t = ctypes.CFUNCTYPE(None, ctypes.c_void_p, ctypes.c_int) # arg, OBXSyncCode
1192+
OBX_sync_listener_complete_t = ctypes.CFUNCTYPE(None, ctypes.c_void_p)
1193+
OBX_sync_listener_error_t = ctypes.CFUNCTYPE(None, ctypes.c_void_p, ctypes.c_int) # arg, OBXSyncError
1194+
OBX_sync_listener_change_t = ctypes.CFUNCTYPE(None, ctypes.c_void_p, ctypes.POINTER(OBX_sync_change_array))
11951195
OBX_sync_listener_server_time = ctypes.CFUNCTYPE(None, ctypes.c_void_p, ctypes.c_int64)
11961196
OBX_sync_listener_msg_objects = ctypes.CFUNCTYPE(None, ctypes.c_void_p, ctypes.POINTER(OBX_sync_msg_objects))
11971197

@@ -1259,23 +1259,28 @@ class OBX_sync_msg_objects_builder(ctypes.Structure):
12591259
# Listener Callbacks
12601260

12611261
# void obx_sync_listener_connect(OBX_sync* sync, OBX_sync_listener_connect* listener, void* listener_arg);
1262-
obx_sync_listener_connect = c_fn('obx_sync_listener_connect', None, [OBX_sync_p, OBX_sync_listener_connect, ctypes.c_void_p])
1262+
obx_sync_listener_connect = c_fn('obx_sync_listener_connect', None,
1263+
[OBX_sync_p, OBX_sync_listener_connect_t, ctypes.c_void_p])
12631264

12641265
# void obx_sync_listener_disconnect(OBX_sync* sync, OBX_sync_listener_disconnect* listener, void* listener_arg);
1265-
obx_sync_listener_disconnect = c_fn('obx_sync_listener_disconnect', None, [OBX_sync_p, OBX_sync_listener_disconnect, ctypes.c_void_p])
1266+
obx_sync_listener_disconnect = c_fn('obx_sync_listener_disconnect', None,
1267+
[OBX_sync_p, OBX_sync_listener_disconnect_t, ctypes.c_void_p])
12661268

12671269
# void obx_sync_listener_login(OBX_sync* sync, OBX_sync_listener_login* listener, void* listener_arg);
1268-
obx_sync_listener_login = c_fn('obx_sync_listener_login', None, [OBX_sync_p, OBX_sync_listener_login, ctypes.c_void_p])
1270+
obx_sync_listener_login = c_fn('obx_sync_listener_login', None,
1271+
[OBX_sync_p, OBX_sync_listener_login_t, ctypes.c_void_p])
12691272

12701273
# void obx_sync_listener_login_failure(OBX_sync* sync, OBX_sync_listener_login_failure* listener, void* listener_arg);
1271-
obx_sync_listener_login_failure = c_fn('obx_sync_listener_login_failure', None, [OBX_sync_p, OBX_sync_listener_login_failure, ctypes.c_void_p])
1274+
obx_sync_listener_login_failure = c_fn('obx_sync_listener_login_failure', None,
1275+
[OBX_sync_p, OBX_sync_listener_login_failure_t, ctypes.c_void_p])
12721276

12731277
# void obx_sync_listener_complete(OBX_sync* sync, OBX_sync_listener_complete* listener, void* listener_arg);
1274-
obx_sync_listener_error = c_fn('obx_sync_listener_error', None, [OBX_sync_p, OBX_sync_listener_error, ctypes.c_void_p])
1278+
obx_sync_listener_error = c_fn('obx_sync_listener_error', None,
1279+
[OBX_sync_p, OBX_sync_listener_error_t, ctypes.c_void_p])
12751280

12761281
# void obx_sync_listener_change(OBX_sync* sync, OBX_sync_listener_change* listener, void* listener_arg);
12771282
obx_sync_listener_change = c_fn('obx_sync_listener_change', None,
1278-
[OBX_sync_p, OBX_sync_listener_change, ctypes.c_void_p])
1283+
[OBX_sync_p, OBX_sync_listener_change_t, ctypes.c_void_p])
12791284

12801285
# Filter Variables
12811286

objectbox/sync.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -582,8 +582,8 @@ def set_login_listener(self, login_listener: SyncLoginListener):
582582
login_listener: The listener to receive login events.
583583
"""
584584
self.__check_sync_ptr_not_null()
585-
self.__c_login_listener = c.OBX_sync_listener_login(lambda arg: login_listener.on_logged_in())
586-
self.__c_login_failure_listener = c.OBX_sync_listener_login_failure(
585+
self.__c_login_listener = c.OBX_sync_listener_login_t(lambda arg: login_listener.on_logged_in())
586+
self.__c_login_failure_listener = c.OBX_sync_listener_login_failure_t(
587587
lambda arg, sync_login_code: login_listener.on_login_failed(sync_login_code))
588588
c.obx_sync_listener_login(
589589
self.__c_sync_client_ptr,
@@ -603,8 +603,9 @@ def set_connection_listener(self, connection_listener: SyncConnectionListener):
603603
connection_listener: The listener to receive connection events.
604604
"""
605605
self.__check_sync_ptr_not_null()
606-
self.__c_connect_listener = c.OBX_sync_listener_connect(lambda arg: connection_listener.on_connected())
607-
self.__c_disconnect_listener = c.OBX_sync_listener_disconnect(lambda arg: connection_listener.on_disconnected())
606+
self.__c_connect_listener = c.OBX_sync_listener_connect_t(lambda arg: connection_listener.on_connected())
607+
self.__c_disconnect_listener = c.OBX_sync_listener_disconnect_t(
608+
lambda arg: connection_listener.on_disconnected())
608609
c.obx_sync_listener_connect(
609610
self.__c_sync_client_ptr,
610611
self.__c_connect_listener,
@@ -623,7 +624,7 @@ def set_error_listener(self, error_listener: SyncErrorListener):
623624
error_listener: The listener to receive error events.
624625
"""
625626
self.__check_sync_ptr_not_null()
626-
self.__c_error_listener = c.OBX_sync_listener_error(
627+
self.__c_error_listener = c.OBX_sync_listener_error_t(
627628
lambda arg, sync_error_code: error_listener.on_error(sync_error_code))
628629
c.obx_sync_listener_error(
629630
self.__c_sync_client_ptr,
@@ -662,7 +663,7 @@ def c_change_callback(arg, sync_change_array_ptr):
662663
))
663664
change_listener.on_change(changes)
664665

665-
self.__c_change_listener = c.OBX_sync_listener_change(c_change_callback)
666+
self.__c_change_listener = c.OBX_sync_listener_change_t(c_change_callback)
666667
c.obx_sync_listener_change(
667668
self.__c_sync_client_ptr,
668669
self.__c_change_listener,

0 commit comments

Comments
 (0)