From c4f64d5ed941d90e3c71b989fa486a644683fb9c Mon Sep 17 00:00:00 2001 From: Todd Malsbary Date: Mon, 13 Feb 2017 10:28:54 -0800 Subject: [PATCH] [IOT-1815] Add missing OCRDDatabase functions to .def. Note OCRDDatabaseGetStorageFilename was previously an internal API. However to allow the RD lib to locate it, it is now exported. Bug: https://jira.iotivity.org/browse/IOT-1815 Change-Id: I40c579c7e14024257b343737833664df858aa8e5 Signed-off-by: Todd Malsbary Reviewed-on: https://gerrit.iotivity.org/gerrit/17227 Tested-by: jenkins-iotivity Reviewed-by: Habib Virji --- resource/csdk/stack/include/internal/ocstackinternal.h | 9 --------- resource/csdk/stack/include/ocstack.h | 7 +++++++ resource/csdk/stack/octbstack_product.def | 3 +++ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/resource/csdk/stack/include/internal/ocstackinternal.h b/resource/csdk/stack/include/internal/ocstackinternal.h index cb8e4d5..31769b1 100644 --- a/resource/csdk/stack/include/internal/ocstackinternal.h +++ b/resource/csdk/stack/include/internal/ocstackinternal.h @@ -332,15 +332,6 @@ OCStackResult OCUpdateResourceInsWithResponse(const char *requestUri, const OCClientResponse *response); #endif -#if defined(RD_SERVER) -/** - * Returns the filename to be used for database persistent storage. - * - * @return the filename - */ -const char *OCRDDatabaseGetStorageFilename(); -#endif - /** * Delete all of the dynamically allocated elements that were created for the resource attributes. * diff --git a/resource/csdk/stack/include/ocstack.h b/resource/csdk/stack/include/ocstack.h index f82ffe5..977db43 100644 --- a/resource/csdk/stack/include/ocstack.h +++ b/resource/csdk/stack/include/ocstack.h @@ -734,6 +734,13 @@ OCResourceHandle OCGetResourceHandleAtUri(const char *uri); OCStackResult OCRDDatabaseSetStorageFilename(const char *filename); /** + * Returns the filename to be used for database persistent storage. + * + * @return the filename + */ +const char *OCRDDatabaseGetStorageFilename(); + +/** * Search the RD database for queries. * * @param interfaceType is the interface type that is queried. diff --git a/resource/csdk/stack/octbstack_product.def b/resource/csdk/stack/octbstack_product.def index f1a0831..ab93409 100644 --- a/resource/csdk/stack/octbstack_product.def +++ b/resource/csdk/stack/octbstack_product.def @@ -78,6 +78,9 @@ OCNotifyListOfObservers OCPayloadDestroy OCPresencePayloadCreate OCProcess +OCRDDatabaseDiscoveryPayloadCreate +OCRDDatabaseGetStorageFilename +OCRDDatabaseSetStorageFilename OCRegisterPersistentStorageHandler OCRepPayloadAddInterface OCRepPayloadAddResourceType -- 2.7.4