modify naming of "set randompins cb" function 66/78766/2
authoryoungman <yman.jung@samsung.com>
Wed, 6 Jul 2016 22:41:14 +0000 (07:41 +0900)
committeryoungman <yman.jung@samsung.com>
Wed, 6 Jul 2016 23:30:29 +0000 (08:30 +0900)
Change-Id: Ic6074ff63a7968ead11013272767735d5b6ea9c9
Signed-off-by: youngman <yman.jung@samsung.com>
lib/icl-provisioning.c
lib/include/iotcon-provisioning.h

index 7d158c1125ef47efe97745549117c515bd8bcb81..c4299ff4e3f9bfbdc49301011a9f8dfa981f63b3 100644 (file)
@@ -42,8 +42,8 @@ typedef enum {
        ICL_PROVISIONING_REMOVE_DEVICE,
 } icl_provisioning_discover_e;
 
-struct icl_provisioning_randompins_cb_container {
-       iotcon_provisioning_randompins_cb cb;
+struct icl_provisioning_randompin_cb_container {
+       iotcon_provisioning_randompin_cb cb;
        void *user_data;
 };
 
@@ -107,7 +107,7 @@ struct icl_provisioning_remove_device_cb_container {
 
 static OTMCallbackData_t icl_justworks_otmcb;
 static OTMCallbackData_t icl_pinbased_otmcb;
-static struct icl_provisioning_randompins_cb_container icl_randompins_cb_container;
+static struct icl_provisioning_randompin_cb_container icl_randompin_cb_container;
 
 static iotcon_provisioning_devices_h icl_owned_devices;
 static iotcon_provisioning_devices_h icl_unowned_devices;
@@ -136,7 +136,7 @@ static void _provisioning_set_justworks()
 }
 
 
-static void _provisioning_set_randompins()
+static void _provisioning_set_randompin()
 {
        icl_pinbased_otmcb.loadSecretCB = InputPinCodeCallback;
        icl_pinbased_otmcb.createSecureSessionCB = CreateSecureSessionRandomPinCallback;
@@ -202,11 +202,11 @@ static void _provisioning_input_pin_cb(char *pin, size_t len)
        FN_CALL;
        char *temp;
 
-       RET_IF(NULL == icl_randompins_cb_container.cb);
+       RET_IF(NULL == icl_randompin_cb_container.cb);
        RET_IF(NULL == pin);
        RET_IF(len <= OXM_RANDOM_PIN_SIZE);
 
-       temp = icl_randompins_cb_container.cb(icl_randompins_cb_container.user_data);
+       temp = icl_randompin_cb_container.cb(icl_randompin_cb_container.user_data);
        if ((NULL == temp) || (len <= strlen(temp))) {
                ERR("Invalid Pin Number");
                return;
@@ -216,7 +216,7 @@ static void _provisioning_input_pin_cb(char *pin, size_t len)
 }
 
 
-API int iotcon_provisioning_set_randompins(iotcon_provisioning_randompins_cb cb,
+API int iotcon_provisioning_set_randompin_cb(iotcon_provisioning_randompin_cb cb,
                void *user_data)
 {
        FN_CALL;
@@ -225,7 +225,7 @@ API int iotcon_provisioning_set_randompins(iotcon_provisioning_randompins_cb cb,
        RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
        RETV_IF(NULL == cb, IOTCON_ERROR_INVALID_PARAMETER);
 
-       _provisioning_set_randompins();
+       _provisioning_set_randompin();
 
        ret = icl_ioty_mutex_lock();
        if (IOTCON_ERROR_NONE != ret) {
@@ -240,8 +240,8 @@ API int iotcon_provisioning_set_randompins(iotcon_provisioning_randompins_cb cb,
                return _provisioning_parse_oic_error(ret);
        }
 
-       icl_randompins_cb_container.cb = cb;
-       icl_randompins_cb_container.user_data = user_data;
+       icl_randompin_cb_container.cb = cb;
+       icl_randompin_cb_container.user_data = user_data;
 
        SetInputPinCB(_provisioning_input_pin_cb);
 
index 2eead718c16dfcfefbe5445ebb83f6b25af48de9..d39d4682e7b131429917497cfff0dc77b8786671 100644 (file)
@@ -42,9 +42,9 @@ typedef enum {
 /* initialize */
 int iotcon_provisioning_initialize(const char *file_path, const char *db_path);
 
-typedef char* (*iotcon_provisioning_randompins_cb)(void *user_data);
+typedef char* (*iotcon_provisioning_randompin_cb)(void *user_data);
 
-int iotcon_provisioning_set_randompins(iotcon_provisioning_randompins_cb cb,
+int iotcon_provisioning_set_randompin_cb(iotcon_provisioning_randompin_cb cb,
                void *user_data);
 
 /* discover */