Skip to content

Commit 912f564

Browse files
Merge pull request #59 from tbeu/fix-indents-again
Fix indents again
2 parents 40d3120 + a52430f commit 912f564

File tree

8 files changed

+477
-417
lines changed

8 files changed

+477
-417
lines changed

Resources/Include/MDDComedi.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ int MDD_comedi_set_global_oor_behavior(int behavior) {
126126
enum comedi_oor_behavior oldBehavior;
127127

128128
if (behavior >= 2) {
129-
ModelicaFormatError("MDDComedi: Error, not valid argument to MDD_comedi_set_global_oor_behavior (was %d).\n",
129+
ModelicaFormatError("MDDComedi: Error, not valid argument to MDD_comedi_set_global_oor_behavior (was %d).\n",
130130
behavior);
131131
}
132132

@@ -148,7 +148,7 @@ void MDD_comedi_get_range(void* p_device, int subdevice, int channel, int range,
148148
comedi_range* p_range;
149149
p_range = comedi_get_range(device, (unsigned int)subdevice, (unsigned int)channel, (unsigned int)range);
150150
if (p_range == NULL) {
151-
ModelicaFormatError("MDDComedi: MDD_comedi_get_range failed.\n");
151+
ModelicaFormatError("MDDComedi: MDD_comedi_get_range failed.\n");
152152
}
153153
*min = p_range->min;
154154
*max = p_range->max;

Resources/Include/MDDRealtimeSynchronize.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ DllExport void MDD_setPriority(int priority) {
7171
ModelicaFormatMessage("LastError: %d\n", dw);
7272
}
7373
}
74-
}
74+
}
7575

