From cee9b2609d6dee20899b5ce55df622fccac5538c Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Sun, 19 Jun 2016 00:19:45 -0700 Subject: [PATCH] Added std:: prefix to more C standard library uses (#106) --- wpilibc/athena/src/IterativeRobot.cpp | 18 +++---- wpilibc/athena/src/RobotBase.cpp | 6 +-- wpilibc/athena/src/SampleRobot.cpp | 10 ++-- wpilibc/athena/src/Servo.cpp | 2 +- wpilibc/athena/src/Vision/BaeUtilities.cpp | 61 +++++++++++----------- wpilibc/sim/src/AnalogGyro.cpp | 2 +- wpilibc/sim/src/AnalogInput.cpp | 2 +- wpilibc/sim/src/DigitalInput.cpp | 2 +- wpilibc/sim/src/DoubleSolenoid.cpp | 4 +- wpilibc/sim/src/Encoder.cpp | 2 +- wpilibc/sim/src/IterativeRobot.cpp | 18 +++---- wpilibc/sim/src/PWM.cpp | 4 +- wpilibc/sim/src/Relay.cpp | 4 +- wpilibc/sim/src/Solenoid.cpp | 2 +- 14 files changed, 69 insertions(+), 68 deletions(-) diff --git a/wpilibc/athena/src/IterativeRobot.cpp b/wpilibc/athena/src/IterativeRobot.cpp index e9099ede43..f3d2464bbd 100644 --- a/wpilibc/athena/src/IterativeRobot.cpp +++ b/wpilibc/athena/src/IterativeRobot.cpp @@ -116,7 +116,7 @@ void IterativeRobot::StartCompetition() { * ready, causing the robot to be bypassed in a match. */ void IterativeRobot::RobotInit() { - printf("Default %s() method... Overload me!\n", __FUNCTION__); + std::printf("Default %s() method... Overload me!\n", __FUNCTION__); } /** @@ -127,7 +127,7 @@ void IterativeRobot::RobotInit() { * the robot enters disabled mode. */ void IterativeRobot::DisabledInit() { - printf("Default %s() method... Overload me!\n", __FUNCTION__); + std::printf("Default %s() method... Overload me!\n", __FUNCTION__); } /** @@ -137,7 +137,7 @@ void IterativeRobot::DisabledInit() { * called each time the robot enters autonomous mode. */ void IterativeRobot::AutonomousInit() { - printf("Default %s() method... Overload me!\n", __FUNCTION__); + std::printf("Default %s() method... Overload me!\n", __FUNCTION__); } /** @@ -147,7 +147,7 @@ void IterativeRobot::AutonomousInit() { * called each time the robot enters teleop mode. */ void IterativeRobot::TeleopInit() { - printf("Default %s() method... Overload me!\n", __FUNCTION__); + std::printf("Default %s() method... Overload me!\n", __FUNCTION__); } /** @@ -157,7 +157,7 @@ void IterativeRobot::TeleopInit() { * called each time the robot enters test mode. */ void IterativeRobot::TestInit() { - printf("Default %s() method... Overload me!\n", __FUNCTION__); + std::printf("Default %s() method... Overload me!\n", __FUNCTION__); } /** @@ -169,7 +169,7 @@ void IterativeRobot::TestInit() { void IterativeRobot::DisabledPeriodic() { static bool firstRun = true; if (firstRun) { - printf("Default %s() method... Overload me!\n", __FUNCTION__); + std::printf("Default %s() method... Overload me!\n", __FUNCTION__); firstRun = false; } } @@ -183,7 +183,7 @@ void IterativeRobot::DisabledPeriodic() { void IterativeRobot::AutonomousPeriodic() { static bool firstRun = true; if (firstRun) { - printf("Default %s() method... Overload me!\n", __FUNCTION__); + std::printf("Default %s() method... Overload me!\n", __FUNCTION__); firstRun = false; } } @@ -197,7 +197,7 @@ void IterativeRobot::AutonomousPeriodic() { void IterativeRobot::TeleopPeriodic() { static bool firstRun = true; if (firstRun) { - printf("Default %s() method... Overload me!\n", __FUNCTION__); + std::printf("Default %s() method... Overload me!\n", __FUNCTION__); firstRun = false; } } @@ -211,7 +211,7 @@ void IterativeRobot::TeleopPeriodic() { void IterativeRobot::TestPeriodic() { static bool firstRun = true; if (firstRun) { - printf("Default %s() method... Overload me!\n", __FUNCTION__); + std::printf("Default %s() method... Overload me!\n", __FUNCTION__); firstRun = false; } } diff --git a/wpilibc/athena/src/RobotBase.cpp b/wpilibc/athena/src/RobotBase.cpp index 75bef37041..7165aba5a3 100644 --- a/wpilibc/athena/src/RobotBase.cpp +++ b/wpilibc/athena/src/RobotBase.cpp @@ -36,11 +36,11 @@ RobotBase::RobotBase() : m_ds(DriverStation::GetInstance()) { NetworkTable::SetPersistentFilename("/home/lvuser/networktables.ini"); FILE* file = nullptr; - file = fopen("/tmp/frc_versions/FRC_Lib_Version.ini", "w"); + file = std::fopen("/tmp/frc_versions/FRC_Lib_Version.ini", "w"); if (file != nullptr) { - fputs("2016 C++ Release 5", file); - fclose(file); + std::fputs("2016 C++ Release 5", file); + std::fclose(file); } } diff --git a/wpilibc/athena/src/SampleRobot.cpp b/wpilibc/athena/src/SampleRobot.cpp index 23e605cf31..593725517d 100644 --- a/wpilibc/athena/src/SampleRobot.cpp +++ b/wpilibc/athena/src/SampleRobot.cpp @@ -28,7 +28,7 @@ SampleRobot::SampleRobot() : m_robotMainOverridden(true) {} * ready, causing the robot to be bypassed in a match. */ void SampleRobot::RobotInit() { - printf("Default %s() method... Override me!\n", __FUNCTION__); + std::printf("Default %s() method... Override me!\n", __FUNCTION__); } /** @@ -38,7 +38,7 @@ void SampleRobot::RobotInit() { * field is disabled. */ void SampleRobot::Disabled() { - printf("Default %s() method... Override me!\n", __FUNCTION__); + std::printf("Default %s() method... Override me!\n", __FUNCTION__); } /** @@ -49,7 +49,7 @@ void SampleRobot::Disabled() { * robot enters the autonomous state. */ void SampleRobot::Autonomous() { - printf("Default %s() method... Override me!\n", __FUNCTION__); + std::printf("Default %s() method... Override me!\n", __FUNCTION__); } /** @@ -60,7 +60,7 @@ void SampleRobot::Autonomous() { * each time the robot enters the teleop state. */ void SampleRobot::OperatorControl() { - printf("Default %s() method... Override me!\n", __FUNCTION__); + std::printf("Default %s() method... Override me!\n", __FUNCTION__); } /** @@ -71,7 +71,7 @@ void SampleRobot::OperatorControl() { * test mode */ void SampleRobot::Test() { - printf("Default %s() method... Override me!\n", __FUNCTION__); + std::printf("Default %s() method... Override me!\n", __FUNCTION__); } /** diff --git a/wpilibc/athena/src/Servo.cpp b/wpilibc/athena/src/Servo.cpp index 12ae667fb7..9edc1b528d 100644 --- a/wpilibc/athena/src/Servo.cpp +++ b/wpilibc/athena/src/Servo.cpp @@ -26,7 +26,7 @@ Servo::Servo(uint32_t channel) : SafePWM(channel) { // Assign defaults for period multiplier for the servo PWM control signal SetPeriodMultiplier(kPeriodMultiplier_4X); - // printf("Done initializing servo %d\n", channel); + // std::printf("Done initializing servo %d\n", channel); } Servo::~Servo() { diff --git a/wpilibc/athena/src/Vision/BaeUtilities.cpp b/wpilibc/athena/src/Vision/BaeUtilities.cpp index eda5923d72..3d1f561021 100644 --- a/wpilibc/athena/src/Vision/BaeUtilities.cpp +++ b/wpilibc/athena/src/Vision/BaeUtilities.cpp @@ -71,7 +71,8 @@ void dprintf(const char* tempString, ...) /* Variable argument list */ filename = tempString; for (index = 0; index < tempStringLen; index++) { if (tempString[index] == ' ') { - printf("ERROR in dprintf: malformed calling sequence (%s)\n", tempString); + std::printf("ERROR in dprintf: malformed calling sequence (%s)\n", + tempString); va_end(args); return; } @@ -91,40 +92,40 @@ void dprintf(const char* tempString, ...) /* Variable argument list */ /* Extract format from argument list */ fmt = va_arg(args, const char*); - vsprintf(text, fmt, args); + std::vsprintf(text, fmt, args); va_end(args); /* Format output statement */ switch (type) { case DEBUG_TYPE: - sprintf(outtext, "[%s:%s@%04d] DEBUG %s\n", filename, functionName, - line_number, text); + std::sprintf(outtext, "[%s:%s@%04d] DEBUG %s\n", filename, functionName, + line_number, text); break; case INFO_TYPE: - sprintf(outtext, "[%s:%s@%04d] INFO %s\n", filename, functionName, - line_number, text); + std::sprintf(outtext, "[%s:%s@%04d] INFO %s\n", filename, functionName, + line_number, text); break; case ERROR_TYPE: - sprintf(outtext, "[%s:%s@%04d] ERROR %s\n", filename, functionName, - line_number, text); + std::sprintf(outtext, "[%s:%s@%04d] ERROR %s\n", filename, functionName, + line_number, text); break; case CRITICAL_TYPE: - sprintf(outtext, "[%s:%s@%04d] CRITICAL %s\n", filename, functionName, - line_number, text); + std::sprintf(outtext, "[%s:%s@%04d] CRITICAL %s\n", filename, + functionName, line_number, text); break; case FATAL_TYPE: fatalFlag = 1; - sprintf(outtext, "[%s:%s@%04d] FATAL %s\n", filename, functionName, - line_number, text); + std::sprintf(outtext, "[%s:%s@%04d] FATAL %s\n", filename, functionName, + line_number, text); break; default: - printf("ERROR in dprintf: malformed calling sequence\n"); + std::printf("ERROR in dprintf: malformed calling sequence\n"); return; break; } - sprintf(filepath, "%s.debug", filename); + std::sprintf(filepath, "%s.debug", filename); /* Write output statement */ switch (dprintfFlag) { @@ -133,26 +134,26 @@ void dprintf(const char* tempString, ...) /* Variable argument list */ break; case DEBUG_MOSTLY_OFF: if (fatalFlag) { - if ((outfile_fd = fopen(filepath, "a+")) != nullptr) { - fwrite(outtext, sizeof(char), strlen(outtext), outfile_fd); - fclose(outfile_fd); + if ((outfile_fd = std::fopen(filepath, "a+")) != nullptr) { + std::fwrite(outtext, sizeof(char), std::strlen(outtext), outfile_fd); + std::fclose(outfile_fd); } } break; case DEBUG_SCREEN_ONLY: - printf("%s", outtext); + std::printf("%s", outtext); break; case DEBUG_FILE_ONLY: - if ((outfile_fd = fopen(filepath, "a+")) != nullptr) { + if ((outfile_fd = std::fopen(filepath, "a+")) != nullptr) { fwrite(outtext, sizeof(char), strlen(outtext), outfile_fd); - fclose(outfile_fd); + std::fclose(outfile_fd); } break; case DEBUG_SCREEN_AND_FILE: // BOTH - printf("%s", outtext); - if ((outfile_fd = fopen(filepath, "a+")) != nullptr) { + std::printf("%s", outtext); + if ((outfile_fd = std::fopen(filepath, "a+")) != nullptr) { fwrite(outtext, sizeof(char), strlen(outtext), outfile_fd); - fclose(outfile_fd); + std::fclose(outfile_fd); } break; } @@ -187,7 +188,7 @@ float NormalizeToRange(float normalizedValue) { /** * @brief Displays an activity indicator to console. - * Call this function like you would call printf. + * Call this function like you would call std::printf. * @param fmt The format string */ void ShowActivity(char* fmt, ...) { @@ -301,13 +302,13 @@ int processFile(char* inputFile, char* outputString, int lineNumber) { if (lineNumber < 0) return (-1); - if ((infile = fopen(inputFile, "r")) == nullptr) { - printf("Fatal error opening file %s\n", inputFile); + if ((infile = std::fopen(inputFile, "r")) == nullptr) { + std::printf("Fatal error opening file %s\n", inputFile); return (0); } - while (!feof(infile)) { - if (fgets(inputStr, stringSize, infile) != nullptr) { + while (!std::feof(infile)) { + if (std::fgets(inputStr, stringSize, infile) != nullptr) { // Skip empty lines if (emptyString(inputStr)) continue; // Skip comment lines @@ -323,14 +324,14 @@ int processFile(char* inputFile, char* outputString, int lineNumber) { } // close file - fclose(infile); + std::fclose(infile); // if number lines requested return the count if (lineNumber == 0) return (lineCount); // check for input out of range if (lineNumber > lineCount) return (-1); // return the line selected; lineCount guaranteed to be greater than zero stripString(inputStr); - strcpy(outputString, inputStr); + std::strcpy(outputString, inputStr); return (lineCount); } diff --git a/wpilibc/sim/src/AnalogGyro.cpp b/wpilibc/sim/src/AnalogGyro.cpp index 9c92032fbf..686d0eae9d 100644 --- a/wpilibc/sim/src/AnalogGyro.cpp +++ b/wpilibc/sim/src/AnalogGyro.cpp @@ -33,7 +33,7 @@ void AnalogGyro::InitAnalogGyro(int channel) { SetPIDSourceType(PIDSourceType::kDisplacement); char buffer[50]; - int n = sprintf(buffer, "analog/%d", channel); + int n = std::sprintf(buffer, "analog/%d", channel); impl = new SimGyro(buffer); LiveWindow::GetInstance()->AddSensor("AnalogGyro", channel, this); diff --git a/wpilibc/sim/src/AnalogInput.cpp b/wpilibc/sim/src/AnalogInput.cpp index e292ac22ad..5e3dc51749 100644 --- a/wpilibc/sim/src/AnalogInput.cpp +++ b/wpilibc/sim/src/AnalogInput.cpp @@ -20,7 +20,7 @@ AnalogInput::AnalogInput(uint32_t channel) { m_channel = channel; char buffer[50]; - int n = sprintf(buffer, "analog/%d", channel); + int n = std::sprintf(buffer, "analog/%d", channel); m_impl = new SimFloatInput(buffer); LiveWindow::GetInstance()->AddSensor("AnalogInput", channel, this); diff --git a/wpilibc/sim/src/DigitalInput.cpp b/wpilibc/sim/src/DigitalInput.cpp index d3759cab72..344f96b8fb 100644 --- a/wpilibc/sim/src/DigitalInput.cpp +++ b/wpilibc/sim/src/DigitalInput.cpp @@ -20,7 +20,7 @@ DigitalInput::DigitalInput(uint32_t channel) { char buf[64]; m_channel = channel; - int n = sprintf(buf, "dio/%d", channel); + int n = std::sprintf(buf, "dio/%d", channel); m_impl = new SimDigitalInput(buf); } diff --git a/wpilibc/sim/src/DoubleSolenoid.cpp b/wpilibc/sim/src/DoubleSolenoid.cpp index 0afe2bf921..ed1f6e998d 100644 --- a/wpilibc/sim/src/DoubleSolenoid.cpp +++ b/wpilibc/sim/src/DoubleSolenoid.cpp @@ -36,8 +36,8 @@ DoubleSolenoid::DoubleSolenoid(uint8_t moduleNumber, uint32_t forwardChannel, m_reversed = true; } char buffer[50]; - int n = sprintf(buffer, "pneumatic/%d/%d/%d/%d", moduleNumber, forwardChannel, - moduleNumber, reverseChannel); + int n = std::sprintf(buffer, "pneumatic/%d/%d/%d/%d", moduleNumber, + forwardChannel, moduleNumber, reverseChannel); m_impl = new SimContinuousOutput(buffer); LiveWindow::GetInstance()->AddActuator("DoubleSolenoid", moduleNumber, diff --git a/wpilibc/sim/src/Encoder.cpp b/wpilibc/sim/src/Encoder.cpp index 23de59ba5f..ed28752080 100644 --- a/wpilibc/sim/src/Encoder.cpp +++ b/wpilibc/sim/src/Encoder.cpp @@ -52,7 +52,7 @@ void Encoder::InitEncoder(int32_t channelA, int32_t channelB, m_reverseDirection = reverseDirection; } char buffer[50]; - int n = sprintf(buffer, "dio/%d/%d", channelA, channelB); + int n = std::sprintf(buffer, "dio/%d/%d", channelA, channelB); impl = new SimEncoder(buffer); impl->Start(); } diff --git a/wpilibc/sim/src/IterativeRobot.cpp b/wpilibc/sim/src/IterativeRobot.cpp index aeca814d7a..44fac4711d 100644 --- a/wpilibc/sim/src/IterativeRobot.cpp +++ b/wpilibc/sim/src/IterativeRobot.cpp @@ -177,7 +177,7 @@ bool IterativeRobot::NextPeriodReady() { * exactly 1 time. */ void IterativeRobot::RobotInit() { - printf("Default %s() method... Overload me!\n", __FUNCTION__); + std::printf("Default %s() method... Overload me!\n", __FUNCTION__); } /** @@ -187,7 +187,7 @@ void IterativeRobot::RobotInit() { * called each time the robot enters disabled mode. */ void IterativeRobot::DisabledInit() { - printf("Default %s() method... Overload me!\n", __FUNCTION__); + std::printf("Default %s() method... Overload me!\n", __FUNCTION__); } /** @@ -197,7 +197,7 @@ void IterativeRobot::DisabledInit() { * called each time the robot enters autonomous mode. */ void IterativeRobot::AutonomousInit() { - printf("Default %s() method... Overload me!\n", __FUNCTION__); + std::printf("Default %s() method... Overload me!\n", __FUNCTION__); } /** @@ -207,7 +207,7 @@ void IterativeRobot::AutonomousInit() { * called each time the robot enters teleop mode. */ void IterativeRobot::TeleopInit() { - printf("Default %s() method... Overload me!\n", __FUNCTION__); + std::printf("Default %s() method... Overload me!\n", __FUNCTION__); } /** @@ -217,7 +217,7 @@ void IterativeRobot::TeleopInit() { * called each time the robot enters test mode. */ void IterativeRobot::TestInit() { - printf("Default %s() method... Overload me!\n", __FUNCTION__); + std::printf("Default %s() method... Overload me!\n", __FUNCTION__); } /** @@ -229,7 +229,7 @@ void IterativeRobot::TestInit() { void IterativeRobot::DisabledPeriodic() { static bool firstRun = true; if (firstRun) { - printf("Default %s() method... Overload me!\n", __FUNCTION__); + std::printf("Default %s() method... Overload me!\n", __FUNCTION__); firstRun = false; } } @@ -243,7 +243,7 @@ void IterativeRobot::DisabledPeriodic() { void IterativeRobot::AutonomousPeriodic() { static bool firstRun = true; if (firstRun) { - printf("Default %s() method... Overload me!\n", __FUNCTION__); + std::printf("Default %s() method... Overload me!\n", __FUNCTION__); firstRun = false; } } @@ -257,7 +257,7 @@ void IterativeRobot::AutonomousPeriodic() { void IterativeRobot::TeleopPeriodic() { static bool firstRun = true; if (firstRun) { - printf("Default %s() method... Overload me!\n", __FUNCTION__); + std::printf("Default %s() method... Overload me!\n", __FUNCTION__); firstRun = false; } } @@ -271,7 +271,7 @@ void IterativeRobot::TeleopPeriodic() { void IterativeRobot::TestPeriodic() { static bool firstRun = true; if (firstRun) { - printf("Default %s() method... Overload me!\n", __FUNCTION__); + std::printf("Default %s() method... Overload me!\n", __FUNCTION__); firstRun = false; } } diff --git a/wpilibc/sim/src/PWM.cpp b/wpilibc/sim/src/PWM.cpp index 9e8babfe42..030a9d0511 100644 --- a/wpilibc/sim/src/PWM.cpp +++ b/wpilibc/sim/src/PWM.cpp @@ -29,12 +29,12 @@ PWM::PWM(uint32_t channel) { char buf[64]; if (!CheckPWMChannel(channel)) { - snprintf(buf, 64, "PWM Channel %d", channel); + std::snprintf(buf, 64, "PWM Channel %d", channel); wpi_setWPIErrorWithContext(ChannelIndexOutOfRange, buf); return; } - sprintf(buf, "pwm/%d", channel); + std::sprintf(buf, "pwm/%d", channel); impl = new SimContinuousOutput(buf); m_channel = channel; m_eliminateDeadband = false; diff --git a/wpilibc/sim/src/Relay.cpp b/wpilibc/sim/src/Relay.cpp index 57a7a683d3..85017b3070 100644 --- a/wpilibc/sim/src/Relay.cpp +++ b/wpilibc/sim/src/Relay.cpp @@ -24,7 +24,7 @@ Relay::Relay(uint32_t channel, Relay::Direction direction) : m_channel(channel), m_direction(direction) { char buf[64]; if (!SensorBase::CheckRelayChannel(m_channel)) { - snprintf(buf, 64, "Relay Channel %d", m_channel); + std::snprintf(buf, 64, "Relay Channel %d", m_channel); wpi_setWPIErrorWithContext(ChannelIndexOutOfRange, buf); return; } @@ -32,7 +32,7 @@ Relay::Relay(uint32_t channel, Relay::Direction direction) m_safetyHelper = std::make_unique(this); m_safetyHelper->SetSafetyEnabled(false); - sprintf(buf, "relay/%d", m_channel); + std::sprintf(buf, "relay/%d", m_channel); impl = new SimContinuousOutput(buf); // TODO: Allow two different relays // (targetting the different halves of a // relay) to be combined to control one diff --git a/wpilibc/sim/src/Solenoid.cpp b/wpilibc/sim/src/Solenoid.cpp index 5bc63cd4ed..e789eed2d9 100644 --- a/wpilibc/sim/src/Solenoid.cpp +++ b/wpilibc/sim/src/Solenoid.cpp @@ -28,7 +28,7 @@ Solenoid::Solenoid(uint32_t channel) : Solenoid(1, channel) {} */ Solenoid::Solenoid(uint8_t moduleNumber, uint32_t channel) { char buffer[50]; - int n = sprintf(buffer, "pneumatic/%d/%d", moduleNumber, channel); + int n = std::sprintf(buffer, "pneumatic/%d/%d", moduleNumber, channel); m_impl = new SimContinuousOutput(buffer); LiveWindow::GetInstance()->AddActuator("Solenoid", moduleNumber, channel,