Skip to content

Commit dd45f19

Browse files
committed
Add .clang-format and format code (closes #394)
Thank you @pboettch for initial proposal.
1 parent d5512d9 commit dd45f19

22 files changed

+1130
-919
lines changed

.clang-format

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
---
2+
BasedOnStyle: LLVM
3+
AlignArrayOfStructures: Left
4+
AlignOperands: true
5+
AlignConsecutiveAssignments: false
6+
AlignConsecutiveMacros: true
7+
AlignEscapedNewlines: Left
8+
AlignTrailingComments: true
9+
AllowShortBlocksOnASingleLine: false
10+
AllowShortCaseLabelsOnASingleLine: false
11+
AllowShortEnumsOnASingleLine: false
12+
AllowShortFunctionsOnASingleLine: None
13+
AllowShortIfStatementsOnASingleLine: Never
14+
BreakBeforeBraces: Custom
15+
BraceWrapping:
16+
AfterClass: false
17+
AfterControlStatement: false
18+
AfterEnum: false
19+
AfterFunction: true
20+
AfterNamespace: true
21+
AfterObjCDeclaration: true
22+
AfterStruct: false
23+
AfterUnion: false
24+
AfterExternBlock: false
25+
BeforeCatch: false
26+
BeforeElse: false
27+
IndentBraces: false
28+
SplitEmptyFunction: true
29+
SplitEmptyRecord: true
30+
SplitEmptyNamespace: true
31+
BinPackArguments: false
32+
BinPackParameters: false
33+
ColumnLimit: 90
34+
ConstructorInitializerAllOnOneLineOrOnePerLine: true
35+
IncludeBlocks: Preserve
36+
IndentWidth: 4
37+
ObjCBlockIndentWidth: 4
38+
PointerAlignment: Right
39+
ReferenceAlignment: Right
40+
SpaceAfterCStyleCast: true
41+
SpaceAfterTemplateKeyword: true
42+
SpaceBeforeAssignmentOperators: true
43+
SpaceBeforeCtorInitializerColon: true
44+
SpaceBeforeInheritanceColon: true
45+
SpaceBeforeParens: ControlStatementsExceptForEachMacros
46+
SpaceBeforeRangeBasedForLoopColon: true
47+
SpaceInEmptyParentheses: false
48+
SpacesBeforeTrailingComments: 1
49+
SpacesInAngles: false
50+
SpacesInContainerLiterals: false
51+
SpacesInCStyleCastParentheses: false
52+
SpacesInParentheses: false
53+
SpacesInSquareBrackets: false
54+
SeparateDefinitionBlocks: Always
55+
UseTab: Never
56+
PPIndentWidth: 2

src/modbus-data.c

Lines changed: 21 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
#include <stdlib.h>
88

9+
// clang-format off
910
#ifndef _MSC_VER
1011
# include <stdint.h>
1112
#else
@@ -69,21 +70,24 @@ static inline uint32_t bswap_32(uint32_t x)
6970
return (bswap_16(x & 0xffff) << 16) | (bswap_16(x >> 16));
7071
}
7172
#endif
73+
// clang-format on
7274

