Return proper error if handle is NULL
authorCheoleun Moon <chleun.moon@samsung.com>
Wed, 19 Feb 2020 05:19:34 +0000 (14:19 +0900)
committerCheoleun Moon <chleun.moon@samsung.com>
Wed, 19 Feb 2020 05:19:34 +0000 (14:19 +0900)
src/wifi-aware-private.c

index 596cc73..70d2431 100644 (file)
@@ -42,6 +42,7 @@ enum {
        NAN_ERROR_OPERATION_FAILED,
        NAN_ERROR_INVALID_PARAMETER,
        NAN_ERROR_MEMORY,
+       NAN_ERROR_ABORT,
        NAN_ERROR_BUSY,
        NAN_ERROR_TIMED_OUT,
        NAN_ERROR_NOT_AVAILABLE,
@@ -553,6 +554,8 @@ unsigned int _wifi_aware_publish_get_id(wifi_aware_publish_h publish)
 int _wifi_aware_publish_request(wifi_aware_publish_h publish,
                wifi_aware_published_cb callback, void *user_data)
 {
+       RET_VAL_IF(publish == NULL, WIFI_AWARE_ERROR_INVALID_PARAMETER, "wifi_aware_publish_h is NULL");
+
        __add_published_callback(publish, callback, user_data);
 
        return wifi_aware_gdbus_publish(publish,
@@ -562,7 +565,7 @@ int _wifi_aware_publish_request(wifi_aware_publish_h publish,
 
 int _wifi_aware_cancel_publish_request(wifi_aware_publish_h publish)
 {
-       RET_VAL_IF(publish == NULL, 0, "wifi_aware_publish_h is NULL");
+       RET_VAL_IF(publish == NULL, WIFI_AWARE_ERROR_INVALID_PARAMETER, "wifi_aware_publish_h is NULL");
 
        if (!__is_published(publish)) {
                WIFI_AWARE_LOGE("The publish is not done yet");
@@ -576,6 +579,8 @@ int _wifi_aware_cancel_publish_request(wifi_aware_publish_h publish)
 int _wifi_aware_update_publish_request(wifi_aware_publish_h publish,
                wifi_aware_published_cb callback, void *user_data)
 {
+       RET_VAL_IF(publish == NULL, WIFI_AWARE_ERROR_INVALID_PARAMETER, "wifi_aware_publish_h is NULL");
+
        __add_published_callback(publish, callback, user_data);
 
        return wifi_aware_gdbus_update_publish(publish,
@@ -665,7 +670,7 @@ unsigned int _wifi_aware_subscribe_get_id(wifi_aware_subscribe_h subscribe)
 int _wifi_aware_subscribe_request(wifi_aware_subscribe_h subscribe,
                wifi_aware_subscribed_cb callback, void *user_data)
 {
-       RET_VAL_IF(subscribe == NULL, 0, "wifi_aware_subscribe_h is NULL");
+       RET_VAL_IF(subscribe == NULL, WIFI_AWARE_ERROR_INVALID_PARAMETER, "wifi_aware_subscribe_h is NULL");
 
        __add_subscribed_callback(subscribe, callback, user_data);
 
@@ -676,7 +681,7 @@ int _wifi_aware_subscribe_request(wifi_aware_subscribe_h subscribe,
 
 int _wifi_aware_cancel_subscribe_request(wifi_aware_subscribe_h subscribe)
 {
-       RET_VAL_IF(subscribe == NULL, 0, "wifi_aware_subscribe_h is NULL");
+       RET_VAL_IF(subscribe == NULL, WIFI_AWARE_ERROR_INVALID_PARAMETER, "wifi_aware_subscribe_h is NULL");
 
        if (!__is_subscribed(subscribe)) {
                WIFI_AWARE_LOGE("The subscribe is not done yet");
@@ -690,7 +695,7 @@ int _wifi_aware_cancel_subscribe_request(wifi_aware_subscribe_h subscribe)
 int _wifi_aware_update_subscribe_request(wifi_aware_subscribe_h subscribe,
                wifi_aware_subscribed_cb callback, void *user_data)
 {
-       RET_VAL_IF(subscribe == NULL, 0, "wifi_aware_subscribe_h is NULL");
+       RET_VAL_IF(subscribe == NULL, WIFI_AWARE_ERROR_INVALID_PARAMETER, "wifi_aware_subscribe_h is NULL");
 
        __add_subscribed_callback(subscribe, callback, user_data);