Delete the unnecessary enum net_err_t

Change-Id: I0c2b8ed94e69906e523d724050c862936b363f5d
Signed-off-by: Chengyi Zhao <chengyi1.zhao@archermind.com>

diff --git a/src/include/common.h b/src/include/common.h
index e42b66a38e9686394541eabc52f89a3ede444c79..ae4bbe876abdc8ace6489c15535049e532fd4c6f 100644 (file)
--- a/src/include/common.h
+++ b/src/include/common.h
@@ -117,74 +117,6 @@ extern "C"
 /*
  * Added:Begin
  */
-typedef enum {
-       /** No error */
-       NET_ERR_NONE = 0x00,
-
-       /* Common Error value */
-
-       /** Error unknown */
-       NET_ERR_UNKNOWN = -999,
-
-       /* Client Register related Errors used in API return */
-
-       /** Application is already registered */
-       NET_ERR_APP_ALREADY_REGISTERED = -990,
-       /** Application is not registered */
-       NET_ERR_APP_NOT_REGISTERED = -989,
-
-       /* Connection Related Error */
-
-       /** No active connection exists for the given profile name */
-       NET_ERR_NO_ACTIVE_CONNECTIONS = -899,
-       /** Active connection already exists for the given profile name  */
-       NET_ERR_ACTIVE_CONNECTION_EXISTS = -898,
-
-       /** Connection failure : out of range */
-       NET_ERR_CONNECTION_OUT_OF_RANGE = -897,
-       /** Connection failure : pin missing */
-       NET_ERR_CONNECTION_PIN_MISSING = -896,
-       /** Connection failure : dhcp failed */
-       NET_ERR_CONNECTION_DHCP_FAILED = -895,
-       /** Connection failure */
-       NET_ERR_CONNECTION_CONNECT_FAILED = -894,
-       /** Connection failure : login failed */
-       NET_ERR_CONNECTION_LOGIN_FAILED = -893,
-       /** Connection failure : authentication failed */
-       NET_ERR_CONNECTION_AUTH_FAILED = -892,
-       /** Connection failure : invalid key */
-       NET_ERR_CONNECTION_INVALID_KEY = -891,
-
-       /* Other Error */
-
-       /** Access(permission) denied */
-       NET_ERR_ACCESS_DENIED = -799,
-       /** Operation is in progress */
-       NET_ERR_IN_PROGRESS = -798,
-       /** Operation was aborted by client or network*/
-       NET_ERR_OPERATION_ABORTED = -797,
-       /** Invalid value of API parameter */
-       NET_ERR_INVALID_PARAM = -796,
-       /** Invalid operation depending on current state */
-       NET_ERR_INVALID_OPERATION = -795,
-
-       /** Feature not supported */
-       NET_ERR_NOT_SUPPORTED = -794,
-       /** TimeOut Error */
-       NET_ERR_TIME_OUT = -793,
-       /** Network service is not available */
-       NET_ERR_NO_SERVICE = -792,
-       /** DBus can't find appropriate method */
-       NET_ERR_UNKNOWN_METHOD = -791,
-       /** Operation is restricted */
-       NET_ERR_SECURITY_RESTRICTED = -790,
-       /** Already exists */
-       NET_ERR_ALREADY_EXISTS = -789,
-
-       /** WiFi driver on/off failed */
-       NET_ERR_WIFI_DRIVER_FAILURE = -699,
-       NET_ERR_WIFI_DRIVER_LOAD_INPROGRESS = -698,
-} net_err_t;
 
 /**
 * @enum net_wifi_state_t

diff --git a/src/wifi-internal.c b/src/wifi-internal.c
index cfe5a2789546dfe3e73c1b5f58754ea2b1b42311..782f3cdb65ea5eae36b3e3299fa67f32fcc12fd4 100755 (executable)
--- a/src/wifi-internal.c
+++ b/src/wifi-internal.c
@@ -148,103 +148,6 @@ char *_wifi_get_ip_config_str(net_ip_config_type_t ip_config_type)
        return NULL;
 }
 
-char* _net_print_error(net_err_t error)
-{
-       switch (error) {
-               /** No error */
-       case NET_ERR_NONE:
-               return "NET_ERR_NONE";
-
-               /* Common Error value */
-
-               /** Error unknown */
-       case NET_ERR_UNKNOWN:
-               return "NET_ERR_UNKNOWN";
-
-               /* Client Register related Errors used in API return */
-
-               /** Application is already registered */
-       case NET_ERR_APP_ALREADY_REGISTERED:
-               return "NET_ERR_APP_ALREADY_REGISTERED";
-               /** Application is not registered */
-       case NET_ERR_APP_NOT_REGISTERED:
-               return "NET_ERR_APP_NOT_REGISTERED";
-
-               /* Connection Related Error */
-
-               /** No active connection exists for the given profile name */
-       case NET_ERR_NO_ACTIVE_CONNECTIONS:
-               return "NET_ERR_NO_ACTIVE_CONNECTIONS";
-               /** Active connection already exists for
-                *  the given profile name
-                */
-       case NET_ERR_ACTIVE_CONNECTION_EXISTS:
-               return "NET_ERR_ACTIVE_CONNECTION_EXISTS";
-
-               /** Connection failure : out of range */
-       case NET_ERR_CONNECTION_OUT_OF_RANGE:
-               return "NET_ERR_CONNECTION_OUT_OF_RANGE";
-               /** Connection failure : pin missing */
-       case NET_ERR_CONNECTION_PIN_MISSING:
-               return "NET_ERR_CONNECTION_PIN_MISSING";
-               /** Connection failure : dhcp failed */
-       case NET_ERR_CONNECTION_DHCP_FAILED:
-               return "NET_ERR_CONNECTION_DHCP_FAILED";
-               /** Connection failure */
-       case NET_ERR_CONNECTION_CONNECT_FAILED:
-               return "NET_ERR_CONNECTION_CONNECT_FAILED";
-               /** Connection failure : login failed */
-       case NET_ERR_CONNECTION_LOGIN_FAILED:
-               return "NET_ERR_CONNECTION_LOGIN_FAILED";
-               /** Connection failure : authentication failed */
-       case NET_ERR_CONNECTION_AUTH_FAILED:
-               return "NET_ERR_CONNECTION_AUTH_FAILED";
-               /** Connection failure : invalid key */
-       case NET_ERR_CONNECTION_INVALID_KEY:
-               return "NET_ERR_CONNECTION_INVALID_KEY";
-
-               /* Other Error */
-
-               /** Access is denied */
-       case NET_ERR_ACCESS_DENIED:
-               return "NET_ERR_ACCESS_DENIED";
-               /** Operation is in progress */
-       case NET_ERR_IN_PROGRESS:
-               return "NET_ERR_IN_PROGRESS";
-               /** Operation was aborted by client or network*/
-       case NET_ERR_OPERATION_ABORTED:
-               return "NET_ERR_OPERATION_ABORTED";
-               /** Invalid value of API parameter */
-       case NET_ERR_INVALID_PARAM:
-               return "NET_ERR_INVALID_PARAM";
-               /** invalid operation depending on current state */
-       case NET_ERR_INVALID_OPERATION:
-               return "NET_ERR_INVALID_OPERATION";
-
-               /** Feature not supported */
-       case NET_ERR_NOT_SUPPORTED:
-               return "NET_ERR_NOT_SUPPORTED";
-               /** TimeOut Error */
-       case NET_ERR_TIME_OUT:
-               return "NET_ERR_TIME_OUT";
-               /** Network service is not available*/
-       case NET_ERR_NO_SERVICE:
-               return "NET_ERR_NO_SERVICE";
-               /** DBus can't find appropriate method */
-       case NET_ERR_UNKNOWN_METHOD:
-               return "NET_ERR_UNKNOWN_METHOD";
-               /** Operation is restricted */
-       case NET_ERR_SECURITY_RESTRICTED:
-               return "NET_ERR_SECURITY_RESTRICTED";
-               /** WiFi driver on/off failed */
-       case NET_ERR_WIFI_DRIVER_FAILURE:
-               return "NET_ERR_WIFI_DRIVER_FAILURE";
-       default:
-               return "INVALID";
-       }
-}
-
-
 wifi_error_e _wifi_connman_lib_error2wifi_error(enum connman_lib_err err_type)
 {
        switch (err_type) {