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

21
wpilibc/wpilibC++/src/Commands/Command.cpp
View File

@@ -13,9 +13,9 @@
#include "WPIErrors.h"
#include <typeinfo>
static const char *kName = "name";
static const char *kRunning = "running";
static const char *kIsParented = "isParented";
static const std::string kName = "name";
static const std::string kRunning = "running";
static const std::string kIsParented = "isParented";
int Command::m_commandCounter = 0;
@@ -29,7 +29,7 @@ Command::Command() : Command(nullptr, -1.0) {}
* Creates a new command with the given name and no timeout.
* @param name the name for this command
*/
Command::Command(const char *name) : Command(name, -1.0) {}
Command::Command(const std::string &name) : Command(name, -1.0) {}
/**
* Creates a new command with the given timeout and a default name.
@@ -44,13 +44,13 @@ Command::Command(double timeout) : Command(nullptr, timeout) {}
* @param timeout the time (in seconds) before this command "times out"
* @see Command#isTimedOut() isTimedOut()
*/
Command::Command(const char *name, double timeout) {
if (name == nullptr) wpi_setWPIErrorWithContext(NullParameter, "name");
Command::Command(const std::string &name, double timeout) {
if (name.size() == 0) wpi_setWPIErrorWithContext(NullParameter, "name");
if (timeout < 0.0)
wpi_setWPIErrorWithContext(ParameterOutOfRange, "timeout < 0.0");
m_timeout = timeout;
m_name = name == nullptr ? std::string() : name;
m_name = name;
}
Command::~Command() { // TODO deal with cleaning up all listeners
@@ -218,12 +218,9 @@ void Command::LockChanges() { m_locked = true; }
* message)
* @return true if assert passed, false if assert failed
*/
bool Command::AssertUnlocked(const char *message) {
bool Command::AssertUnlocked(const std::string &message) {
if (m_locked) {
char buf[128];
snprintf(buf, 128,
"%s after being started or being added to a command group",
message);
std::string buf = message + " after being started or being added to a command group";
wpi_setWPIErrorWithContext(CommandIllegalUse, buf);
return false;
}