cleaned up Error* more
diff --git a/aos/externals/WPILib/WPILib/Error.cpp b/aos/externals/WPILib/WPILib/Error.cpp
index b817e20..c610ad7 100644
--- a/aos/externals/WPILib/WPILib/Error.cpp
+++ b/aos/externals/WPILib/WPILib/Error.cpp
@@ -119,7 +119,7 @@
"%s: %s ...in %s() in %s at line %d\n",
m_code < 0 ? "ERROR" : "WARNING", m_message.c_str(),
m_function.c_str(), m_filename.c_str(), m_lineNumber);
- strcpy(error_with_code, error);
+ strncpy(error_with_code, error, sizeof(error_with_code));
}
// TODO: Add logging to disk
diff --git a/aos/externals/WPILib/WPILib/ErrorBase.cpp b/aos/externals/WPILib/WPILib/ErrorBase.cpp
index 3fde5b1..6c89070 100644
--- a/aos/externals/WPILib/WPILib/ErrorBase.cpp
+++ b/aos/externals/WPILib/WPILib/ErrorBase.cpp
@@ -29,12 +29,7 @@
* @brief Retrieve the current error.
* Get the current error information associated with this sensor.
*/
-Error& ErrorBase::GetError()
-{
- return m_error;
-}
-
-const Error& ErrorBase::GetError() const
+Error& ErrorBase::GetError() const
{
return m_error;
}
diff --git a/aos/externals/WPILib/WPILib/ErrorBase.h b/aos/externals/WPILib/WPILib/ErrorBase.h
index 9091f05..afa2f4c 100644
--- a/aos/externals/WPILib/WPILib/ErrorBase.h
+++ b/aos/externals/WPILib/WPILib/ErrorBase.h
@@ -64,8 +64,7 @@
ErrorBase();
virtual ~ErrorBase();
- Error& GetError();
- const Error& GetError() const;
+ Error& GetError() const;
void SetErrnoError(const char *contextMessage,
const char* filename, const char* function, UINT32 lineNumber) const;
void SetImaqError(int success, const char *contextMessage,