From d896122156502a519f113aa72d00a2438afde9e5 Mon Sep 17 00:00:00 2001 From: Jeffrey Townsend Date: Wed, 12 Jun 2019 18:02:15 +0000 Subject: [PATCH] onlp_attribute_{onie,asset}_info_get() must be locked. --- packages/base/any/onlp/src/onlp/module/src/attribute.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/base/any/onlp/src/onlp/module/src/attribute.c b/packages/base/any/onlp/src/onlp/module/src/attribute.c index f55786f6..55573da2 100644 --- a/packages/base/any/onlp/src/onlp/module/src/attribute.c +++ b/packages/base/any/onlp/src/onlp/module/src/attribute.c @@ -109,8 +109,8 @@ onlp_attribute_get_locked__(onlp_oid_t oid, const char* attribute, ONLP_LOCKED_API3(onlp_attribute_get, onlp_oid_t, oid, const char*, attribute, void**, value) -int -onlp_attribute_onie_info_get(onlp_oid_t oid, onlp_onie_info_t** rvp) +static int +onlp_attribute_onie_info_get_locked__(onlp_oid_t oid, onlp_onie_info_t** rvp) { int rv; onlp_onie_info_t* rp; @@ -130,6 +130,7 @@ onlp_attribute_onie_info_get(onlp_oid_t oid, onlp_onie_info_t** rvp) *rvp = rp; return rv; } +ONLP_LOCKED_API2(onlp_attribute_onie_info_get, onlp_oid_t, oid, onlp_onie_info_t**, rvp); int onlp_attribute_onie_info_free(onlp_oid_t oid, onlp_onie_info_t* p) @@ -186,8 +187,8 @@ onlp_attribute_onie_info_show_json(onlp_oid_t oid, aim_pvs_t* pvs) } -int -onlp_attribute_asset_info_get(onlp_oid_t oid, onlp_asset_info_t** rvp) +static int +onlp_attribute_asset_info_get_locked__(onlp_oid_t oid, onlp_asset_info_t** rvp) { int rv; onlp_asset_info_t* rp; @@ -207,6 +208,7 @@ onlp_attribute_asset_info_get(onlp_oid_t oid, onlp_asset_info_t** rvp) *rvp = rp; return rv; } +ONLP_LOCKED_API2(onlp_attribute_asset_info_get, onlp_oid_t, oid, onlp_asset_info_t**, rvp); int onlp_attribute_asset_info_free(onlp_oid_t oid, onlp_asset_info_t* p)