From 5072dea1373b7c4789a9ea1e65d05ea30acf41ed Mon Sep 17 00:00:00 2001 From: Martin Szulecki Date: Sun, 5 Oct 2014 16:51:03 +0200 Subject: Convert int16_t macro error types into enum to improve debugging/type-checking This simple change provides various benefits for developers like compile time errors, better auto-completition in editors and the ability of a debugger to show the constant instead of just the raw value. Thanks to Aaron Burghardt for the proposal. --- include/libimobiledevice/diagnostics_relay.h | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'include/libimobiledevice/diagnostics_relay.h') diff --git a/include/libimobiledevice/diagnostics_relay.h b/include/libimobiledevice/diagnostics_relay.h index b25750b..5162657 100644 --- a/include/libimobiledevice/diagnostics_relay.h +++ b/include/libimobiledevice/diagnostics_relay.h @@ -32,16 +32,15 @@ extern "C" { #define DIAGNOSTICS_RELAY_SERVICE_NAME "com.apple.mobile.diagnostics_relay" -/** @name Error Codes */ -/*@{*/ -#define DIAGNOSTICS_RELAY_E_SUCCESS 0 -#define DIAGNOSTICS_RELAY_E_INVALID_ARG -1 -#define DIAGNOSTICS_RELAY_E_PLIST_ERROR -2 -#define DIAGNOSTICS_RELAY_E_MUX_ERROR -3 -#define DIAGNOSTICS_RELAY_E_UNKNOWN_REQUEST -4 - -#define DIAGNOSTICS_RELAY_E_UNKNOWN_ERROR -256 -/*@}*/ +/** Error Codes */ +typedef enum { + DIAGNOSTICS_RELAY_E_SUCCESS = 0, + DIAGNOSTICS_RELAY_E_INVALID_ARG = -1, + DIAGNOSTICS_RELAY_E_PLIST_ERROR = -2, + DIAGNOSTICS_RELAY_E_MUX_ERROR = -3, + DIAGNOSTICS_RELAY_E_UNKNOWN_REQUEST = -4, + DIAGNOSTICS_RELAY_E_UNKNOWN_ERROR = -256 +} diagnostics_relay_error_t; #define DIAGNOSTICS_RELAY_ACTION_FLAG_WAIT_FOR_DISCONNECT (1 << 1) #define DIAGNOSTICS_RELAY_ACTION_FLAG_DISPLAY_PASS (1 << 2) @@ -52,9 +51,6 @@ extern "C" { #define DIAGNOSTICS_RELAY_REQUEST_TYPE_GAS_GAUGE "GasGauge" #define DIAGNOSTICS_RELAY_REQUEST_TYPE_NAND "NAND" -/** Represents an error code. */ -typedef int16_t diagnostics_relay_error_t; - typedef struct diagnostics_relay_client_private diagnostics_relay_client_private; typedef diagnostics_relay_client_private *diagnostics_relay_client_t; /**< The client handle. */ -- cgit v1.1-32-gdbae