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 @@
"readOnly":true
},
"anchor":{
"format":"uri",
"type":"string",
"maxLength":256,
"description":""
......@@ -932,7 +931,6 @@
"readOnly":true
},
"anchor":{
"format":"uri",
"type":"string",
"maxLength":256,
"description":""
......@@ -1258,7 +1256,6 @@
"readOnly":true
},
"anchor":{
"format":"uri",
"type":"string",
"maxLength":256,
"description":""
......
......@@ -822,7 +822,7 @@ register_resources(void)
oc_link_set_interfaces(ric1, OC_IF_A);
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_add_collection(res_ruleinputcol);
......
......@@ -187,7 +187,7 @@
"description":"",
"parameters":[
{
"$ref":"#/parameters/interface-col"
"$ref":"#/parameters/interface-ll"
}
],
"responses":{
......@@ -205,7 +205,7 @@
"description":"",
"parameters":[
{
"$ref":"#/parameters/interface-col"
"$ref":"#/parameters/interface-ll"
}
],
"responses":{
......@@ -529,8 +529,7 @@
"items":{
"enum":[
"oic.if.ll",
"oic.if.baseline",
"oic.if.b"
"oic.if.baseline"
],
"type":"string",
"maxLength":64
......@@ -587,7 +586,6 @@
"oic.oic-link":{
"properties":{
"anchor":{
"format":"uri",
"type":"string",
"maxLength":256,
"description":""
......@@ -940,16 +938,6 @@
"in":"query",
"name":"if"
},
"interface-col":{
"enum":[
"oic.if.ll",
"oic.if.baseline",
"oic.if.b"
],
"type":"string",
"in":"query",
"name":"if"
},
"interface-ll":{
"enum":[
"oic.if.ll",
......
......@@ -50,7 +50,9 @@ oc_sec_sdi_free(void)
}
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
......@@ -69,8 +71,9 @@ oc_sec_sdi_default(size_t device)
sdi[device].priv = false;
memset(&(sdi[device].uuid), 0, sizeof(oc_uuid_t));
oc_free_string(&sdi[device].name);
oc_new_string(&sdi[device].name, "", 0);
if (oc_string_len(sdi[device].name) > 0) {
oc_free_string(&sdi[device].name);
}
oc_sec_dump_sdi(device);
}
......@@ -102,7 +105,9 @@ oc_sec_decode_sdi(oc_rep_t *rep, bool from_storage, size_t device)
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_string_len(rep->value.string));
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