Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-26 01:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Preferences in C++

Browse Source 
The file name was never updated from the old path, a deadlock occured
sometimes.  A "resource not found" message was also set when fopen()
returns an error, which should be an errno message because it's a C
library error.

Change-Id: Ic913a08f6f5d73219cb6625198f5a4519c039956
This commit is contained in:
Thomas Clark
2014-07-25 17:00:41 -04:00
parent 326aa2e85c
commit 980ea96b05
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wpilibc/wpilibC++/lib/Preferences.cpp
View File

@@ -18,7 +18,7 @@ static const char *kTableName = "Preferences";
/** The value of the save field */
static const char *kSaveField = "~S A V E~";
/** The file to save to */
static const char *kFileName = "/c/wpilib-preferences.ini";
static const char *kFileName = "wpilib-preferences.ini";
/** The characters to put between a field and value */
static const char *kValuePrefix = "=\"";
/** The characters to put after the value */
@@ -33,9 +33,9 @@ Preferences::Preferences() :
m_readTask("PreferencesReadTask", (FUNCPTR)Preferences::InitReadTask),
m_writeTask("PreferencesWriteTask", (FUNCPTR)Preferences::InitWriteTask)
{
m_fileLock = initializeMutexNormal();
m_fileLock = initializeMutexRecursive();
m_fileOpStarted = initializeSemaphore (SEMAPHORE_EMPTY);
m_tableLock = initializeMutexNormal();
m_tableLock = initializeMutexRecursive();
Synchronized sync(m_fileLock);
m_readTask.Start((uint32_t)this);
@@ -424,7 +424,7 @@ void Preferences::ReadTaskRun()
{
value = fgetc(file);
} while (value == ' ' || value == '\t');
if (value == '\n' || value == ';')
{
if (value == '\n')
@@ -511,7 +511,7 @@ void Preferences::ReadTaskRun()
}
else
{
wpi_setWPIErrorWithContext(NoAvailableResources, "Failed to open preferences file.");
wpi_setErrnoErrorWithContext("Opening preferences file");
}
if (file != NULL)
@@ -519,7 +519,7 @@ void Preferences::ReadTaskRun()
if (!comment.empty())
m_endComment = comment;
NetworkTable::GetTable(kTableName)->PutBoolean(kSaveField, false);
NetworkTable::GetTable(kTableName)->AddTableListener(this);
}