Commit 9c6636d0 authored by Kishen Maloor's avatar Kishen Maloor

Merge branch 'origin/hollywood' into ipanema

Signed-off-by: Kishen Maloor's avatarKishen Maloor <kishen.maloor@intel.com>
parents 01964cbc ea870f13
Pipeline #1051 passed with stage
in 4 minutes and 50 seconds
...@@ -493,7 +493,6 @@ ...@@ -493,7 +493,6 @@
"readOnly":true "readOnly":true
}, },
"anchor":{ "anchor":{
"format":"uri",
"type":"string", "type":"string",
"maxLength":256, "maxLength":256,
"description":"" "description":""
...@@ -932,7 +931,6 @@ ...@@ -932,7 +931,6 @@
"readOnly":true "readOnly":true
}, },
"anchor":{ "anchor":{
"format":"uri",
"type":"string", "type":"string",
"maxLength":256, "maxLength":256,
"description":"" "description":""
...@@ -1258,7 +1256,6 @@ ...@@ -1258,7 +1256,6 @@
"readOnly":true "readOnly":true
}, },
"anchor":{ "anchor":{
"format":"uri",
"type":"string", "type":"string",
"maxLength":256, "maxLength":256,
"description":"" "description":""
......
...@@ -822,7 +822,7 @@ register_resources(void) ...@@ -822,7 +822,7 @@ register_resources(void)
oc_link_set_interfaces(ric1, OC_IF_A); oc_link_set_interfaces(ric1, OC_IF_A);
oc_collection_add_link(res_ruleinputcol, ric1); oc_collection_add_link(res_ruleinputcol, ric1);
oc_collection_add_mandatory_rt(res_ruleinputcol, "oic.r.switch.binary"); //oc_collection_add_mandatory_rt(res_ruleinputcol, "oic.r.switch.binary");
oc_collection_add_supported_rt(res_ruleinputcol, "oic.r.switch.binary"); oc_collection_add_supported_rt(res_ruleinputcol, "oic.r.switch.binary");
oc_add_collection(res_ruleinputcol); oc_add_collection(res_ruleinputcol);
......
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
"description":"", "description":"",
"parameters":[ "parameters":[
{ {
"$ref":"#/parameters/interface-col" "$ref":"#/parameters/interface-ll"
} }
], ],
"responses":{ "responses":{
...@@ -205,7 +205,7 @@ ...@@ -205,7 +205,7 @@
"description":"", "description":"",
"parameters":[ "parameters":[
{ {
"$ref":"#/parameters/interface-col" "$ref":"#/parameters/interface-ll"
} }
], ],
"responses":{ "responses":{
...@@ -529,8 +529,7 @@ ...@@ -529,8 +529,7 @@
"items":{ "items":{
"enum":[ "enum":[
"oic.if.ll", "oic.if.ll",
"oic.if.baseline", "oic.if.baseline"
"oic.if.b"
], ],
"type":"string", "type":"string",
"maxLength":64 "maxLength":64
...@@ -587,7 +586,6 @@ ...@@ -587,7 +586,6 @@
"oic.oic-link":{ "oic.oic-link":{
"properties":{ "properties":{
"anchor":{ "anchor":{
"format":"uri",
"type":"string", "type":"string",
"maxLength":256, "maxLength":256,
"description":"" "description":""
...@@ -940,16 +938,6 @@ ...@@ -940,16 +938,6 @@
"in":"query", "in":"query",
"name":"if" "name":"if"
}, },
"interface-col":{
"enum":[
"oic.if.ll",
"oic.if.baseline",
"oic.if.b"
],
"type":"string",
"in":"query",
"name":"if"
},
"interface-ll":{ "interface-ll":{
"enum":[ "enum":[
"oic.if.ll", "oic.if.ll",
......
...@@ -50,7 +50,9 @@ oc_sec_sdi_free(void) ...@@ -50,7 +50,9 @@ oc_sec_sdi_free(void)
} }
for (device = 0; device < oc_core_get_num_devices(); device++) { for (device = 0; device < oc_core_get_num_devices(); device++) {
oc_free_string(&(sdi[device].name)); if (oc_string_len(sdi[device].name) > 0) {
oc_free_string(&(sdi[device].name));
}
} }
#ifdef OC_DYNAMIC_ALLOCATION #ifdef OC_DYNAMIC_ALLOCATION
...@@ -69,8 +71,9 @@ oc_sec_sdi_default(size_t device) ...@@ -69,8 +71,9 @@ oc_sec_sdi_default(size_t device)
sdi[device].priv = false; sdi[device].priv = false;
memset(&(sdi[device].uuid), 0, sizeof(oc_uuid_t)); memset(&(sdi[device].uuid), 0, sizeof(oc_uuid_t));
oc_free_string(&sdi[device].name); if (oc_string_len(sdi[device].name) > 0) {
oc_new_string(&sdi[device].name, "", 0); oc_free_string(&sdi[device].name);
}
oc_sec_dump_sdi(device); oc_sec_dump_sdi(device);
} }
...@@ -102,7 +105,9 @@ oc_sec_decode_sdi(oc_rep_t *rep, bool from_storage, size_t device) ...@@ -102,7 +105,9 @@ oc_sec_decode_sdi(oc_rep_t *rep, bool from_storage, size_t device)
return false; return false;
} }
oc_free_string(&s->name); if (oc_string_len(s->name) > 0) {
oc_free_string(&s->name);
}
oc_new_string(&s->name, oc_string(rep->value.string), oc_new_string(&s->name, oc_string(rep->value.string),
oc_string_len(rep->value.string)); oc_string_len(rep->value.string));
suc = true; suc = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment