From 6c509ea598b9c53a0646b65c7dd239c5923a86bd Mon Sep 17 00:00:00 2001
From: Douglas Araujo <douglas.araujo@ess.eu>
Date: Tue, 28 Mar 2023 10:28:20 +0200
Subject: [PATCH] Run end-file and trim-whitespace fixer
---
App/tools/driver.makefile | 14 +++++++-------
tools/iocsh | 2 +-
tools/iocsh_functions.bash | 14 +++++++-------
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/App/tools/driver.makefile b/App/tools/driver.makefile
index a261d08..2418e39 100644
--- a/App/tools/driver.makefile
+++ b/App/tools/driver.makefile
@@ -38,7 +38,7 @@
# Name of the built module.
# If not defined, it is derived from the directory name.
# SOURCES
-# All source files to compile.
+# All source files to compile.
# If not defined, default is all *.c *.cc *.cpp *.st *.stt in
# the source directory (where you run make).
# If you define this, you must list ALL sources.
@@ -158,7 +158,7 @@ COMMANDLINE_LIBRARY =
OBJ=.o
COMMON_DIR = O.${EPICSVERSION}_Common
-
+
ifndef T_A
## RUN 1
# Target achitecture not yet defined, but EPICSVERSION is already known.
@@ -372,7 +372,7 @@ LOADABLE_LIBRARY=$(if ${LIBRARY_OBJS},${PRJ},)
LIBOBJS += $(if $(MODULEDBD), $(addsuffix $(OBJ),$(basename ${REGISTRYFILE})))
# Create and include dependency files.
-HDEPENDS =
+HDEPENDS =
HDEPENDS_METHOD = COMP
HDEPENDS_COMPFLAGS = -c
MKMF = DO_NOT_USE_MKMF
@@ -421,9 +421,9 @@ debug::
@echo "BPTS = ${BPTS}"
@echo "DBDINSTALLS = ${DBDINSTALLS}"
@echo "HDRS = ${HDRS}"
- @echo "SOURCES = ${SOURCES}"
- @echo "SOURCES_${OS_CLASS} = ${SOURCES_${OS_CLASS}}"
- @echo "SRCS = ${SRCS}"
+ @echo "SOURCES = ${SOURCES}"
+ @echo "SOURCES_${OS_CLASS} = ${SOURCES_${OS_CLASS}}"
+ @echo "SRCS = ${SRCS}"
@echo "REQ = ${REQ}"
@echo "LIBOBJS = ${LIBOBJS}"
@echo "DBDS = ${DBDS}"
@@ -451,7 +451,7 @@ endif
# Fix incompatible release rules.
RELEASE_DBDFLAGS = -I ${EPICS_BASE}/dbd
-RELEASE_INCLUDES = -I${EPICS_BASE}/include
+RELEASE_INCLUDES = -I${EPICS_BASE}/include
# For EPICS 3.15+:
RELEASE_INCLUDES += -I${EPICS_BASE}/include/compiler/${CMPLR_CLASS}
RELEASE_INCLUDES += -I${EPICS_BASE}/include/os/${OS_CLASS}
diff --git a/tools/iocsh b/tools/iocsh
index 5ac7398..56abb27 100755
--- a/tools/iocsh
+++ b/tools/iocsh
@@ -163,4 +163,4 @@ fi
#
#
# shellcheck disable=SC2086
-${__LOADER__}${EPICS_BASE}/bin/${EPICS_HOST_ARCH}/softIoc${__PVA__} -D ${EPICS_BASE}/dbd/softIoc${__PVA__}.dbd "${IOC_STARTUP}" 2>&1
\ No newline at end of file
+${__LOADER__}${EPICS_BASE}/bin/${EPICS_HOST_ARCH}/softIoc${__PVA__} -D ${EPICS_BASE}/dbd/softIoc${__PVA__}.dbd "${IOC_STARTUP}" 2>&1
diff --git a/tools/iocsh_functions.bash b/tools/iocsh_functions.bash
index df52f2a..e8a81db 100644
--- a/tools/iocsh_functions.bash
+++ b/tools/iocsh_functions.bash
@@ -1,6 +1,6 @@
# -*- mode: sh -*-
#
-# Copyright (c) 2004 - 2017 Paul Scherrer Institute
+# Copyright (c) 2004 - 2017 Paul Scherrer Institute
# Copyright (c) 2017 - 2019 European Spallation Source ERIC
#
# The program is free software: you can redistribute
@@ -45,7 +45,7 @@ function checkIfVar
result=$EXIST
# exist
fi
- echo "${result}"
+ echo "${result}"
};
@@ -152,7 +152,7 @@ function printIocEnv() {
# kill softioc process : OK
# kill main precess : Enter twice in terminal,
# close softIoc, but STATUP file is remained.
-#
+#
function softIoc_end() {
local startup_file=$1
@@ -190,15 +190,15 @@ function iocsh_ps1() {
}
# Please look at the limitation in require.c in registerModule()
-# /*
-# Require DB has the following four PVs:
+# /*
+# Require DB has the following four PVs:
# - $(REQUIRE_IOC):$(MODULE)_VER
# - $(REQUIRE_IOC):MOD_VER
# - $(REQUIRE_IOC):VERSIONS
# - $(REQUIRE_IOC):MODULES
# We reserved 30 chars for :$(MODULE)_VER, so MODULE has the maximum 24 chars.
# And we've reserved for 30 chars for $(REQUIRE_IOC).
-# So, the whole PV and record name in moduleversion.template has 59 + 1.
+# So, the whole PV and record name in moduleversion.template has 59 + 1.
# */
@@ -420,7 +420,7 @@ function set_e3_cmd_top(){
local file_path=""
local file_top=""
local file_name=""
-
+
if [ -f "$file" ]; then
file_path="$(readlink -e "$file")"
file_top="${file_path%/*}"
--
GitLab