Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

modbus.c -> modbus.cpp #160

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

modbus.c -> modbus.cpp #160

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/libmodbus/modbus.c → src/libmodbus/modbus.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,16 +723,16 @@ static int response_io_status(uint8_t *tab_io_status,
static int response_exception(modbus_t *ctx, sft_t *sft,
int exception_code, uint8_t *rsp,
unsigned int to_flush,
const char* template, ...)
const char* format, ...)
{
int rsp_length;

/* Print debug message */
if (ctx->debug) {
va_list ap;

va_start(ap, template);
vfprintf(stderr, template, ap);
va_start(ap, format);
vfprintf(stderr, format, ap);
va_end(ap);
}

Expand Down Expand Up @@ -992,10 +992,10 @@ int modbus_reply(modbus_t *ctx, const uint8_t *req,
address);
} else {
uint16_t data = mb_mapping->tab_registers[mapping_address];
uint16_t and = (req[offset + 3] << 8) + req[offset + 4];
uint16_t or = (req[offset + 5] << 8) + req[offset + 6];
uint16_t _and = (req[offset + 3] << 8) + req[offset + 4];
uint16_t _or = (req[offset + 5] << 8) + req[offset + 6];

data = (data & and) | (or & (~and));
data = (data & _and) | (_or & (~_and));
mb_mapping->tab_registers[mapping_address] = data;
memcpy(rsp, req, req_length);
rsp_length = req_length;
Expand Down Expand Up @@ -1904,9 +1904,9 @@ void modbus_mapping_free(modbus_mapping_t *mb_mapping)
*/
size_t strlcpy(char *dest, const char *src, size_t dest_size)
{
register char *d = dest;
register const char *s = src;
register size_t n = dest_size;
char *d = dest;
const char *s = src;
size_t n = dest_size;

/* Copy as many bytes as will fit */
if (n != 0 && --n != 0) {
Expand Down