Skip to content

Commit

Permalink
Remove extra whitespace at end of line and blank lines at end of file
Browse files Browse the repository at this point in the history
  • Loading branch information
eflumerf committed Feb 14, 2025
1 parent 9fdbcff commit ce748a1
Show file tree
Hide file tree
Showing 24 changed files with 152 additions and 160 deletions.
7 changes: 3 additions & 4 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ AlwaysBreakBeforeMultilineStrings: true
AlwaysBreakTemplateDeclarations: true
BinPackArguments: true
BinPackParameters: true
BraceWrapping:
BraceWrapping:
AfterClass: true
AfterControlStatement: true
AfterEnum: true
Expand Down Expand Up @@ -54,11 +54,11 @@ DerivePointerAlignment: true
DisableFormat: false
ExperimentalAutoDetectBinPacking: false
FixNamespaceComments: true
ForEachMacros:
ForEachMacros:
- foreach
- Q_FOREACH
- BOOST_FOREACH
IncludeCategories:
IncludeCategories:
- Regex: '^<.*\.h>'
Priority: 1
- Regex: '^<.*'
Expand Down Expand Up @@ -105,4 +105,3 @@ Standard: Auto
TabWidth: 4
UseTab: ForIndentation
...

2 changes: 1 addition & 1 deletion .github/workflows/artdaq-build-single-pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Build Single Pkg Workflow

on:
push:
branches:
branches:
- develop
paths-ignore:
- 'docs/**'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/artdaq-develop-cpp-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: build-develop
# or API.
on:
push:
branches-ignore:
branches-ignore:
- develop
- stable
paths-ignore:
Expand All @@ -20,5 +20,5 @@ on:

jobs:
build_against_dev_release:
name: Build against develop
uses: art-daq/.github/.github/workflows/artdaq-develop-cpp-ci.yml@stable
name: Build against develop
uses: art-daq/.github/.github/workflows/artdaq-develop-cpp-ci.yml@stable
2 changes: 1 addition & 1 deletion .github/workflows/artdaq-format-single-pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Format Single Pkg Workflow

on:
push:
branches:
branches:
- develop
paths-ignore:
- 'docs/**'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/artdaq-test-single-pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Test Single Pkg Workflow

on:
push:
branches:
branches:
- develop
paths-ignore:
- 'docs/**'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/artdaq-tidy-single-pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Tidy Single Pkg Workflow

on:
push:
branches:
branches:
- develop
paths-ignore:
- 'docs/**'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/auto_approve.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Auto approve

on:
workflow_dispatch:
inputs:
inputs:
pullRequestNumber:
description: Pull request number to auto-approve
required: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/git-whitespace.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Git Whitespace Check Workflow

on:
push:
branches:
branches:
- develop
paths-ignore:
- 'docs/**'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/track_new_issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
}' -f org=$ORGANIZATION -F number=$PROJECT_NUMBER > project_data.json
echo 'PROJECT_ID='$(jq '.data.organization.projectV2.id' project_data.json) >> $GITHUB_ENV
- name: Add issue to project
env:
GITHUB_TOKEN: ${{ secrets.BOT_CI_ISSUES }}
Expand All @@ -37,4 +37,4 @@ jobs:
id
}
}
}' -f project=$PROJECT_ID -f issue=$ISSUE_ID --jq '.data.addProjectV2ItemById.item.id')"
}' -f project=$PROJECT_ID -f issue=$ISSUE_ID --jq '.data.addProjectV2ItemById.item.id')"
4 changes: 2 additions & 2 deletions .github/workflows/track_new_prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
}' -f org=$ORGANIZATION -F number=$PROJECT_NUMBER > project_data.json
echo 'PROJECT_ID='$(jq '.data.organization.projectV2.id' project_data.json) >> $GITHUB_ENV
- name: Add issue to project
env:
GITHUB_TOKEN: ${{ secrets.BOT_CI_ISSUES }}
Expand All @@ -37,4 +37,4 @@ jobs:
id
}
}
}' -f project=$PROJECT_ID -f issue=$node_id --jq '.data.addProjectV2ItemById.item.id')"
}' -f project=$PROJECT_ID -f issue=$node_id --jq '.data.addProjectV2ItemById.item.id')"
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@ core.*
spack-build-*
spack-configure-*
build-linux-*

2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ if(BTYPE_UC STREQUAL DEBUG)
endif()

#exeption stack trace
if(DEFINED ENV{USE_EXCEPTIONSTACKTRACE})
if(DEFINED ENV{USE_EXCEPTIONSTACKTRACE})
if($ENV{USE_EXCEPTIONSTACKTRACE} GREATER 0)
message("!!! Exception StackTrace Activated!!!")
add_definitions(-D EXCEPTIONSTACKTRACE)
Expand Down
1 change: 0 additions & 1 deletion README
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
This is the top level of the artdaq-core repository.

4 changes: 2 additions & 2 deletions artdaq-core/BuildInfo/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ string( STRIP ${rawUTCDate} utcDateTime )

execute_process(COMMAND git describe --tags
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
RESULT_VARIABLE GIT_DESCRIBE_RESULT
OUTPUT_VARIABLE GIT_DESCRIBE_VERSION
RESULT_VARIABLE GIT_DESCRIBE_RESULT
OUTPUT_VARIABLE GIT_DESCRIBE_VERSION
ERROR_QUIET
OUTPUT_STRIP_TRAILING_WHITESPACE)

