nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed default argument values from DataFiel::create, documentation

Browse Source
This commit is contained in:
john30
2015-03-12 23:20:35 +01:00
parent b838f40a51
commit ce9f443dde
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/data.cpp
+2 -2
View File
@@ -1339,7 +1339,7 @@ result_t DataFieldSet::write(istringstream& input,
void DataFieldTemplates::clear() void DataFieldTemplates::clear()
{ {
for (map<string, DataField*>::iterator it=m_fieldsByName.begin(); it!=m_fieldsByName.end(); it++) { for (map<string, DataField*>::iterator it = m_fieldsByName.begin(); it != m_fieldsByName.end(); it++) {
delete it->second; delete it->second;
it->second = NULL; it->second = NULL;
} }
@@ -1368,7 +1368,7 @@ result_t DataFieldTemplates::add(DataField* field, bool replace)
result_t DataFieldTemplates::addFromFile(vector<string>::iterator& begin, const vector<string>::iterator end, void* arg, vector< vector<string> >* defaults, const string& filename, unsigned int lineNo) result_t DataFieldTemplates::addFromFile(vector<string>::iterator& begin, const vector<string>::iterator end, void* arg, vector< vector<string> >* defaults, const string& filename, unsigned int lineNo)
{ {
DataField* field = NULL; DataField* field = NULL;
result_t result = DataField::create(begin, end, this, field); result_t result = DataField::create(begin, end, this, field, false, true, false);
if (result != RESULT_OK) if (result != RESULT_OK)
return result; return result;
src/lib/ebus/data.h
+4 -3
View File
@@ -154,14 +154,15 @@ public:
* @param templates the @a DataFieldTemplates to be referenced by name, or NULL. * @param templates the @a DataFieldTemplates to be referenced by name, or NULL.
* @param returnField the variable in which to store the created instance. * @param returnField the variable in which to store the created instance.
* @param isWriteMessage whether the field is part of a write message (default false). * @param isWriteMessage whether the field is part of a write message (default false).
* @param dstAddress the destination bus address (default @a SYN for creating a template @a DataField). * @param isTemplate true for creating a template @a DataField.
* @param isBroadcastOrMasterDestination true if the destination bus address is @a BRODCAST or a master address.
* @return @a RESULT_OK on success, or an error code. * @return @a RESULT_OK on success, or an error code.
* Note: the caller needs to free the created instance. * Note: the caller needs to free the created instance.
*/ */
static result_t create(vector<string>::iterator& it, const vector<string>::iterator end, static result_t create(vector<string>::iterator& it, const vector<string>::iterator end,
DataFieldTemplates* templates, DataField*& returnField, DataFieldTemplates* templates, DataField*& returnField,
const bool isWriteMessage=false, const bool isWriteMessage,
const bool isTemplate=true, const bool isBroadcastOrMasterDestination=false); const bool isTemplate, const bool isBroadcastOrMasterDestination);
/** /**
* Dump the @a string optionally embedded in @a TEXT_SEPARATOR to the output. * Dump the @a string optionally embedded in @a TEXT_SEPARATOR to the output.