7375
/* Sets many bits from a single byte value (all 8 bits of the byte value are
7476
set) */
7577
void modbus_set_bits_from_byte(uint8_t *dest, int idx, const uint8_t value)
7678
{
7779
int i;
7880

79-
for (i=0; i < 8; i++) {
80-
dest[idx+i] = (value & (1 << i)) ? 1 : 0;
81+
for (i = 0; i < 8; i++) {
82+
dest[idx + i] = (value & (1 << i)) ? 1 : 0;
8183
}
8284
}
8385

8486
/* Sets many bits from a table of bytes (only the bits between idx and
8587
idx + nb_bits are set) */
86-
void modbus_set_bits_from_bytes(uint8_t *dest, int idx, unsigned int nb_bits,
88+
void modbus_set_bits_from_bytes(uint8_t *dest,
89+
int idx,
90+
unsigned int nb_bits,
8791
const uint8_t *tab_byte)
8892
{
8993
unsigned int i;
@@ -99,8 +103,7 @@ void modbus_set_bits_from_bytes(uint8_t *dest, int idx, unsigned int nb_bits,
99103

100104
/* Gets the byte value from many bits.
101105
To obtain a full byte, set nb_bits to 8. */
102-
uint8_t modbus_get_byte_from_bits(const uint8_t *src, int idx,
103-
unsigned int nb_bits)
106+
uint8_t modbus_get_byte_from_bits(const uint8_t *src, int idx, unsigned int nb_bits)
104107
{
105108
unsigned int i;
106109
uint8_t value = 0;
@@ -111,8 +114,8 @@ uint8_t modbus_get_byte_from_bits(const uint8_t *src, int idx,
111114
nb_bits = 8;
112115
}
113116

114-
for (i=0; i < nb_bits; i++) {
115-
value |= (src[idx+i] << i);
117+
for (i = 0; i < nb_bits; i++) {
118+
value |= (src[idx + i] << i);
116119
}
117120

118121
return value;
@@ -130,10 +133,7 @@ float modbus_get_float_abcd(const uint16_t *src)
130133
c = (src[1] >> 8) & 0xFF;
131134
d = (src[1] >> 0) & 0xFF;
132135

133-
i = (a << 24) |
134-
(b << 16) |
135-
(c << 8) |
136-
(d << 0);
136+
i = (a << 24) | (b << 16) | (c << 8) | (d << 0);
137137
memcpy(&f, &i, 4);
138138

139139
return f;
@@ -151,10 +151,7 @@ float modbus_get_float_dcba(const uint16_t *src)
151151
c = (src[1] >> 8) & 0xFF;
152152
d = (src[1] >> 0) & 0xFF;
153153

154-
i = (d << 24) |
155-
(c << 16) |
156-
(b << 8) |
157-
(a << 0);
154+
i = (d << 24) | (c << 16) | (b << 8) | (a << 0);
158155
memcpy(&f, &i, 4);
159156

160157
return f;
@@ -172,10 +169,7 @@ float modbus_get_float_badc(const uint16_t *src)
172169
c = (src[1] >> 8) & 0xFF;
173170
d = (src[1] >> 0) & 0xFF;
174171

175-
i = (b << 24) |
176-
(a << 16) |
177-
(d << 8) |
178-
(c << 0);
172+
i = (b << 24) | (a << 16) | (d << 8) | (c << 0);
179173
memcpy(&f, &i, 4);
180174

181175
return f;
@@ -193,10 +187,7 @@ float modbus_get_float_cdab(const uint16_t *src)
193187
c = (src[1] >> 8) & 0xFF;
194188
d = (src[1] >> 0) & 0xFF;
195189

196-
i = (c << 24) |
197-
(d << 16) |
198-
(a << 8) |
199-
(b << 0);
190+
i = (c << 24) | (d << 16) | (a << 8) | (b << 0);
200191
memcpy(&f, &i, 4);
201192

202193
return f;
@@ -208,18 +199,17 @@ float modbus_get_float(const uint16_t *src)
208199
float f;
209200
uint32_t i;
210201

211-
i = (((uint32_t)src[1]) << 16) + src[0];
202+
i = (((uint32_t) src[1]) << 16) + src[0];
212203
memcpy(&f, &i, sizeof(float));
213204

214205
return f;
215-
216206
}
217207

218208
/* Set a float to 4 bytes for Modbus w/o any conversion (ABCD) */
219209
void modbus_set_float_abcd(float f, uint16_t *dest)
220210
{
221211
uint32_t i;
222-
uint8_t *out = (uint8_t*) dest;
212+
uint8_t *out = (uint8_t *) dest;
223213
uint8_t a, b, c, d;
224214

225215
memcpy(&i, &f, sizeof(uint32_t));
@@ -238,7 +228,7 @@ void modbus_set_float_abcd(float f, uint16_t *dest)
238228
void modbus_set_float_dcba(float f, uint16_t *dest)
239229
{
240230
uint32_t i;
241-
uint8_t *out = (uint8_t*) dest;
231+
uint8_t *out = (uint8_t *) dest;
242232
uint8_t a, b, c, d;
243233

244234
memcpy(&i, &f, sizeof(uint32_t));
@@ -251,14 +241,13 @@ void modbus_set_float_dcba(float f, uint16_t *dest)
251241
out[1] = c;
252242
out[2] = b;
253243
out[3] = a;
254-
255244
}
256245

257246
/* Set a float to 4 bytes for Modbus with byte swap conversion (BADC) */
258247
void modbus_set_float_badc(float f, uint16_t *dest)
259248
{
260249
uint32_t i;
261-
uint8_t *out = (uint8_t*) dest;
250+
uint8_t *out = (uint8_t *) dest;
262251
uint8_t a, b, c, d;
263252

264253
memcpy(&i, &f, sizeof(uint32_t));
@@ -277,7 +266,7 @@ void modbus_set_float_badc(float f, uint16_t *dest)
277266
void modbus_set_float_cdab(float f, uint16_t *dest)
278267
{
279268
uint32_t i;
280-
uint8_t *out = (uint8_t*) dest;
269+
uint8_t *out = (uint8_t *) dest;
281270
uint8_t a, b, c, d;
282271

283272
memcpy(&i, &f, sizeof(uint32_t));
@@ -298,6 +287,6 @@ void modbus_set_float(float f, uint16_t *dest)
298287
uint32_t i;
299288

300289
memcpy(&i, &f, sizeof(uint32_t));
301-
dest[0] = (uint16_t)i;
302-
dest[1] = (uint16_t)(i >> 16);
290+
dest[0] = (uint16_t) i;
291+
dest[1] = (uint16_t) (i >> 16);
303292
}

src/modbus-private.h

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#ifndef MODBUS_PRIVATE_H
88
#define MODBUS_PRIVATE_H
99

10+
// clang-format off
1011
#ifndef _MSC_VER
1112
# include <stdint.h>
1213
# include <sys/time.h>
@@ -15,8 +16,9 @@
1516
# include <time.h>
1617
typedef int ssize_t;
1718
#endif
18-
#include <sys/types.h>
19+
// clang-format on
1920
#include <config.h>
21+
#include <sys/types.h>
2022

2123
#include "modbus.h"
2224

@@ -36,11 +38,11 @@ MODBUS_BEGIN_DECLS
3638
#define _MODBUS_EXCEPTION_RSP_LENGTH 5
3739

3840
/* Timeouts in microsecond (0.5 s) */
39-
#define _RESPONSE_TIMEOUT 500000
40-
#define _BYTE_TIMEOUT 500000
41+
#define _RESPONSE_TIMEOUT 500000
42+
#define _BYTE_TIMEOUT 500000
4143

4244
typedef enum {
43-
_MODBUS_BACKEND_TYPE_RTU=0,
45+
_MODBUS_BACKEND_TYPE_RTU = 0,
4446
_MODBUS_BACKEND_TYPE_TCP
4547
} modbus_backend_type_t;
4648

@@ -69,24 +71,25 @@ typedef struct _modbus_backend {
6971
unsigned int header_length;
7072
unsigned int checksum_length;
7173
unsigned int max_adu_length;
72-
int (*set_slave) (modbus_t *ctx, int slave);
73-
int (*build_request_basis) (modbus_t *ctx, int function, int addr,
74-
int nb, uint8_t *req);
75-
int (*build_response_basis) (sft_t *sft, uint8_t *rsp);
76-
int (*prepare_response_tid) (const uint8_t *req, int *req_length);
77-
int (*send_msg_pre) (uint8_t *req, int req_length);
78-
ssize_t (*send) (modbus_t *ctx, const uint8_t *req, int req_length);
79-
int (*receive) (modbus_t *ctx, uint8_t *req);
80-
ssize_t (*recv) (modbus_t *ctx, uint8_t *rsp, int rsp_length);
81-
int (*check_integrity) (modbus_t *ctx, uint8_t *msg,
82-
const int msg_length);
83-
int (*pre_check_confirmation) (modbus_t *ctx, const uint8_t *req,
84-
const uint8_t *rsp, int rsp_length);
85-
int (*connect) (modbus_t *ctx);
86-
void (*close) (modbus_t *ctx);
87-
int (*flush) (modbus_t *ctx);
88-
int (*select) (modbus_t *ctx, fd_set *rset, struct timeval *tv, int msg_length);
89-
void (*free) (modbus_t *ctx);
74+
int (*set_slave)(modbus_t *ctx, int slave);
75+
int (*build_request_basis)(
76+
modbus_t *ctx, int function, int addr, int nb, uint8_t *req);
77+
int (*build_response_basis)(sft_t *sft, uint8_t *rsp);
78+
int (*prepare_response_tid)(const uint8_t *req, int *req_length);
79+
int (*send_msg_pre)(uint8_t *req, int req_length);
80+
ssize_t (*send)(modbus_t *ctx, const uint8_t *req, int req_length);
81+
int (*receive)(modbus_t *ctx, uint8_t *req);
82+
ssize_t (*recv)(modbus_t *ctx, uint8_t *rsp, int rsp_length);
83+
int (*check_integrity)(modbus_t *ctx, uint8_t *msg, const int msg_length);
84+
int (*pre_check_confirmation)(modbus_t *ctx,
85+
const uint8_t *req,
86+
const uint8_t *rsp,
87+
int rsp_length);
88+
int (*connect)(modbus_t *ctx);
89+
void (*close)(modbus_t *ctx);
90+
int (*flush)(modbus_t *ctx);
91+
int (*select)(modbus_t *ctx, fd_set *rset, struct timeval *tv, int msg_length);
92+
void (*free)(modbus_t *ctx);
9093
} modbus_backend_t;
9194

9295
struct _modbus {
@@ -114,4 +117,4 @@ size_t strlcpy(char *dest, const char *src, size_t dest_size);
114117

115118
MODBUS_END_DECLS
116119

117-
#endif /* MODBUS_PRIVATE_H */
120+
#endif /* MODBUS_PRIVATE_H */

src/modbus-rtu-private.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
#include <termios.h>
2020
#endif
2121

22-
#define _MODBUS_RTU_HEADER_LENGTH 1
23-
#define _MODBUS_RTU_PRESET_REQ_LENGTH 6
24-
#define _MODBUS_RTU_PRESET_RSP_LENGTH 2
22+
#define _MODBUS_RTU_HEADER_LENGTH 1
23+
#define _MODBUS_RTU_PRESET_REQ_LENGTH 6
24+
#define _MODBUS_RTU_PRESET_RSP_LENGTH 2
2525

26-
#define _MODBUS_RTU_CHECKSUM_LENGTH 2
26+
#define _MODBUS_RTU_CHECKSUM_LENGTH 2
2727

2828
#if defined(_WIN32)
2929
#if !defined(ENOTSUP)
@@ -32,6 +32,7 @@
3232

3333
/* WIN32: struct containing serial handle and a receive buffer */
3434
#define PY_BUF_SIZE 512
35+
3536
struct win32_ser {
3637
/* File handle */
3738
HANDLE fd;
@@ -67,7 +68,7 @@ typedef struct _modbus_rtu {
6768
int rts;
6869
int rts_delay;
6970
int onebyte_time;
70-
void (*set_rts) (modbus_t *ctx, int on);
71+
void (*set_rts)(modbus_t *ctx, int on);
7172
#endif
7273
/* To handle many slaves on the same link */
7374
int confirmation_to_ignore;

0 commit comments

Comments
 (0)