Skip to content

Commit

Permalink
iox-eclipse-iceoryx#1054 source code formatting corrected
Browse files Browse the repository at this point in the history
Signed-off-by: Christian Eltzschig <me@elchris.org>
  • Loading branch information
elfenpiff committed Feb 4, 2022
1 parent 4c5dba4 commit 9653e72
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ jobs:
- uses: actions/checkout@v2
- name: Unix (FreeBSD) test
id: Test
uses: vmactions/freebsd-vm@0.1.5
uses: vmactions/freebsd-vm@v0.1.6
with:
usesh: true
prepare: pkg install -y cmake git ncurses bash wget bison
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,7 @@ class MessageQueue : public DesignPattern::Creation<MessageQueue, IpcChannelErro
const size_t maxMsgSize = MAX_MESSAGE_SIZE,
const uint64_t maxMsgNumber = 10U) noexcept;

cxx::expected<mqd_t, IpcChannelError> open(const IpcChannelName_t& name,
const IpcChannelSide channelSide) noexcept;
cxx::expected<mqd_t, IpcChannelError> open(const IpcChannelName_t& name, const IpcChannelSide channelSide) noexcept;

cxx::expected<IpcChannelError> close() noexcept;
cxx::expected<IpcChannelError> unlink() noexcept;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,42 +59,42 @@ inline int acl_free(void*)
return 0;
}

inline int acl_create_entry(acl_t*, acl_entry_t* )
inline int acl_create_entry(acl_t*, acl_entry_t*)
{
return 0;
}

inline int acl_set_tag_type(acl_entry_t , acl_tag_t )
inline int acl_set_tag_type(acl_entry_t, acl_tag_t)
{
return 0;
}

inline int acl_set_qualifier(acl_entry_t , const void* )
inline int acl_set_qualifier(acl_entry_t, const void*)
{
return 0;
}

inline int acl_get_permset(acl_entry_t , acl_permset_t* )
inline int acl_get_permset(acl_entry_t, acl_permset_t*)
{
return 0;
}

inline int acl_add_perm(acl_permset_t , acl_perm_t )
inline int acl_add_perm(acl_permset_t, acl_perm_t)
{
return 0;
}

inline char* acl_to_text(acl_t , ssize_t* )
inline char* acl_to_text(acl_t, ssize_t*)
{
return nullptr;
}

inline acl_t acl_from_text(const char* )
inline acl_t acl_from_text(const char*)
{
return acl_t();
}

inline acl_t acl_get_fd(int )
inline acl_t acl_get_fd(int)
{
return acl_t();
}
Expand Down
2 changes: 1 addition & 1 deletion iceoryx_hoofs/source/posix_wrapper/message_queue.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ cxx::expected<std::string, IpcChannelError> MessageQueue::receive() const noexce
}

cxx::expected<mqd_t, IpcChannelError> MessageQueue::open(const IpcChannelName_t& name,
const IpcChannelSide channelSide) noexcept
const IpcChannelSide channelSide) noexcept
{
IpcChannelName_t l_name;
if (sanitizeIpcChannelName(name).and_then([&](IpcChannelName_t& name) { l_name = std::move(name); }).has_error())
Expand Down
2 changes: 1 addition & 1 deletion iceoryx_hoofs/test/moduletests/test_ipc_channel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ TYPED_TEST(IpcChannel_test, wildCreate)
ASSERT_THAT(result.has_error(), Eq(true));
}

#if !( defined(__APPLE__) || defined(unix) || defined(__unix) || defined(__unix__) )
#if !(defined(__APPLE__) || defined(unix) || defined(__unix) || defined(__unix__))
TYPED_TEST(IpcChannel_test, TimedSendWorks)
{
::testing::Test::RecordProperty("TEST_ID", "12fe0ee5-37f8-4c34-ba44-ed50872a5fd9");
Expand Down

0 comments on commit 9653e72

Please sign in to comment.