Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

native code: changed return type from uint32_t to int32_t #127

Merged
merged 1 commit into from
Aug 15, 2023
+140 −142
Merged

native code: changed return type from uint32_t to int32_t #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions languages/c/src/shared/src/Accessor/Accessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ namespace FireboltSDK {
_singleton = nullptr;
}

uint32_t Accessor::CreateEventHandler()
int32_t Accessor::CreateEventHandler()
{
Event::Instance().Configure(_transport);
return FireboltSDKErrorNone;
}

uint32_t Accessor::DestroyEventHandler()
int32_t Accessor::DestroyEventHandler()
{
Event::Dispose();
return FireboltSDKErrorNone;
Expand All @@ -67,7 +67,7 @@ namespace FireboltSDK {
return Event::Instance();
}

uint32_t Accessor::CreateTransport(const string& url, const uint32_t waitTime = DefaultWaitTime)
int32_t Accessor::CreateTransport(const string& url, const uint32_t waitTime = DefaultWaitTime)
{
if (_transport != nullptr) {
delete _transport;
Expand All @@ -83,7 +83,7 @@ namespace FireboltSDK {
return ((_transport != nullptr) ? FireboltSDKErrorNone : FireboltSDKErrorUnavailable);
}

uint32_t Accessor::DestroyTransport()
int32_t Accessor::DestroyTransport()
{
if (_transport != nullptr) {
delete _transport;
Expand All @@ -98,7 +98,7 @@ namespace FireboltSDK {
return _transport;
}

uint32_t Accessor::WaitForLinkReady(Transport<WPEFramework::Core::JSON::IElement>* transport, const uint32_t waitTime = DefaultWaitTime) {
int32_t Accessor::WaitForLinkReady(Transport<WPEFramework::Core::JSON::IElement>* transport, const uint32_t waitTime = DefaultWaitTime) {
uint32_t waiting = (waitTime == WPEFramework::Core::infinite ? WPEFramework::Core::infinite : waitTime);
static constexpr uint32_t SLEEPSLOT_TIME = 100;

Expand Down
10 changes: 5 additions & 5 deletions languages/c/src/shared/src/Accessor/Accessor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,11 @@ namespace FireboltSDK {
Transport<WPEFramework::Core::JSON::IElement>* GetTransport();

private:
uint32_t CreateEventHandler();
uint32_t DestroyEventHandler();
uint32_t CreateTransport(const string& url, const uint32_t waitTime);
uint32_t DestroyTransport();
uint32_t WaitForLinkReady(Transport<WPEFramework::Core::JSON::IElement>* transport, const uint32_t waitTime);
int32_t CreateEventHandler();
int32_t DestroyEventHandler();
int32_t CreateTransport(const string& url, const uint32_t waitTime);
int32_t DestroyTransport();
int32_t WaitForLinkReady(Transport<WPEFramework::Core::JSON::IElement>* transport, const uint32_t waitTime);

private:
WPEFramework::Core::ProxyType<WorkerPoolImplementation> _workerPool;
Expand Down
14 changes: 7 additions & 7 deletions languages/c/src/shared/src/Event/Event.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ namespace FireboltSDK {
_transport->SetEventHandler(this);
}

uint32_t Event::Unsubscribe(const string& eventName, void* usercb)
int32_t Event::Unsubscribe(const string& eventName, void* usercb)
{
uint32_t status = Revoke(eventName, usercb);
int32_t status = Revoke(eventName, usercb);

if (status == FireboltSDKErrorNone) {
if (_transport != nullptr) {
Expand All @@ -74,9 +74,9 @@ namespace FireboltSDK {
return ((status == FireboltSDKErrorInUse) ? FireboltSDKErrorNone: status);
}

uint32_t Event::ValidateResponse(const WPEFramework::Core::ProxyType<WPEFramework::Core::JSONRPC::Message>& jsonResponse, bool& enabled) /* override */
int32_t Event::ValidateResponse(const WPEFramework::Core::ProxyType<WPEFramework::Core::JSONRPC::Message>& jsonResponse, bool& enabled) /* override */
{
uint32_t result = FireboltSDKErrorGeneral;
int32_t result = FireboltSDKErrorGeneral;
Response response;
_transport->FromMessage((WPEFramework::Core::JSON::IElement*)&response, *jsonResponse);
if (response.Listening.IsSet() == true) {
Expand All @@ -86,7 +86,7 @@ namespace FireboltSDK {
return result;
}

uint32_t Event::Dispatch(const string& eventName, const WPEFramework::Core::ProxyType<WPEFramework::Core::JSONRPC::Message>& jsonResponse) /* override */
int32_t Event::Dispatch(const string& eventName, const WPEFramework::Core::ProxyType<WPEFramework::Core::JSONRPC::Message>& jsonResponse) /* override */
{
string response = jsonResponse->Result.Value();
_adminLock.Lock();
Expand Down Expand Up @@ -120,9 +120,9 @@ namespace FireboltSDK {
return FireboltSDKErrorNone;;
}

uint32_t Event::Revoke(const string& eventName, void* usercb)
int32_t Event::Revoke(const string& eventName, void* usercb)
{
uint32_t status = FireboltSDKErrorNone;
int32_t status = FireboltSDKErrorNone;
_adminLock.Lock();
EventMap::iterator eventIndex = _eventMap.find(eventName);
if (eventIndex != _eventMap.end()) {
Expand Down
22 changes: 11 additions & 11 deletions languages/c/src/shared/src/Event/Event.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ namespace FireboltSDK {

class Event : public IEventHandler {
public:
typedef std::function<uint32_t(void*, const void*, const string& parameters)> DispatchFunction;
typedef std::function<int32_t(void*, const void*, const string& parameters)> DispatchFunction;
private:
enum State : uint8_t {
IDLE,
Expand Down Expand Up @@ -73,16 +73,16 @@ namespace FireboltSDK {

public:
template <typename RESULT, typename CALLBACK>
uint32_t Subscribe(const string& eventName, const CALLBACK& callback, void* usercb, const void* userdata)
int32_t Subscribe(const string& eventName, const CALLBACK& callback, void* usercb, const void* userdata)
{
JsonObject jsonParameters;
return Subscribe<RESULT, CALLBACK>(eventName, jsonParameters, callback, usercb, userdata);
}

template <typename RESULT, typename CALLBACK>
uint32_t Subscribe(const string& eventName, JsonObject& jsonParameters, const CALLBACK& callback, void* usercb, const void* userdata)
int32_t Subscribe(const string& eventName, JsonObject& jsonParameters, const CALLBACK& callback, void* usercb, const void* userdata)
{
uint32_t status = FireboltSDKErrorUnavailable;
int32_t status = FireboltSDKErrorUnavailable;
if (_transport != nullptr) {

status = Assign<RESULT, CALLBACK>(eventName, callback, usercb, userdata);
Expand Down Expand Up @@ -110,15 +110,15 @@ namespace FireboltSDK {
return status;
}

uint32_t Unsubscribe(const string& eventName, void* usercb);
int32_t Unsubscribe(const string& eventName, void* usercb);

private:
template <typename PARAMETERS, typename CALLBACK>
uint32_t Assign(const string& eventName, const CALLBACK& callback, void* usercb, const void* userdata)
int32_t Assign(const string& eventName, const CALLBACK& callback, void* usercb, const void* userdata)
{
uint32_t status = FireboltSDKErrorNone;
int32_t status = FireboltSDKErrorNone;
std::function<void(void* usercb, const void* userdata, void* parameters)> actualCallback = callback;
DispatchFunction implementation = [actualCallback](void* usercb, const void* userdata, const string& parameters) -> uint32_t {
DispatchFunction implementation = [actualCallback](void* usercb, const void* userdata, const string& parameters) -> int32_t {

WPEFramework::Core::ProxyType<PARAMETERS>* inbound = new WPEFramework::Core::ProxyType<PARAMETERS>();
*inbound = WPEFramework::Core::ProxyType<PARAMETERS>::Create();
Expand Down Expand Up @@ -149,11 +149,11 @@ namespace FireboltSDK {
_adminLock.Unlock();
return status;
}
uint32_t Revoke(const string& eventName, void* usercb);
int32_t Revoke(const string& eventName, void* usercb);

private:
uint32_t ValidateResponse(const WPEFramework::Core::ProxyType<WPEFramework::Core::JSONRPC::Message>& jsonResponse, bool& enabled) override;
uint32_t Dispatch(const string& eventName, const WPEFramework::Core::ProxyType<WPEFramework::Core::JSONRPC::Message>& jsonResponse) override;
int32_t ValidateResponse(const WPEFramework::Core::ProxyType<WPEFramework::Core::JSONRPC::Message>& jsonResponse, bool& enabled) override;
int32_t Dispatch(const string& eventName, const WPEFramework::Core::ProxyType<WPEFramework::Core::JSONRPC::Message>& jsonResponse) override;

private:
EventMap _eventMap;
Expand Down
4 changes: 2 additions & 2 deletions languages/c/src/shared/src/Logger/Logger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ ENUM_CONVERSION_END(FireboltSDK::Logger::Category)
namespace FireboltSDK {
/* static */ Logger::LogLevel Logger::_logLevel = Logger::LogLevel::Error;

uint32_t Logger::SetLogLevel(Logger::LogLevel logLevel)
int32_t Logger::SetLogLevel(Logger::LogLevel logLevel)
{
ASSERT(logLevel < Logger::LogLevel::MaxLevel);
uint32_t status = FireboltSDKErrorNotSupported;
int32_t status = FireboltSDKErrorNotSupported;
if (logLevel < Logger::LogLevel::MaxLevel) {
_logLevel = logLevel;
status = FireboltSDKErrorNone;
Expand Down
2 changes: 1 addition & 1 deletion languages/c/src/shared/src/Logger/Logger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ namespace FireboltSDK {
~Logger() = default;

public:
static uint32_t SetLogLevel(LogLevel logLevel);
static int32_t SetLogLevel(LogLevel logLevel);
static void Log(LogLevel logLevel, Category category, const std::string& module, const std::string file, const std::string function, const uint16_t line, const std::string& format, ...);

public:
Expand Down
24 changes: 12 additions & 12 deletions languages/c/src/shared/src/Properties/Properties.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ namespace FireboltSDK {

public:
template <typename RESPONSETYPE>
static uint32_t Get(const string& propertyName, WPEFramework::Core::ProxyType<RESPONSETYPE>& response)
static int32_t Get(const string& propertyName, WPEFramework::Core::ProxyType<RESPONSETYPE>& response)
{
uint32_t status = FireboltSDKErrorUnavailable;
int32_t status = FireboltSDKErrorUnavailable;
Transport<WPEFramework::Core::JSON::IElement>* transport = Accessor::Instance().GetTransport();
if (transport != nullptr) {
JsonObject parameters;
Expand All @@ -57,9 +57,9 @@ namespace FireboltSDK {
}

template <typename PARAMETERS, typename RESPONSETYPE>
static uint32_t Get(const string& propertyName, const PARAMETERS& parameters, WPEFramework::Core::ProxyType<RESPONSETYPE>& response)
static int32_t Get(const string& propertyName, const PARAMETERS& parameters, WPEFramework::Core::ProxyType<RESPONSETYPE>& response)
{
uint32_t status = FireboltSDKErrorUnavailable;
int32_t status = FireboltSDKErrorUnavailable;
Transport<WPEFramework::Core::JSON::IElement>* transport = Accessor::Instance().GetTransport();
if (transport != nullptr) {
RESPONSETYPE responseType;
Expand All @@ -81,9 +81,9 @@ namespace FireboltSDK {


template <typename RESPONSETYPE>
static uint32_t Get(const string& propertyName, RESPONSETYPE& response)
static int32_t Get(const string& propertyName, RESPONSETYPE& response)
{
uint32_t status = FireboltSDKErrorUnavailable;
int32_t status = FireboltSDKErrorUnavailable;
Transport<WPEFramework::Core::JSON::IElement>* transport = Accessor::Instance().GetTransport();
if (transport != nullptr) {
JsonObject parameters;
Expand All @@ -96,9 +96,9 @@ namespace FireboltSDK {
}

template <typename PARAMETERS, typename RESPONSETYPE>
static uint32_t Get(const string& propertyName, const PARAMETERS& parameters, RESPONSETYPE& response)
static int32_t Get(const string& propertyName, const PARAMETERS& parameters, RESPONSETYPE& response)
{
uint32_t status = FireboltSDKErrorUnavailable;
int32_t status = FireboltSDKErrorUnavailable;
Transport<WPEFramework::Core::JSON::IElement>* transport = Accessor::Instance().GetTransport();
if (transport != nullptr) {
status = transport->Invoke(propertyName, parameters, response);
Expand All @@ -110,9 +110,9 @@ namespace FireboltSDK {
}

template <typename PARAMETERS>
static uint32_t Set(const string& propertyName, const PARAMETERS& parameters)
static int32_t Set(const string& propertyName, const PARAMETERS& parameters)
{
uint32_t status = FireboltSDKErrorUnavailable;
int32_t status = FireboltSDKErrorUnavailable;
Transport<WPEFramework::Core::JSON::IElement>* transport = Accessor::Instance().GetTransport();
if (transport != nullptr) {
JsonObject responseType;
Expand All @@ -125,12 +125,12 @@ namespace FireboltSDK {
}

template <typename RESULT, typename CALLBACK>
static uint32_t Subscribe(const string& propertyName, JsonObject& paramsters, const CALLBACK& callback, void* usercb, const void* userdata)
static int32_t Subscribe(const string& propertyName, JsonObject& paramsters, const CALLBACK& callback, void* usercb, const void* userdata)
{
return Event::Instance().Subscribe<RESULT, CALLBACK>(EventName(propertyName), paramsters, callback, usercb, userdata);
}

static uint32_t Unsubscribe(const string& propertyName, void* usercb)
static int32_t Unsubscribe(const string& propertyName, void* usercb)
{
return Event::Instance().Unsubscribe(EventName(propertyName), usercb);
}
Expand Down
Loading