lin-epics-modules/mastermacs
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make the linter happy :-)

Browse Source
This commit is contained in:
mathis_s
2025-02-14 16:52:26 +01:00
parent 6321a78b78
commit e8ab0a1074
2 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/masterMacsAxis.cpp
View File

@ -47,10 +47,8 @@ masterMacsAxis::masterMacsAxis(masterMacsController *pC, int axisNo)
pC->pAxes_[axisNo] = this; pC->pAxes_[axisNo] = this;
Therefore, the axes are managed by the controller pC. If axisNo is out of Therefore, the axes are managed by the controller pC. If axisNo is out of
bounds, asynMotorAxis prints an error (see bounds, asynMotorAxis prints an error. However, we want the IOC creation to
https://github.com/epics-modules/motor/blob/master/motorApp/MotorSrc/asynMotorAxis.cpp, stop completely, since this is a configuration error.
line 40). However, we want the IOC creation to stop completely, since this
is a configuration error.
*/ */
if (axisNo >= pC->numAxes_) { if (axisNo >= pC->numAxes_) {
asynPrint(pC_->pasynUserSelf, ASYN_TRACE_ERROR, asynPrint(pC_->pasynUserSelf, ASYN_TRACE_ERROR,
@ -1179,7 +1177,6 @@ asynStatus masterMacsCreateAxis(const char *portName, int axis) {
with the specified name exists) or a nullptr. Therefore, we first do a with the specified name exists) or a nullptr. Therefore, we first do a
nullptr check, then a cast to asynPortDriver and lastly a (typesafe) nullptr check, then a cast to asynPortDriver and lastly a (typesafe)
dynamic_upcast to Controller dynamic_upcast to Controller
https://stackoverflow.com/questions/70906749/is-there-a-safe-way-to-cast-void-to-class-pointer-in-c
*/ */
void *ptr = findAsynPortDriver(portName); void *ptr = findAsynPortDriver(portName);
if (ptr == nullptr) { if (ptr == nullptr) {
@ -1213,12 +1210,8 @@ asynStatus masterMacsCreateAxis(const char *portName, int axis) {
/* /*
We create a new instance of the axis, using the "new" keyword to We create a new instance of the axis, using the "new" keyword to
allocate it on the heap while avoiding RAII. allocate it on the heap while avoiding RAII. The created object is
https://github.com/epics-modules/motor/blob/master/motorApp/MotorSrc/asynMotorController.cpp registered in EPICS in its constructor and can safely be "leaked" here.
https://github.com/epics-modules/asyn/blob/master/asyn/asynPortDriver/asynPortDriver.cpp
The created object is registered in EPICS in its constructor and can
safely be "leaked" here.
*/ */
#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wunused-variable"

8
src/masterMacsController.cpp
View File

@ -505,12 +505,8 @@ asynStatus masterMacsCreateController(const char *portName,
double comTimeout) { double comTimeout) {
/* /*
We create a new instance of the controller, using the "new" keyword to We create a new instance of the controller, using the "new" keyword to
allocate it on the heap while avoiding RAII. allocate it on the heap while avoiding RAII. The created object is
https://github.com/epics-modules/motor/blob/master/motorApp/MotorSrc/asynMotorController.cpp registered in EPICS in its constructor and can safely be "leaked" here.
https://github.com/epics-modules/asyn/blob/master/asyn/asynPortDriver/asynPortDriver.cpp
The created object is registered in EPICS in its constructor and can
safely be "leaked" here.
*/ */
#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wunused-variable"