Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-03 03:01:44 +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

32
wpilibc/wpilibC++Devices/src/CANJaguar.cpp
View File

@@ -111,10 +111,10 @@ void CANJaguar::InitCANJaguar() {
m_hardwareVersion = dataBuffer[0];
if (m_deviceNumber < 1 || m_deviceNumber > 63) {
char buf[256];
snprintf(buf, 256, "device number \"%d\" must be between 1 and 63",
m_deviceNumber);
wpi_setWPIErrorWithContext(ParameterOutOfRange, buf);
std::stringstream buf;
buf << "device number \"" << m_deviceNumber
<< "\" must be between 1 and 63";
wpi_setWPIErrorWithContext(ParameterOutOfRange, buf.str());
return;
}
@@ -122,19 +122,17 @@ void CANJaguar::InitCANJaguar() {
// 3330 was the first shipping RDK firmware version for the Jaguar
if (m_firmwareVersion >= 3330 || m_firmwareVersion < 108) {
char buf[256];
std::stringstream buf;
if (m_firmwareVersion < 3330) {
snprintf(buf, 256,
"Jag #%d firmware (%d) is too old (must be at least version 108 "
"of the FIRST approved firmware)",
m_deviceNumber, m_firmwareVersion);
buf << "Jag #" << m_deviceNumber << " firmware (" << m_firmwareVersion
<< ") is too old (must be at least version 108 "
"of the FIRST approved firmware)";
} else {
snprintf(buf, 256,
"Jag #%d firmware (%d) is not FIRST approved (must be at least "
"version 108 of the FIRST approved firmware)",
m_deviceNumber, m_firmwareVersion);
buf << "Jag #" << m_deviceNumber << " firmware (" << m_firmwareVersion
<< ") is not FIRST approved (must be at least "
"version 108 of the FIRST approved firmware)";
}
wpi_setWPIErrorWithContext(JaguarVersionError, buf);
wpi_setWPIErrorWithContext(JaguarVersionError, buf.str());
return;
}
@@ -178,11 +176,11 @@ void CANJaguar::InitCANJaguar() {
*/
CANJaguar::CANJaguar(uint8_t deviceNumber)
: m_deviceNumber(deviceNumber) {
char buf[64];
snprintf(buf, 64, "CANJaguar device number %d", m_deviceNumber);
std::stringstream buf;
buf << "CANJaguar device number " << m_deviceNumber;
Resource::CreateResourceObject(allocated, 63);
if (allocated->Allocate(m_deviceNumber - 1, buf) == ~0ul) {
if (allocated->Allocate(m_deviceNumber - 1, buf.str()) == ~0ul) {
CloneError(*allocated);
return;
}