Fix static analysis errors
Fix checkpatch and cppcheck findings in newly added FWU files.
Change-Id: Ie6a877e65b758399647ceda345ae22081d911f8e
Signed-off-by: Gyorgy Szing <Gyorgy.Szing@arm.com>
diff --git a/components/media/disk/gpt_iterator/gpt_iterator.c b/components/media/disk/gpt_iterator/gpt_iterator.c
index 94a91af..1c5ba0f 100644
--- a/components/media/disk/gpt_iterator/gpt_iterator.c
+++ b/components/media/disk/gpt_iterator/gpt_iterator.c
@@ -5,17 +5,16 @@
*
*/
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
-#include <stddef.h>
-#include <media/volume/volume.h>
#include "gpt_iterator.h"
+#include <assert.h>
+#include <errno.h>
+#include <stddef.h>
+#include <string.h>
-int gpt_iterator_init(
- struct gpt_iterator *iter,
- struct volume *volume)
+#include "media/volume/volume.h"
+
+int gpt_iterator_init(struct gpt_iterator *iter, struct volume *volume)
{
assert(iter);
assert(volume);
@@ -62,13 +61,11 @@
*/
size_t min_required_entry_size =
offsetof(gpt_entry_t, name) + EFI_NAMELEN * sizeof(unsigned short);
- size_t max_expected_entry_size =
- sizeof(gpt_entry_t) * 2;
+ size_t max_expected_entry_size = sizeof(gpt_entry_t) * 2;
if ((memcmp(GPT_SIGNATURE, gpt_header.signature, sizeof(gpt_header.signature)) != 0) ||
- (gpt_header.part_size < min_required_entry_size) ||
- (gpt_header.part_size > max_expected_entry_size) ||
- (iter->num_entries > 128))
+ gpt_header.part_size < min_required_entry_size ||
+ gpt_header.part_size > max_expected_entry_size || iter->num_entries > 128)
return -EIO;
iter->num_entries = gpt_header.list_num;
@@ -77,8 +74,7 @@
return 0;
}
-void gpt_iterator_deinit(
- struct gpt_iterator *iter)
+void gpt_iterator_deinit(struct gpt_iterator *iter)
{
assert(iter);
@@ -86,33 +82,28 @@
volume_close(iter->volume);
}
-void gpt_iterator_first(
- struct gpt_iterator *iter)
+void gpt_iterator_first(struct gpt_iterator *iter)
{
assert(iter);
iter->cur_index = 0;
}
-void gpt_iterator_next(
- struct gpt_iterator *iter)
+void gpt_iterator_next(struct gpt_iterator *iter)
{
assert(iter);
++iter->cur_index;
}
-bool gpt_iterator_is_done(
- const struct gpt_iterator *iter)
+bool gpt_iterator_is_done(const struct gpt_iterator *iter)
{
assert(iter);
return (iter->cur_index >= iter->num_entries);
}
-int gpt_iterator_current(
- struct gpt_iterator *iter,
- gpt_entry_t *entry)
+int gpt_iterator_current(struct gpt_iterator *iter, gpt_entry_t *entry)
{
assert(iter);
assert(iter->volume);
diff --git a/components/media/disk/gpt_iterator/gpt_iterator.h b/components/media/disk/gpt_iterator/gpt_iterator.h
index bb0ebc8..e288aaa 100644
--- a/components/media/disk/gpt_iterator/gpt_iterator.h
+++ b/components/media/disk/gpt_iterator/gpt_iterator.h
@@ -30,7 +30,6 @@
* Holds state while iterating over partition table entries
*/
struct gpt_iterator {
-
unsigned int num_entries;
unsigned int entry_size;
unsigned int cur_index;
@@ -52,41 +51,35 @@
*
* \return IO Status code (0 for success)
*/
-int gpt_iterator_init(
- struct gpt_iterator *iter,
- struct volume *volume);
+int gpt_iterator_init(struct gpt_iterator *iter, struct volume *volume);
/**
* \brief De-initialize the iterator
*
* \param[in] iter The subject gpt_iterator
*/
-void gpt_iterator_deinit(
- struct gpt_iterator *iter);
+void gpt_iterator_deinit(struct gpt_iterator *iter);
/**
* \brief Set iterator position to first partition entry
*
* \param[in] iter The subject gpt_iterator
*/
-void gpt_iterator_first(
- struct gpt_iterator *iter);
+void gpt_iterator_first(struct gpt_iterator *iter);
/**
* \brief Iterate to the next entry
*
* \param[in] iter The subject gpt_iterator
*/
-void gpt_iterator_next(
- struct gpt_iterator *iter);
+void gpt_iterator_next(struct gpt_iterator *iter);
/**
* \brief Returns true if iterated beyond final entry
*
* \param[in] iter The subject gpt_iterator
*/
-bool gpt_iterator_is_done(
- const struct gpt_iterator *iter);
+bool gpt_iterator_is_done(const struct gpt_iterator *iter);
/**
* \brief Returns the partition entry at the current iterator position
@@ -96,10 +89,7 @@
*
* \return IO Status code (0 for success)
*/
-int gpt_iterator_current(
- struct gpt_iterator *iter,
- gpt_entry_t *entry);
-
+int gpt_iterator_current(struct gpt_iterator *iter, gpt_entry_t *entry);
#ifdef __cplusplus
}
diff --git a/components/media/disk/test/gpt_iterator_tests.cpp b/components/media/disk/test/gpt_iterator_tests.cpp
index 3e16dff..b7d4d26 100644
--- a/components/media/disk/test/gpt_iterator_tests.cpp
+++ b/components/media/disk/test/gpt_iterator_tests.cpp
@@ -4,16 +4,17 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#include <string>
-#include <cstring>
-#include <common/uuid/uuid.h>
-#include <service/block_storage/factory/ref_ram_gpt/block_store_factory.h>
-#include <service/block_storage/config/ref/ref_partition_configurator.h>
-#include <media/volume/index/volume_index.h>
-#include <media/volume/block_volume/block_volume.h>
-#include <media/disk/gpt_iterator/gpt_iterator.h>
-#include <media/disk/guid.h>
#include <CppUTest/TestHarness.h>
+#include <cstring>
+#include <string>
+
+#include "common/uuid/uuid.h"
+#include "media/disk/gpt_iterator/gpt_iterator.h"
+#include "media/disk/guid.h"
+#include "media/volume/block_volume/block_volume.h"
+#include "media/volume/index/volume_index.h"
+#include "service/block_storage/config/ref/ref_partition_configurator.h"
+#include "service/block_storage/factory/ref_ram_gpt/block_store_factory.h"
TEST_GROUP(GptIteratorTests)
{
@@ -27,13 +28,12 @@
/* Use partition exposed for accessing the disk header */
uuid_guid_octets_from_canonical(&m_partition_guid,
- DISK_GUID_UNIQUE_PARTITION_DISK_HEADER);
+ DISK_GUID_UNIQUE_PARTITION_DISK_HEADER);
m_volume = NULL;
- int status = block_volume_init(&m_block_volume,
- m_block_store, &m_partition_guid,
- &m_volume);
+ int status = block_volume_init(&m_block_volume, m_block_store, &m_partition_guid,
+ &m_volume);
LONGS_EQUAL(0, status);
CHECK_TRUE(m_volume);
@@ -131,7 +131,6 @@
gpt_iterator_next(&m_iter);
while (!gpt_iterator_is_done(&m_iter)) {
-
status = gpt_iterator_current(&m_iter, &gpt_entry);
LONGS_EQUAL(0, status);
CHECK_FALSE(check_in_use(&gpt_entry));
diff --git a/components/media/volume/block_volume/test/block_volume_tests.cpp b/components/media/volume/block_volume/test/block_volume_tests.cpp
index 89d1726..eda442c 100644
--- a/components/media/volume/block_volume/test/block_volume_tests.cpp
+++ b/components/media/volume/block_volume/test/block_volume_tests.cpp
@@ -4,32 +4,31 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-
-#include <string>
-#include <cstring>
-#include <common/uuid/uuid.h>
-#include <service/block_storage/block_store/device/ram/ram_block_store.h>
-#include <media/volume/block_volume/block_volume.h>
-#include <media/volume/index/volume_index.h>
#include <CppUTest/TestHarness.h>
+#include <cstring>
+#include <string>
+
+#include "common/uuid/uuid.h"
+#include "media/volume/block_volume/block_volume.h"
+#include "media/volume/index/volume_index.h"
+#include "service/block_storage/block_store/device/ram/ram_block_store.h"
TEST_GROUP(BlockVolumeTests)
{
void setup()
{
uuid_guid_octets_from_canonical(&m_partition_guid,
- "6152f22b-8128-4c1f-981f-3bd279519907");
+ "6152f22b-8128-4c1f-981f-3bd279519907");
- m_block_store = ram_block_store_init(&m_ram_block_store,
- &m_partition_guid, NUM_BLOCKS, BLOCK_SIZE);
+ m_block_store = ram_block_store_init(&m_ram_block_store, &m_partition_guid,
+ NUM_BLOCKS, BLOCK_SIZE);
CHECK_TRUE(m_block_store);
m_volume = NULL;
- int result = block_volume_init(&m_block_volume,
- m_block_store, &m_partition_guid,
- &m_volume);
+ int result = block_volume_init(&m_block_volume, m_block_store, &m_partition_guid,
+ &m_volume);
LONGS_EQUAL(0, result);
CHECK_TRUE(m_volume);
@@ -56,7 +55,6 @@
struct volume *m_volume;
};
-
TEST(BlockVolumeTests, openClose)
{
/* Check the open flow used by tf-a components */
@@ -88,12 +86,10 @@
/* Write message a few times. Expect file pointer to advance on each write */
for (size_t i = 0; i < num_iterations; ++i) {
-
size_t len_written = 0;
- result = volume_write(m_volume,
- (const uintptr_t)message.c_str(), message.size(),
- &len_written);
+ result = volume_write(m_volume, (const uintptr_t)message.c_str(), message.size(),
+ &len_written);
LONGS_EQUAL(0, result);
UNSIGNED_LONGS_EQUAL(message.size(), len_written);
@@ -106,14 +102,12 @@
uint8_t read_buf[message.size()];
for (size_t i = 0; i < num_iterations; ++i) {
-
size_t len_read = 0;
memset(read_buf, 0, sizeof(read_buf));
- result = volume_read(m_volume,
- (const uintptr_t)read_buf, sizeof(read_buf),
- &len_read);
+ result = volume_read(m_volume, (const uintptr_t)read_buf, sizeof(read_buf),
+ &len_read);
LONGS_EQUAL(0, result);
UNSIGNED_LONGS_EQUAL(message.size(), len_read);
@@ -206,7 +200,6 @@
CHECK_TRUE(volume);
for (size_t i = 0; i < 3; ++i) {
-
size_t len = 0;
/* Each iteration represents an update installation where arbitrary sized
@@ -231,7 +224,7 @@
LONGS_EQUAL(0, result);
UNSIGNED_LONGS_EQUAL(chunk2.size(), len);
- std::string chunk3("The third chunck is soooooooooooooooooooooooooooo much longer");
+ std::string chunk3("The third chunk is soooooooooooooooooooooooooooo much longer");
result = volume_write(volume, (const uintptr_t)chunk3.c_str(), chunk3.size(), &len);
LONGS_EQUAL(0, result);
UNSIGNED_LONGS_EQUAL(chunk3.size(), len);
@@ -273,12 +266,10 @@
CHECK_TRUE(space_remaining > 0);
for (size_t i = 0; i < num_whole_messages; ++i) {
-
size_t len_written = 0;
- result = volume_write(m_volume,
- (const uintptr_t)message.c_str(), message.size(),
- &len_written);
+ result = volume_write(m_volume, (const uintptr_t)message.c_str(), message.size(),
+ &len_written);
LONGS_EQUAL(0, result);
UNSIGNED_LONGS_EQUAL(message.size(), len_written);
@@ -287,9 +278,8 @@
/* Writing the message one more time should exceed the volume size */
size_t len_written = 0;
- result = volume_write(m_volume,
- (const uintptr_t)message.c_str(), message.size(),
- &len_written);
+ result = volume_write(m_volume, (const uintptr_t)message.c_str(), message.size(),
+ &len_written);
LONGS_EQUAL(0, result);
@@ -303,14 +293,12 @@
uint8_t read_buf[message.size()];
for (size_t i = 0; i < num_whole_messages; ++i) {
-
size_t len_read = 0;
memset(read_buf, 0, sizeof(read_buf));
- result = volume_read(m_volume,
- (const uintptr_t)read_buf, sizeof(read_buf),
- &len_read);
+ result = volume_read(m_volume, (const uintptr_t)read_buf, sizeof(read_buf),
+ &len_read);
LONGS_EQUAL(0, result);
UNSIGNED_LONGS_EQUAL(message.size(), len_read);
@@ -322,9 +310,7 @@
memset(read_buf, 0, sizeof(read_buf));
- result = volume_read(m_volume,
- (const uintptr_t)read_buf, sizeof(read_buf),
- &len_read);
+ result = volume_read(m_volume, (const uintptr_t)read_buf, sizeof(read_buf), &len_read);
LONGS_EQUAL(0, result);
UNSIGNED_LONGS_EQUAL(space_remaining, len_read);
diff --git a/components/media/volume/factory/single_flash/volume_factory.c b/components/media/volume/factory/single_flash/volume_factory.c
index 0f302cc..ab7bfef 100644
--- a/components/media/volume/factory/single_flash/volume_factory.c
+++ b/components/media/volume/factory/single_flash/volume_factory.c
@@ -4,16 +4,18 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
+#include "media/volume/factory/volume_factory.h"
+
#include <assert.h>
#include <errno.h>
#include <stdlib.h>
#include <string.h>
-#include <trace.h>
-#include <service/block_storage/factory/block_store_factory.h>
-#include <service/block_storage/block_store/block_store.h>
-#include <media/volume/factory/volume_factory.h>
-#include <media/volume/block_volume/block_volume.h>
-#include <media/disk/guid.h>
+
+#include "media/disk/guid.h"
+#include "media/volume/block_volume/block_volume.h"
+#include "service/block_storage/block_store/block_store.h"
+#include "service/block_storage/factory/block_store_factory.h"
+#include "trace.h"
/**
* A volume factory for single flash deployments where underlying block-level
@@ -23,10 +25,8 @@
*/
static struct block_store *single_block_store;
-int volume_factory_init(
- struct uuid_octets *device_uuids,
- size_t device_uuids_size,
- size_t *num_device_uuids)
+int volume_factory_init(struct uuid_octets *device_uuids, size_t device_uuids_size,
+ size_t *num_device_uuids)
{
assert(device_uuids || !device_uuids_size);
assert(num_device_uuids);
@@ -35,22 +35,19 @@
single_block_store = block_store_factory_create();
if (!single_block_store) {
-
EMSG("Failed to construct block_store");
return -EIO;
}
if (device_uuids_size > 0) {
-
struct storage_partition_info device_info;
struct uuid_octets uuid;
/* Query for GPT partition to get info about the parent device */
- uuid_guid_octets_from_canonical(&uuid,
- DISK_GUID_UNIQUE_PARTITION_DISK_HEADER);
+ uuid_guid_octets_from_canonical(&uuid, DISK_GUID_UNIQUE_PARTITION_DISK_HEADER);
- psa_status_t psa_status = block_store_get_partition_info(single_block_store,
- &uuid, &device_info);
+ psa_status_t psa_status =
+ block_store_get_partition_info(single_block_store, &uuid, &device_info);
if (psa_status == PSA_SUCCESS)
device_uuids[0] = device_info.parent_guid;
@@ -69,9 +66,8 @@
single_block_store = NULL;
}
-struct volume *volume_factory_create_volume(
- const struct uuid_octets *partition_uuid,
- const struct uuid_octets *device_uuid)
+struct volume *volume_factory_create_volume(const struct uuid_octets *partition_uuid,
+ const struct uuid_octets *device_uuid)
{
struct volume *product = NULL;
@@ -84,27 +80,22 @@
(struct block_volume *)malloc(sizeof(struct block_volume));
if (block_volume) {
-
- int status = block_volume_init(block_volume,
- single_block_store, partition_uuid,
- &product);
+ int status = block_volume_init(block_volume, single_block_store, partition_uuid,
+ &product);
if (status) {
-
EMSG("Failed to init block volume: %d", status);
product = NULL;
free(block_volume);
}
} else {
-
EMSG("Failed to alloc block volume");
}
return product;
}
-void volume_factory_destroy_volume(
- struct volume *volume)
+void volume_factory_destroy_volume(struct volume *volume)
{
if (volume && volume->io_spec)
free((void *)volume->io_spec);
diff --git a/components/media/volume/factory/volume_factory.h b/components/media/volume/factory/volume_factory.h
index f7e9115..04d70ab 100644
--- a/components/media/volume/factory/volume_factory.h
+++ b/components/media/volume/factory/volume_factory.h
@@ -8,8 +8,9 @@
#define MEDIA_VOLUME_FACTORY_H
#include <stddef.h>
-#include <common/uuid/uuid.h>
-#include <media/volume/volume.h>
+
+#include "common/uuid/uuid.h"
+#include "media/volume/volume.h"
#ifdef __cplusplus
extern "C" {
@@ -30,10 +31,8 @@
*
* \return Status (0 on success)
*/
-int volume_factory_init(
- struct uuid_octets *device_uuids,
- size_t device_uuids_size,
- size_t *num_device_uuids);
+int volume_factory_init(struct uuid_octets *device_uuids, size_t device_uuids_size,
+ size_t *num_device_uuids);
/**
* \brief De-initialises the volume_factory
@@ -52,17 +51,15 @@
*
* \return Pointer to volume or NULL
*/
-struct volume *volume_factory_create_volume(
- const struct uuid_octets *partition_uuid,
- const struct uuid_octets *device_uuid);
+struct volume *volume_factory_create_volume(const struct uuid_octets *partition_uuid,
+ const struct uuid_octets *device_uuid);
/**
* \brief Destroys a volume object
*
* \param[in] volume Volume to destroy
*/
-void volume_factory_destroy_volume(
- struct volume *volume);
+void volume_factory_destroy_volume(struct volume *volume);
#ifdef __cplusplus
}
diff --git a/components/media/volume/volume.c b/components/media/volume/volume.c
index b043376..aa17c26 100644
--- a/components/media/volume/volume.c
+++ b/components/media/volume/volume.c
@@ -4,14 +4,13 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#include <errno.h>
-#include <stddef.h>
#include "volume.h"
-void volume_init(
- struct volume *this_volume,
- const io_dev_funcs_t *io_dev_funcs,
- uintptr_t concrete_volume)
+#include <errno.h>
+#include <stddef.h>
+
+void volume_init(struct volume *this_volume, const io_dev_funcs_t *io_dev_funcs,
+ uintptr_t concrete_volume)
{
this_volume->dev_info.funcs = io_dev_funcs;
this_volume->dev_info.info = concrete_volume;
@@ -26,70 +25,48 @@
this_volume->get_storage_ids = NULL;
}
-int volume_open(
- struct volume *this_volume)
+int volume_open(struct volume *this_volume)
{
- return io_open(
- this_volume->dev_handle,
- this_volume->io_spec,
- &this_volume->io_handle);
+ return io_open(this_volume->dev_handle, this_volume->io_spec, &this_volume->io_handle);
}
-int volume_close(
- struct volume *this_volume)
+int volume_close(struct volume *this_volume)
{
return io_close(this_volume->io_handle);
}
-int volume_seek(
- struct volume *this_volume,
- io_seek_mode_t mode,
- signed long long offset)
+int volume_seek(struct volume *this_volume, io_seek_mode_t mode, signed long long offset)
{
return io_seek(this_volume->io_handle, mode, offset);
}
-int volume_size(
- struct volume *this_volume,
- size_t *size)
+int volume_size(struct volume *this_volume, size_t *size)
{
return io_size(this_volume->io_handle, size);
}
-int volume_read(
- struct volume *this_volume,
- uintptr_t buffer,
- size_t length,
- size_t *length_read)
+int volume_read(struct volume *this_volume, uintptr_t buffer, size_t length, size_t *length_read)
{
return io_read(this_volume->io_handle, buffer, length, length_read);
}
-int volume_write(
- struct volume *this_volume,
- const uintptr_t buffer,
- size_t length,
- size_t *length_written)
+int volume_write(struct volume *this_volume, const uintptr_t buffer, size_t length,
+ size_t *length_written)
{
return io_write(this_volume->io_handle, buffer, length, length_written);
}
-int volume_erase(
- struct volume *this_volume)
+int volume_erase(struct volume *this_volume)
{
- return (this_volume->erase) ?
- this_volume->erase(this_volume->dev_info.info) : 0;
+ return (this_volume->erase) ? this_volume->erase(this_volume->dev_info.info) : 0;
}
-int volume_get_storage_ids(
- struct volume *this_volume,
- struct uuid_octets *partition_guid,
- struct uuid_octets *parent_guid)
+int volume_get_storage_ids(struct volume *this_volume, struct uuid_octets *partition_guid,
+ struct uuid_octets *parent_guid)
{
if (this_volume->get_storage_ids)
- return this_volume->get_storage_ids(
- this_volume->dev_info.info,
- partition_guid, parent_guid);
+ return this_volume->get_storage_ids(this_volume->dev_info.info, partition_guid,
+ parent_guid);
return -EIO;
}
diff --git a/components/media/volume/volume.h b/components/media/volume/volume.h
index 3395e5b..1e335eb 100644
--- a/components/media/volume/volume.h
+++ b/components/media/volume/volume.h
@@ -8,7 +8,8 @@
#define MEDIA_VOLUME_H
#include <stddef.h>
-#include <common/uuid/uuid.h>
+
+#include "common/uuid/uuid.h"
#ifdef __cplusplus
extern "C" {
@@ -31,7 +32,6 @@
* erase function pointer may be set to NULL;
*/
struct volume {
-
/* IO device handle for volume access */
uintptr_t dev_handle;
@@ -48,9 +48,8 @@
int (*erase)(uintptr_t context);
/* Optional function to get storage IDs for the volume */
- int (*get_storage_ids)(uintptr_t context,
- struct uuid_octets *partition_guid,
- struct uuid_octets *parent_guid);
+ int (*get_storage_ids)(uintptr_t context, struct uuid_octets *partition_guid,
+ struct uuid_octets *parent_guid);
};
/**
@@ -62,10 +61,8 @@
* @param[in] io_dev_funcs io_dev function struct for concrete handlers
* @param[in] concrete_volume Pointer to the concrete volume instance
*/
-void volume_init(
- struct volume *this_volume,
- const io_dev_funcs_t *io_dev_funcs,
- uintptr_t concrete_volume);
+void volume_init(struct volume *this_volume, const io_dev_funcs_t *io_dev_funcs,
+ uintptr_t concrete_volume);
/**
* @brief Open the volume for IO operations
@@ -74,8 +71,7 @@
*
* @return 0 on success
*/
-int volume_open(
- struct volume *this_volume);
+int volume_open(struct volume *this_volume);
/**
* @brief Close the volume when done with IO operations
@@ -84,8 +80,7 @@
*
* @return 0 on success
*/
-int volume_close(
- struct volume *this_volume);
+int volume_close(struct volume *this_volume);
/**
* @brief Seek to the specified position
@@ -96,10 +91,7 @@
*
* @return 0 on success
*/
-int volume_seek(
- struct volume *this_volume,
- io_seek_mode_t mode,
- signed long long offset);
+int volume_seek(struct volume *this_volume, io_seek_mode_t mode, signed long long offset);
/**
* @brief Get the size of the volume
@@ -109,9 +101,7 @@
*
* @return 0 on success
*/
-int volume_size(
- struct volume *this_volume,
- size_t *size);
+int volume_size(struct volume *this_volume, size_t *size);
/**
* @brief Read from the volume
@@ -125,11 +115,7 @@
*
* @return 0 on success
*/
-int volume_read(
- struct volume *this_volume,
- uintptr_t buffer,
- size_t length,
- size_t *length_read);
+int volume_read(struct volume *this_volume, uintptr_t buffer, size_t length, size_t *length_read);
/**
* @brief Write the volume
@@ -143,11 +129,8 @@
*
* @return 0 on success
*/
-int volume_write(
- struct volume *this_volume,
- const uintptr_t buffer,
- size_t length,
- size_t *length_written);
+int volume_write(struct volume *this_volume, const uintptr_t buffer, size_t length,
+ size_t *length_written);
/**
* @brief Erase the entire volume
@@ -156,8 +139,7 @@
*
* @return 0 on success
*/
-int volume_erase(
- struct volume *this_volume);
+int volume_erase(struct volume *this_volume);
/**
* @brief Get GUIDs to identify the storage associated with the volume
@@ -170,10 +152,8 @@
*
* @return 0 on success, ENOSYS if not supported
*/
-int volume_get_storage_ids(
- struct volume *this_volume,
- struct uuid_octets *partition_guid,
- struct uuid_octets *parent_guid);
+int volume_get_storage_ids(struct volume *this_volume, struct uuid_octets *partition_guid,
+ struct uuid_octets *parent_guid);
#ifdef __cplusplus
}