Skip to content

Commit

Permalink
Fix redundant void arg for Darwin, Tizen and webOS
Browse files Browse the repository at this point in the history
  • Loading branch information
arkq committed Nov 25, 2022
1 parent 8c35cee commit 21c0f86
Show file tree
Hide file tree
Showing 13 changed files with 45 additions and 45 deletions.
6 changes: 3 additions & 3 deletions src/platform/Darwin/BLEManagerImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ void BLEManagerImpl::_Shutdown()
}
}

bool BLEManagerImpl::_IsAdvertisingEnabled(void)
bool BLEManagerImpl::_IsAdvertisingEnabled()
{
ChipLogDetail(DeviceLayer, "%s", __FUNCTION__);
return false;
Expand All @@ -106,7 +106,7 @@ CHIP_ERROR BLEManagerImpl::_SetAdvertisingMode(BLEAdvertisingMode mode)
return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
}

bool BLEManagerImpl::_IsAdvertising(void)
bool BLEManagerImpl::_IsAdvertising()
{
ChipLogDetail(DeviceLayer, "%s", __FUNCTION__);
return false;
Expand All @@ -129,7 +129,7 @@ BleLayer * BLEManagerImpl::_GetBleLayer()
return this;
}

uint16_t BLEManagerImpl::_NumConnections(void)
uint16_t BLEManagerImpl::_NumConnections()
{
ChipLogDetail(DeviceLayer, "%s", __FUNCTION__);
return 0;
Expand Down
2 changes: 1 addition & 1 deletion src/platform/Darwin/ConfigurationManagerImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ CHIP_ERROR ConfigurationManagerImpl::WriteConfigValueBin(Key key, const uint8_t
#endif // CHIP_DISABLE_PLATFORM_KVS
}

void ConfigurationManagerImpl::RunConfigUnitTest(void)
void ConfigurationManagerImpl::RunConfigUnitTest()
{
#if CHIP_DISABLE_PLATFORM_KVS
return;
Expand Down
2 changes: 1 addition & 1 deletion src/platform/Darwin/PosixConfig.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ CHIP_ERROR PosixConfig::ClearNamespace(const char * ns)
return err;
}

CHIP_ERROR PosixConfig::FactoryResetConfig(void)
CHIP_ERROR PosixConfig::FactoryResetConfig()
{
CHIP_ERROR err = CHIP_ERROR_PERSISTED_STORAGE_FAILED;
SuccessOrExit(err);
Expand Down
6 changes: 3 additions & 3 deletions src/platform/Tizen/ChipDeviceScanner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ gboolean ChipDeviceScanner::TriggerScan(GMainLoop * mainLoop, gpointer userData)
return false;
}

static bool __IsScanFilterSupported(void)
static bool __IsScanFilterSupported()
{
// Tizen API: bt_adapter_le_is_scan_filter_supported() is currently internal
// Defaulting to true
Expand Down Expand Up @@ -221,7 +221,7 @@ CHIP_ERROR ChipDeviceScanner::StartChipScan(unsigned timeoutMs, ScanFilterType f
return err;
}

CHIP_ERROR ChipDeviceScanner::StopChipScan(void)
CHIP_ERROR ChipDeviceScanner::StopChipScan()
{
int ret = BT_ERROR_NONE;
ReturnErrorCodeIf(!mIsScanning, CHIP_ERROR_INCORRECT_STATE);
Expand All @@ -245,7 +245,7 @@ CHIP_ERROR ChipDeviceScanner::StopChipScan(void)
return CHIP_NO_ERROR;
}

void ChipDeviceScanner::UnRegisterScanFilter(void)
void ChipDeviceScanner::UnRegisterScanFilter()
{
if (mScanFilter)
{
Expand Down
8 changes: 4 additions & 4 deletions src/platform/Tizen/ConfigurationManagerImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ ConfigurationManagerImpl & ConfigurationManagerImpl::GetDefaultInstance()
return sInstance;
}

CHIP_ERROR ConfigurationManagerImpl::Init(void)
CHIP_ERROR ConfigurationManagerImpl::Init()
{
CHIP_ERROR error;

Expand Down Expand Up @@ -88,12 +88,12 @@ CHIP_ERROR ConfigurationManagerImpl::GetPrimaryWiFiMACAddress(uint8_t * buf)
#endif
}

bool ConfigurationManagerImpl::CanFactoryReset(void)
bool ConfigurationManagerImpl::CanFactoryReset()
{
return true;
}

void ConfigurationManagerImpl::InitiateFactoryReset(void) {}
void ConfigurationManagerImpl::InitiateFactoryReset() {}

CHIP_ERROR ConfigurationManagerImpl::ReadPersistedStorageValue(Platform::PersistedStorage::Key key, uint32_t & value)
{
Expand Down Expand Up @@ -170,7 +170,7 @@ CHIP_ERROR ConfigurationManagerImpl::WriteConfigValueBin(Key key, const uint8_t
return Internal::PosixConfig::WriteConfigValueBin(key, data, dataLen);
}

void ConfigurationManagerImpl::RunConfigUnitTest(void)
void ConfigurationManagerImpl::RunConfigUnitTest()
{
Internal::PosixConfig::RunConfigUnitTest();
}
Expand Down
26 changes: 13 additions & 13 deletions src/platform/Tizen/ConnectivityManagerImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ namespace DeviceLayer {

ConnectivityManagerImpl ConnectivityManagerImpl::sInstance;

CHIP_ERROR ConnectivityManagerImpl::_Init(void)
CHIP_ERROR ConnectivityManagerImpl::_Init()
{
CHIP_ERROR err = CHIP_NO_ERROR;

Expand All @@ -72,7 +72,7 @@ void ConnectivityManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event) {}

#if CHIP_DEVICE_CONFIG_ENABLE_WIFI

ConnectivityManager::WiFiStationMode ConnectivityManagerImpl::_GetWiFiStationMode(void)
ConnectivityManager::WiFiStationMode ConnectivityManagerImpl::_GetWiFiStationMode()
{
CHIP_ERROR err = CHIP_NO_ERROR;
wifi_manager_device_state_e deviceState = WIFI_MANAGER_DEVICE_STATE_DEACTIVATED;
Expand Down Expand Up @@ -113,7 +113,7 @@ CHIP_ERROR ConnectivityManagerImpl::_SetWiFiStationMode(ConnectivityManager::WiF
return err;
}

System::Clock::Timeout ConnectivityManagerImpl::_GetWiFiStationReconnectInterval(void)
System::Clock::Timeout ConnectivityManagerImpl::_GetWiFiStationReconnectInterval()
{
return mWiFiStationReconnectInterval;
}
Expand All @@ -125,7 +125,7 @@ CHIP_ERROR ConnectivityManagerImpl::_SetWiFiStationReconnectInterval(System::Clo
return CHIP_NO_ERROR;
}

bool ConnectivityManagerImpl::_IsWiFiStationEnabled(void)
bool ConnectivityManagerImpl::_IsWiFiStationEnabled()
{
bool isWiFiStationEnabled = false;

Expand All @@ -134,7 +134,7 @@ bool ConnectivityManagerImpl::_IsWiFiStationEnabled(void)
return isWiFiStationEnabled;
}

bool ConnectivityManagerImpl::_IsWiFiStationConnected(void)
bool ConnectivityManagerImpl::_IsWiFiStationConnected()
{
CHIP_ERROR err = CHIP_NO_ERROR;
wifi_manager_connection_state_e connectionState = WIFI_MANAGER_CONNECTION_STATE_DISCONNECTED;
Expand All @@ -149,7 +149,7 @@ bool ConnectivityManagerImpl::_IsWiFiStationConnected(void)
return isWiFiStationConnected;
}

bool ConnectivityManagerImpl::_IsWiFiStationProvisioned(void)
bool ConnectivityManagerImpl::_IsWiFiStationProvisioned()
{
CHIP_ERROR err = CHIP_NO_ERROR;
wifi_manager_connection_state_e connectionState = WIFI_MANAGER_CONNECTION_STATE_DISCONNECTED;
Expand All @@ -164,12 +164,12 @@ bool ConnectivityManagerImpl::_IsWiFiStationProvisioned(void)
return isWiFiStationProvisioned;
}

void ConnectivityManagerImpl::_ClearWiFiStationProvision(void)
void ConnectivityManagerImpl::_ClearWiFiStationProvision()
{
Internal::WiFiMgr().RemoveAllConfigs();
}

bool ConnectivityManagerImpl::_CanStartWiFiScan(void)
bool ConnectivityManagerImpl::_CanStartWiFiScan()
{
return false;
}
Expand All @@ -189,20 +189,20 @@ bool ConnectivityManagerImpl::_IsWiFiAPActive()
return mWiFiAPState == kWiFiAPState_Active;
}

void ConnectivityManagerImpl::_DemandStartWiFiAP(void) {}
void ConnectivityManagerImpl::_DemandStartWiFiAP() {}

void ConnectivityManagerImpl::_StopOnDemandWiFiAP(void) {}
void ConnectivityManagerImpl::_StopOnDemandWiFiAP() {}

void ConnectivityManagerImpl::_MaintainOnDemandWiFiAP(void) {}
void ConnectivityManagerImpl::_MaintainOnDemandWiFiAP() {}

void ConnectivityManagerImpl::_SetWiFiAPIdleTimeout(System::Clock::Timeout val) {}

void ConnectivityManagerImpl::StartWiFiManagement(void)
void ConnectivityManagerImpl::StartWiFiManagement()
{
SystemLayer().ScheduleWork(ActivateWiFiManager, nullptr);
}

void ConnectivityManagerImpl::StopWiFiManagement(void)
void ConnectivityManagerImpl::StopWiFiManagement()
{
SystemLayer().ScheduleWork(DeactivateWiFiManager, nullptr);
}
Expand Down
4 changes: 2 additions & 2 deletions src/platform/Tizen/MainLoop.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ bool MainLoop::Init(initFn_t initFn, gpointer userData)
return true;
}

void MainLoop::Deinit(void)
void MainLoop::Deinit()
{
for (auto & loopData : mLoopData)
{
Expand Down Expand Up @@ -144,7 +144,7 @@ bool MainLoop::AsyncRequest(asyncFn_t asyncFn, gpointer asyncUserData, guint tim
return true;
}

MainLoop & MainLoop::Instance(void)
MainLoop & MainLoop::Instance()
{
static MainLoop sMainLoop;
return sMainLoop;
Expand Down
2 changes: 1 addition & 1 deletion src/platform/Tizen/PlatformManagerImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ namespace DeviceLayer {

PlatformManagerImpl PlatformManagerImpl::sInstance;

CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
CHIP_ERROR PlatformManagerImpl::_InitChipStack()
{
ReturnErrorOnFailure(Internal::PosixConfig::Init());

Expand Down
20 changes: 10 additions & 10 deletions src/platform/Tizen/WiFiManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ gboolean WiFiManager::_WiFiInitialize(gpointer userData)
return true;
}

void WiFiManager::_WiFiDeinitialize(void)
void WiFiManager::_WiFiDeinitialize()
{
int wifiErr = WIFI_MANAGER_ERROR_NONE;

Expand Down Expand Up @@ -421,7 +421,7 @@ gboolean WiFiManager::_WiFiConnect(GMainLoop * mainLoop, gpointer userData)
return true;
}

void WiFiManager::_WiFiSetStates(void)
void WiFiManager::_WiFiSetStates()
{
int wifiErr = WIFI_MANAGER_ERROR_NONE;
bool isWiFiActivated = false;
Expand All @@ -446,7 +446,7 @@ void WiFiManager::_WiFiSetStates(void)
}
}

void WiFiManager::_WiFiSetCallbacks(void)
void WiFiManager::_WiFiSetCallbacks()
{
int wifiErr = WIFI_MANAGER_ERROR_NONE;

Expand Down Expand Up @@ -493,7 +493,7 @@ void WiFiManager::_WiFiSetCallbacks(void)
}
}

void WiFiManager::_WiFiUnsetCallbacks(void)
void WiFiManager::_WiFiUnsetCallbacks()
{
int wifiErr = WIFI_MANAGER_ERROR_NONE;

Expand Down Expand Up @@ -558,7 +558,7 @@ void WiFiManager::_WiFiSetConnectionState(wifi_manager_connection_state_e connec
ChipLogProgress(DeviceLayer, "Set WiFi connection state [%s]", __WiFiConnectionStateToStr(mConnectionState));
}

wifi_manager_ap_h WiFiManager::_WiFiGetFoundAP(void)
wifi_manager_ap_h WiFiManager::_WiFiGetFoundAP()
{
int wifiErr = WIFI_MANAGER_ERROR_NONE;
wifi_manager_ap_h foundAp = nullptr;
Expand All @@ -576,7 +576,7 @@ wifi_manager_ap_h WiFiManager::_WiFiGetFoundAP(void)
return foundAp;
}

void WiFiManager::Init(void)
void WiFiManager::Init()
{
sInstance.mDeviceState = WIFI_MANAGER_DEVICE_STATE_DEACTIVATED;
sInstance.mModuleState = WIFI_MANAGER_MODULE_STATE_DETACHED;
Expand All @@ -585,7 +585,7 @@ void WiFiManager::Init(void)
MainLoop::Instance().Init(_WiFiInitialize);
}

void WiFiManager::Deinit(void)
void WiFiManager::Deinit()
{
sInstance._WiFiDeinitialize();
MainLoop::Instance().Deinit();
Expand All @@ -610,7 +610,7 @@ CHIP_ERROR WiFiManager::IsActivated(bool * isWiFiActivated)
return err;
}

CHIP_ERROR WiFiManager::Activate(void)
CHIP_ERROR WiFiManager::Activate()
{
CHIP_ERROR err = CHIP_NO_ERROR;
int wifiErr = WIFI_MANAGER_ERROR_NONE;
Expand All @@ -633,7 +633,7 @@ CHIP_ERROR WiFiManager::Activate(void)
return err;
}

CHIP_ERROR WiFiManager::Deactivate(void)
CHIP_ERROR WiFiManager::Deactivate()
{
CHIP_ERROR err = CHIP_NO_ERROR;
int wifiErr = WIFI_MANAGER_ERROR_NONE;
Expand Down Expand Up @@ -733,7 +733,7 @@ CHIP_ERROR WiFiManager::Disconnect(const char * ssid)
return err;
}

CHIP_ERROR WiFiManager::RemoveAllConfigs(void)
CHIP_ERROR WiFiManager::RemoveAllConfigs()
{
CHIP_ERROR err = CHIP_NO_ERROR;
int wifiErr = WIFI_MANAGER_ERROR_NONE;
Expand Down
4 changes: 2 additions & 2 deletions src/platform/webos/BLEManagerImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ void HandleIncomingBleConnection(BLEEndPoint * bleEP)
ChipLogProgress(DeviceLayer, "con rcvd");
}

void BLEManagerImpl::InitConnectionData(void)
void BLEManagerImpl::InitConnectionData()
{
/* Initialize Hashmap */
if (!mConnectionMap)
Expand Down Expand Up @@ -917,7 +917,7 @@ void BLEManagerImpl::NotifyBLEPeripheralAdvStopComplete(bool aIsSuccess, void *
PlatformMgr().PostEventOrDie(&event);
}

void BLEManagerImpl::OnChipScanComplete(void)
void BLEManagerImpl::OnChipScanComplete()
{
if (mBLEScanConfig.mBleScanState != BleScanState::kScanForDiscriminator &&
mBLEScanConfig.mBleScanState != BleScanState::kScanForAddress)
Expand Down
2 changes: 1 addition & 1 deletion src/platform/webos/ChipDeviceScanner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ bool ChipDeviceScanner::cancelDiscoveryCb(LSHandle * sh, LSMessage * message, vo
return true;
}

CHIP_ERROR ChipDeviceScanner::StopChipScan(void)
CHIP_ERROR ChipDeviceScanner::StopChipScan()
{
int ret = 0;
ReturnErrorCodeIf(!mIsScanning, CHIP_ERROR_INCORRECT_STATE);
Expand Down
2 changes: 1 addition & 1 deletion src/platform/webos/ConfigurationManagerImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ CHIP_ERROR ConfigurationManagerImpl::WriteConfigValueBin(Key key, const uint8_t
return PosixConfig::WriteConfigValueBin(key, data, dataLen);
}

void ConfigurationManagerImpl::RunConfigUnitTest(void)
void ConfigurationManagerImpl::RunConfigUnitTest()
{
PosixConfig::RunConfigUnitTest();
}
Expand Down
6 changes: 3 additions & 3 deletions src/platform/webos/MainLoop.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ void MainLoop::DeleteData(LoopData * loopData)
chip::Platform::Delete(loopData);
}

void MainLoop::Deinit(void)
void MainLoop::Deinit()
{
std::vector<LoopData *>::const_iterator iter = mLoopData.cbegin();
while (iter != mLoopData.cend())
Expand Down Expand Up @@ -203,7 +203,7 @@ gpointer MainLoop::ThreadStartLSMainLoopHandler(gpointer data)
return NULL;
}

bool MainLoop::StartLSMainLoop(void)
bool MainLoop::StartLSMainLoop()
{
bool result = true;
LSError lserror;
Expand Down Expand Up @@ -238,7 +238,7 @@ bool MainLoop::StartLSMainLoop(void)
return result;
}

MainLoop & MainLoop::Instance(void)
MainLoop & MainLoop::Instance()
{
static MainLoop sMainLoop;
return sMainLoop;
Expand Down

0 comments on commit 21c0f86

Please sign in to comment.