AndyWhittaker
/
OpenPLC_v3
mirror of https://github.com/AndyWhittaker/OpenPLC_v3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Address merge conflicts

This commit is contained in:
Garret Fick 2019-11-13 10:48:16 -05:00
parent e4c46623eb 28825354e1
commit 10d9b47415
No known key found for this signature in database
GPG Key ID: A1BBEF9D2AB249C6
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
runtime/core/dnp3s/dnp3.cpp
View File

@ -188,9 +188,9 @@ void bind_variables(const vector<string>& binding_defs,
vector<tuple<string, int8_t, int16_t>> binding_infos;
for (auto it = binding_defs.begin(); it != binding_defs.end(); ++it) {
// Find the name of the located variable
string name = get_located_name((*it));
int8_t group_number = get_group_number((*it));
int16_t data_index = get_data_index((*it));
string name = get_located_name(*it);
int8_t group_number = get_group_number(*it);
int16_t data_index = get_data_index(*it);
if (name.empty() || group_number < 0 || data_index < 0) {
// If one of the items is not valid, then don't handle further
@ -288,6 +288,7 @@ struct Dnp3Config {
/// Link layer config
opendnp3::LinkConfig link;
/// Descriptions of the bindings we want to create.
vector<string> bindings;
};

13
runtime/core/ini_util.h
View File

@ -12,7 +12,6 @@
// See the License for the specific language governing permissionsand
// limitations under the License.
#ifndef CORE_INI_UTIL_H_
#define CORE_INI_UTIL_H_
@ -25,8 +24,8 @@
/// Convert a boolean value in the INI file to a boolean.
/// The value must be "true", otherwise it is interpreted as false.
/// @param value the value to convert
/// @return The value.
/// @param value the value to convert.
/// @return The converted value.
inline bool ini_atob(const char* value) {
return strcmp("true", value) == 0;
}
@ -45,11 +44,11 @@ inline bool ini_matches(const char* section_expected,
&& strcmp(value_expected, value) == 0;
}
/// Implementation for fgets based on istream
/// @param pointe rto an array of chars where the string read is copied
/// @param num Maximum number of characters to be copied into str
/// Implementation for fgets based on istream.
/// @param str pointer to an array of chars where the string read is copied.
/// @param num Maximum number of characters to be copied into str.
/// @param stream The stream object. The string must be null terminated.
/// @param Return the string or null if cannot read more.
/// @return the string or null if cannot read more.
static char* istream_fgets(char* str, int num, void* stream) {
auto st = reinterpret_cast<std::istream*>(stream);
if (!st->good() || st->eof()) {