Expand Down
3 changes: 1 addition & 2 deletions artdaq-core/BuildInfo/GetPackageBuildInfo.cc.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace artdaqcore {
artdaq::PackageBuildInfo GetPackageBuildInfo::getPackageBuildInfo() {

artdaq::PackageBuildInfo pkg;

pkg.setPackageName("artdaq-core");
pkg.setPackageVersion("@version_with_git@");
pkg.setBuildTimestamp("@utcDateTime@");
Expand All @@ -18,4 +18,3 @@ namespace artdaqcore {
}

}

2 changes: 1 addition & 1 deletion artdaq-core/Data/ContainerFragmentLoader.hh
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ inline artdaq::ContainerFragmentLoader::ContainerFragmentLoader(artdaq::Fragment
artdaq_Fragment_.setMetadata<Metadata>(m);

if (artdaq_Fragment_.size() !=
artdaq::detail::RawFragmentHeader::num_words() +
artdaq::detail::RawFragmentHeader::num_words()
words_to_frag_words_(Metadata::size_words))
{
TLOG(TLVL_ERROR, "ContainerFragmentLoader") << "ContainerFragmentLoader: Raw artdaq::Fragment object size suggests it does not consist of its own header + the ContainerFragment::Metadata object";
Expand Down
27 changes: 15 additions & 12 deletions artdaq-core/Data/Fragment.hh
Original file line number Diff line number Diff line change
Expand Up @@ -1080,16 +1080,16 @@ void artdaq::Fragment::updateMetadata(const T& metadata)
inline void
artdaq::Fragment::resize(std::size_t sz)
{
vals_.resize(sz + fragmentHeaderPtr()->metadata_word_count +
headerSizeWords());
vals_.resize(sz + fragmentHeaderPtr()->metadata_word_count
headerSizeWords());
updateFragmentHeaderWC_();
}

inline void
artdaq::Fragment::resize(std::size_t sz, RawDataType v)
{
vals_.resize(sz + fragmentHeaderPtr()->metadata_word_count +
headerSizeWords(),
vals_.resize(sz + fragmentHeaderPtr()->metadata_word_count
headerSizeWords(),
v);
updateFragmentHeaderWC_();
}
Expand All @@ -1105,8 +1105,8 @@ inline void
artdaq::Fragment::resizeBytesWithCushion(std::size_t szbytes, double growthFactor)
{
RawDataType nwords = ceil(szbytes / static_cast<double>(sizeof(RawDataType)));
vals_.resizeWithCushion(nwords + fragmentHeaderPtr()->metadata_word_count +
headerSizeWords(),
vals_.resizeWithCushion(nwords + fragmentHeaderPtr()->metadata_word_count
headerSizeWords(),
growthFactor);
updateFragmentHeaderWC_();
}
Expand Down Expand Up @@ -1138,8 +1138,9 @@ artdaq::Fragment::autoResize()
inline artdaq::Fragment::iterator
artdaq::Fragment::dataBegin()
{
return vals_.begin() + headerSizeWords() +
fragmentHeader().metadata_word_count;
return vals_.begin() + headerSizeWords()
fragmentHeader()
.metadata_word_count;
}

inline artdaq::Fragment::iterator
Expand All @@ -1157,8 +1158,9 @@ artdaq::Fragment::headerBegin()
inline artdaq::Fragment::const_iterator
artdaq::Fragment::dataBegin() const
{
return vals_.begin() + headerSizeWords() +
fragmentHeader().metadata_word_count;
return vals_.begin() + headerSizeWords()
fragmentHeader()
.metadata_word_count;
}

inline artdaq::Fragment::const_iterator
Expand Down Expand Up @@ -1190,8 +1192,9 @@ artdaq::Fragment::empty()
inline void
artdaq::Fragment::reserve(std::size_t cap)
{
vals_.reserve(cap + headerSizeWords() +
fragmentHeader().metadata_word_count);
vals_.reserve(cap + headerSizeWords()
fragmentHeader()
.metadata_word_count);
}

inline void
Expand Down
4 changes: 2 additions & 2 deletions artdaq-core/Utilities/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ cet_make_library(LIBRARY_NAME artdaq-core_Utilities_TraceLock INTERFACE

cet_make_library(
LIBRARY_NAME artdaq-core_Utilities_ExceptionStackTrace
SOURCE
ExceptionStackTrace.cc
SOURCE
ExceptionStackTrace.cc
LIBRARIES
PUBLIC
Threads::Threads
Expand Down
4 changes: 2 additions & 2 deletions doc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function(create_pdf_documentation)

if(LATEX_FOUND AND EPSTOPDF_FOUND)
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/latex/${PROJECT_NAME}_API_Documentation.pdf
COMMAND make > pdflatex.log 2>&1 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/latex
COMMAND make > pdflatex.log 2>&1 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/latex
COMMAND mv refman.pdf ${PROJECT_NAME}_API_Documentation.pdf
DEPENDS ${PROJECT_NAME}_doc
COMMENT "Generating ${PROJECT_NAME} PDF API Documentation file" VERBATIM)
Expand Down Expand Up @@ -43,7 +43,7 @@ if(DOXYGEN_FOUND)
endif()
endforeach()
endif()

string(REPLACE ";" " " DOXYGEN_INCLUDE_PATH "${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}")

configure_file(${DOXYFILE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
Expand Down
Loading

0 comments on commit ce748a1

Please sign in to comment.