Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-28 02:11:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed const char* -> string in most of wpilibc.

Browse Source 
The HAL will remain untouched in order to maintain C-style
compatibility. A few places in wpilibc were left as
C-style strings, especially if special formatting (eg,
elaborate uses of snprintf or sscanf) was being used.

In general, const char* was changed to std::string.
character buffers used for formatting were either
untouched, changed to std::stringstream, or changed
to std::string, depending on what was done with
the buffer.

Change-Id: I5e431ddf1cc4d9a6d534e1f21b16ea23be26e7f1
This commit is contained in:
James Kuszmaul
2015-06-30 15:01:20 -04:00
parent 534ea134a4
commit 98f2d08103
55 changed files with 300 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
wpilibc/wpilibC++Devices/src/DoubleSolenoid.cpp
View File

@@ -9,6 +9,8 @@
#include "WPIErrors.h"
#include "LiveWindow/LiveWindow.h"
#include <sstream>
::std::unique_ptr<Resource> SolenoidBase::m_allocated =
::std::make_unique<Resource>(solenoid_kNumDO7_0Elements *
kSolenoidChannels);
@@ -34,37 +36,39 @@ DoubleSolenoid::DoubleSolenoid(uint8_t moduleNumber, uint32_t forwardChannel,
: SolenoidBase(moduleNumber),
m_forwardChannel(forwardChannel),
m_reverseChannel(reverseChannel) {
char buf[64];
std::stringstream buf;
if (!CheckSolenoidModule(m_moduleNumber)) {
snprintf(buf, 64, "Solenoid Module %d", m_moduleNumber);
wpi_setWPIErrorWithContext(ModuleIndexOutOfRange, buf);
buf << "Solenoid Module " << m_moduleNumber;
wpi_setWPIErrorWithContext(ModuleIndexOutOfRange, buf.str());
return;
}
if (!CheckSolenoidChannel(m_forwardChannel)) {
snprintf(buf, 64, "Solenoid Channel %d", m_forwardChannel);
wpi_setWPIErrorWithContext(ChannelIndexOutOfRange, buf);
buf << "Solenoid Module " << m_forwardChannel;
wpi_setWPIErrorWithContext(ChannelIndexOutOfRange, buf.str());
return;
}
if (!CheckSolenoidChannel(m_reverseChannel)) {
snprintf(buf, 64, "Solenoid Channel %d", m_reverseChannel);
wpi_setWPIErrorWithContext(ChannelIndexOutOfRange, buf);
buf << "Solenoid Module " << m_reverseChannel;
wpi_setWPIErrorWithContext(ChannelIndexOutOfRange, buf.str());
return;
}
Resource::CreateResourceObject(
m_allocated, solenoid_kNumDO7_0Elements * kSolenoidChannels);
snprintf(buf, 64, "Solenoid %d (Module: %d)", m_forwardChannel,
m_moduleNumber);
buf << "Solenoid " << m_forwardChannel << " (Module: " << m_moduleNumber
<< ")";
if (m_allocated->Allocate(
m_moduleNumber * kSolenoidChannels + m_forwardChannel, buf) == ~0ul) {
m_moduleNumber * kSolenoidChannels + m_forwardChannel, buf.str()) ==
~0ul) {
CloneError(*m_allocated);
return;
}
snprintf(buf, 64, "Solenoid %d (Module: %d)", m_reverseChannel,
m_moduleNumber);
buf << "Solenoid " << m_reverseChannel << " (Module: " << m_moduleNumber
<< ")";
if (m_allocated->Allocate(
m_moduleNumber * kSolenoidChannels + m_reverseChannel, buf) == ~0ul) {
m_moduleNumber * kSolenoidChannels + m_reverseChannel, buf.str()) ==
~0ul) {
CloneError(*m_allocated);
return;
}