Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-02 02:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fixed wpi_setErrnoError to print the error name"

Browse Source
This commit is contained in:
Alex Henning (WPI)
2014-07-28 07:05:51 -07:00
committed by Gerrit Code Review
parent a7efbe0d7a 1038f98e83
commit 338120c3a5
3 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hal/include/HAL/cpp/StackTrace.hpp
View File

@@ -9,5 +9,4 @@
extern "C"
{
void printCurrentStackTrace();
bool getErrnoToName(int32_t errNo, char* name);
}

4
hal/lib/Athena/cpp/StackTrace.cpp
View File

@@ -7,7 +7,3 @@
void printCurrentStackTrace() {
// TODO: Implement
}
bool getErrnoToName(int32_t errNo, char* name) {
return false; // TODO: Implement
}

21
wpilibc/wpilibC++/lib/ErrorBase.cpp
View File

@@ -12,6 +12,7 @@
#include "WPIErrors.h"
#include <errno.h>
#include <cstring>
#include <cstdio>
MUTEX_ID ErrorBase::_globalErrorMutex = initializeMutexNormal();
@@ -49,7 +50,7 @@ void ErrorBase::ClearError() const
/**
* @brief Set error information associated with a C library call that set an error to the "errno" global variable.
*
*
* @param contextMessage A custom message from the code that set the error.
* @param filename Filename of the error source
* @param function Function of the error source
@@ -66,12 +67,7 @@ void ErrorBase::SetErrnoError(const char *contextMessage,
}
else
{
char *statName = new char[256 + 1]; // TODO: MAX_SYS_SYM_LEN or linux equivalent.
if (getErrnoToName(errNo, statName))
snprintf(err, 256, "%s (0x%08X): %s", statName, errNo, contextMessage);
else
snprintf(err, 256, "Unknown errno 0x%08X: %s", errNo, contextMessage);
delete [] statName;
snprintf(err, 256, "%s (0x%08X): %s", strerror(errNo), errNo, contextMessage);
}
// Set the current error information for this object.
@@ -86,7 +82,7 @@ void ErrorBase::SetErrnoError(const char *contextMessage,
/**
* @brief Set the current error information associated from the nivision Imaq API.
*
*
* @param success The return from the function
* @param contextMessage A custom message from the code that set the error.
* @param filename Filename of the error source
@@ -113,7 +109,7 @@ void ErrorBase::SetImaqError(int success, const char *contextMessage, const char
/**
* @brief Set the current error information associated with this sensor.
*
*
* @param code The error code
* @param contextMessage A custom message from the code that set the error.
* @param filename Filename of the error source
@@ -138,7 +134,7 @@ void ErrorBase::SetError(Error::Code code, const char *contextMessage,
/**
* @brief Set the current error information associated with this sensor.
*
*
* @param errorMessage The error message from WPIErrors.h
* @param contextMessage A custom message from the code that set the error.
* @param filename Filename of the error source
@@ -168,7 +164,7 @@ void ErrorBase::CloneError(ErrorBase *rhs) const
/**
@brief Check if the current error code represents a fatal error.
@return true if the current error is fatal.
*/
bool ErrorBase::StatusIsFatal() const
@@ -202,11 +198,10 @@ void ErrorBase::SetGlobalWPIError(const char *errorMessage, const char *contextM
}
/**
* Retrieve the current global error.
* Retrieve the current global error.
*/
Error& ErrorBase::GetGlobalError()
{
Synchronized mutex(_globalErrorMutex);
return _globalError;
}