7676
typedef struct {
7777
DWORD prio;
@@ -290,7 +290,7 @@ DllExport double MDD_realtimeSynchronize(double simTime, int resolution, double
290290
#include <stdlib.h>
291291
#include <unistd.h>
292292
#include <errno.h>
293-
#include <string.h>
293+
#include <string.h>
294294
#include <sys/mman.h>
295295
#include "../src/include/CompatibilityDefs.h"
296296
#define MY_RT_PRIORITY (49) /**< we use 49 since PRREMPT_RT use 50

Resources/Include/MDDSerialPackager.h

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ DllExport void MDD_SerialPackagerSetData( void* p_package, const char * data, in
104104
SerialPackager* pkg = (SerialPackager*) p_package;
105105
memcpy(pkg->data, data, size);
106106
if ( (unsigned int) size > pkg->size) {
107-
ModelicaFormatError("SerialPackager: MDD_SerialPackagerSetData failed. Buffer overflow.\n");
107+
ModelicaFormatError("SerialPackager: MDD_SerialPackagerSetData failed. Buffer overflow.\n");
108108
}
109109
pkg->size = size;
110110
pkg->pos = 0;
@@ -165,7 +165,7 @@ DllExport void MDD_SerialPackagerAddInteger(void* p_package, int * u, size_t n)
165165
MDD_SerialPackagerAlignToByteBoundary(pkg);
166166
}
167167
if (pkg->pos + n*sizeof(int) > pkg->size) {
168-
ModelicaFormatError("SerialPackager: MDD_SerialPackagerAddInteger failed. Buffer overflow.\n");
168+
ModelicaFormatError("SerialPackager: MDD_SerialPackagerAddInteger failed. Buffer overflow.\n");
169169
}
170170
memcpy(pkg->data + pkg->pos, u, n*sizeof(int));
171171
pkg->pos += n*sizeof(int);
@@ -188,7 +188,7 @@ DllExport void MDD_SerialPackagerGetInteger(void* p_package, int * y, int n) {
188188
MDD_SerialPackagerAlignToByteBoundary(pkg);
189189
}
190190
if (pkg->pos + n*sizeof(int) > pkg->size) {
191-
ModelicaFormatError("SerialPackager: MDD_SerialPackagerGetInteger failed. Buffer overflow.\n");
191+
ModelicaFormatError("SerialPackager: MDD_SerialPackagerGetInteger failed. Buffer overflow.\n");
192192
}
193193
memcpy(y, pkg->data + pkg->pos, n*sizeof(int));
194194
pkg->pos += n*sizeof(int);
@@ -209,7 +209,7 @@ DllExport void MDD_SerialPackagerAddDouble(void* p_package, double * u, size_t n
209209
MDD_SerialPackagerAlignToByteBoundary(pkg);
210210
}
211211
if (pkg->pos + n*sizeof(double) > pkg->size) {
212-
ModelicaFormatError("SerialPackager: MDD_SerialPackagerAddDouble failed. Buffer overflow.\n");
212+
ModelicaFormatError("SerialPackager: MDD_SerialPackagerAddDouble failed. Buffer overflow.\n");
213213
}
214214
memcpy(pkg->data + pkg->pos, u, n*sizeof(double));
215215
pkg->pos += n*sizeof(double);
@@ -230,7 +230,7 @@ DllExport void MDD_SerialPackagerGetDouble(void* p_package, double * y, int n) {
230230
MDD_SerialPackagerAlignToByteBoundary(pkg);
231231
}
232232
if (pkg->pos + n*sizeof(double) > pkg->size) {
233-
ModelicaFormatError("SerialPackager: MDD_SerialPackagerGetDouble failed. Buffer overflow.\n");
233+
ModelicaFormatError("SerialPackager: MDD_SerialPackagerGetDouble failed. Buffer overflow.\n");
234234
}
235235
memcpy(y, pkg->data + pkg->pos, n*sizeof(double));
236236
pkg->pos += n*sizeof(double);
@@ -252,7 +252,7 @@ DllExport void MDD_SerialPackagerAddDoubleAsFloat(void* p_package, double * u, s
252252
MDD_SerialPackagerAlignToByteBoundary(pkg);
253253
}
254254
if (pkg->pos + n*sizeof(float) > pkg->size) {
255-
ModelicaFormatError("SerialPackager: MDD_SerialPackagerAddDoubleAsFloat failed. Buffer overflow.\n");
255+
ModelicaFormatError("SerialPackager: MDD_SerialPackagerAddDoubleAsFloat failed. Buffer overflow.\n");
256256
}
257257
for (i = 0; i < n; i++) {
258258
castedDouble = (float) u[i];
@@ -278,7 +278,7 @@ DllExport void MDD_SerialPackagerGetFloatAsDouble(void* p_package, double * y, i
278278
MDD_SerialPackagerAlignToByteBoundary(pkg);
279279
}
280280
if (pkg->pos + n*sizeof(float) > pkg->size) {
281-
ModelicaFormatError("SerialPackager: MDD_SerialPackagerGetFloatAsDouble failed. Buffer overflow.\n");
281+
ModelicaFormatError("SerialPackager: MDD_SerialPackagerGetFloatAsDouble failed. Buffer overflow.\n");
282282
}
283283
for (i = 0; i < n; i++) {
284284
memcpy(&value, pkg->data + pkg->pos + i*sizeof(float), sizeof(float));
@@ -307,7 +307,7 @@ DllExport void MDD_SerialPackagerAddString(void* p_package, const char* u, int b
307307
if (pkg->pos + bufferSize > pkg->size) {
308308
ModelicaFormatMessage("pkg->size: %d, pkg->pos+bufferSize: %d, bufferSize: %d, strlen(u): %d\n",
309309
pkg->size, pkg->pos+bufferSize, bufferSize, strlen(u));
310-
ModelicaFormatError("SerialPackager: MDD_SerialPackagerAddString failed. Buffer overflow.\n");
310+
ModelicaFormatError("SerialPackager: MDD_SerialPackagerAddString failed. Buffer overflow.\n");
311311
}
312312
memcpy(pkg->data + pkg->pos, u, bufferSize);
313313
pkg->pos += bufferSize;
@@ -331,7 +331,7 @@ DllExport char* MDD_SerialPackagerGetString(void* p_package, int bufferSize) {
331331
}
332332

333333
if (pkg->pos + bufferSize > pkg->size) {
334-
ModelicaFormatError("SerialPackager: MDD_SerialPackagerGetString failed. Buffer overflow.\n");
334+
ModelicaFormatError("SerialPackager: MDD_SerialPackagerGetString failed. Buffer overflow.\n");
335335
}
336336

337337
for (i=pkg->pos; i < pkg->pos + bufferSize; i++) {
@@ -374,12 +374,12 @@ DllExport int MDD_SerialPackagerIntegerBitunpack(void* p_package, int bitOffset,
374374
bitOffset, width, pkg->pos, pkg->bitOffset);*/
375375
if (width > 32) {
376376
ModelicaFormatError("SerialPackager: MDD_SerialPackagerIntegerBitunpacking failed."
377-
"width > 32.\n");
377+
"width > 32.\n");
378378
}
379379

380380
if ((unsigned int) bitOffset < pkg->bitOffset) {
381381
ModelicaFormatError("SerialPackager: Cowardly refusing to start reading at bitOffset %d "
382-
"which is lower than the current Packager bitOffset %d.\n", bitOffset, pkg->bitOffset);
382+
"which is lower than the current Packager bitOffset %d.\n", bitOffset, pkg->bitOffset);
383383
}
384384

385385
posStart = pkg->pos + bitOffset / 8;
@@ -440,18 +440,18 @@ DllExport void MDD_SerialPackagerIntegerBitpack(void* p_package, int bitOffset,
440440

441441
if (width > 32) {
442442
ModelicaFormatError("SerialPackager: MDD_SerialPackagerIntegerBitpack failed."
443-
"width > 32.\n");
443+
"width > 32.\n");
444444
}
445445
if ((unsigned int)bitOffset < pkg->bitOffset) {
446446
ModelicaFormatError("SerialPackager: Cowardly refusing to start writing at bitOffset %d "
447-
"which is lower than the current Packager bitOffset %d.\n", bitOffset, pkg->bitOffset);
447+
"which is lower than the current Packager bitOffset %d.\n", bitOffset, pkg->bitOffset);
448448
}
449449
if ( width < 32 && (unsigned int)data >= 0x1u << (unsigned int)width ) {
450450
ModelicaFormatError("SerialPackager: Warning: Value %d can't be encoded into %d bits or is negative (no signed int support)!\n", data, width);
451451
}
452452
posEnd = (bitOffset + width) % 8 == 0 ? pkg->pos + (bitOffset + width) / 8 : pkg->pos + (bitOffset + width) / 8 + 1;
453453
if (posEnd > pkg->size) {
454-
ModelicaFormatError("SerialPackager: MDD_SerialPackagerIntegerBitpack failed. Buffer overflow.\n");
454+
ModelicaFormatError("SerialPackager: MDD_SerialPackagerIntegerBitpack failed. Buffer overflow.\n");
455455
}
456456

457457
memset(bits, 0, 40);
@@ -591,7 +591,7 @@ void * MDD_SerialPackagerMemcpyBitRead(void* destination, const void* source, un
591591
int i=0,nBits=bitLength;
592592

593593
if (bitSourceOffset > 7) {
594-
ModelicaFormatError("MDDSerialPackager: bit offsets in MDD_SerialPackagerBitmemcpy greater than max value 7.\n");
594+
ModelicaFormatError("MDDSerialPackager: bit offsets in MDD_SerialPackagerBitmemcpy greater than max value 7.\n");
595595
}
596596

597597
if (bitSourceOffset == 0 && bitLength % 8 == 0) {

Resources/Include/MDDSerialPort.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ int MDD_serialPortReceivingThread(void * p_serial) {
263263
break;
264264
case 1: /* new data available */
265265
if(serial_poll.revents & POLLHUP) {
266-
ModelicaMessage("The serial port was disconnected.\n");
266+
ModelicaMessage("The serial port was disconnected.\n");
267267
}
268268
else {
269269
/* Lock acces to serial->msgInternal */

Resources/Include/MDDSocketCAN.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ int MDD_socketCANRxThread(MDDSocketCAN * mDDSocketCAN) {
292292
case 1: /* new data available */
293293
if(sock_poll.revents & POLLHUP) {
294294
ModelicaFormatError("SocketCAN (%s): The CAN socket was disconnected.\n",
295-
mDDSocketCAN->ifr.ifr_name);
295+
mDDSocketCAN->ifr.ifr_name);
296296
}
297297
else {
298298
/* Receive the next CAN frame */
@@ -319,7 +319,7 @@ int MDD_socketCANRxThread(MDDSocketCAN * mDDSocketCAN) {
319319
break;
320320
}
321321
default:
322-
ModelicaFormatError("MDDSocketCAN.h: Poll returned %d. That should not happen.\n", ret);
322+
ModelicaFormatError("MDDSocketCAN.h: Poll returned %d. That should not happen.\n", ret);
323323
}
324324
}
325325
return 0;

Resources/Include/MDDSoftingCAN.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ DllExport int MDD_softingCANDefineObject(void* p_mDDSoftingCAN, int ident, int t
287287
strcpy(msgtype, "ext tx");
288288
break;
289289
default:
290-
ModelicaFormatError("SoftingCAN: Unsupported message type.\n");
290+
ModelicaFormatError("SoftingCAN: Unsupported message type.\n");
291291
}
292292

293293
ModelicaFormatMessage("SoftingCAN (%s): Defined %s message, id %d (0x%x). Got object number %d.\n",

Resources/Include/MDDUDPSocket.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ int MDD_udpReceivingThread(void * p_udp) {
193193
break;
194194
case 1: /* new data available */
195195
if(sock_poll.revents & POLLHUP) {
196-
ModelicaMessage("The UDP socket was disconnected.\n");
196+
ModelicaMessage("The UDP socket was disconnected.\n");
197197
}
198198
else {
199199
/* Lock acces to udp->msgInternal */
@@ -216,7 +216,7 @@ int MDD_udpReceivingThread(void * p_udp) {
216216
break;
217217
}
218218
default:
219-
ModelicaFormatError("MDDUDPSocket.h: Poll returned %d. That should not happen.\n", ret);
219+
ModelicaFormatError("MDDUDPSocket.h: Poll returned %d. That should not happen.\n", ret);
220220
}
221221

222222
}
@@ -295,7 +295,7 @@ const char * MDD_udpNonBlockingRead(void * p_udp) {
295295
break;
296296
}
297297
default:
298-
ModelicaFormatError("MDDUDPSocket.h: Poll returned %d. That should not happen.\n", ret);
298+
ModelicaFormatError("MDDUDPSocket.h: Poll returned %d. That should not happen.\n", ret);
299299
}
300300

301301
return (const char*) udp->msgExport;

0 commit comments

Comments
 (0)