Skip to content

Commit adaa2c7

Browse files
Committing clang-format changes
1 parent c0a4c0c commit adaa2c7

File tree

2 files changed

+27
-21
lines changed

2 files changed

+27
-21
lines changed

src/H5RT.c

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ H5RT_create(int rank, H5RT_leaf_t *leaves, size_t count)
293293
if (NULL == (rtree = H5FL_CALLOC(H5RT_t)))
294294
HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, NULL, "failed to allocate memory for R-tree");
295295

296-
rtree->rank = rank;
296+
rtree->rank = rank;
297297
rtree->nleaves = count;
298298

299299
/* Take ownership of leaves array */
@@ -447,9 +447,11 @@ H5RT_free(H5RT_t *rtree)
447447
}
448448

449449
/* Deep copy the provided rtree */
450-
H5RT_t* H5RT_copy(const H5RT_t *rtree) {
451-
H5RT_t *ret_value = NULL;
452-
H5RT_t *new_tree = NULL;
450+
H5RT_t *
451+
H5RT_copy(const H5RT_t *rtree)
452+
{
453+
H5RT_t *ret_value = NULL;
454+
H5RT_t *new_tree = NULL;
453455

454456
H5RT_leaf_t *new_leaves = NULL;
455457

@@ -465,20 +467,22 @@ H5RT_t* H5RT_copy(const H5RT_t *rtree) {
465467
if (NULL == (new_leaves = (H5RT_leaf_t *)malloc(rtree->nleaves * sizeof(H5RT_leaf_t))))
466468
HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, NULL, "failed to allocate memory for R-tree leaves");
467469

468-
/* If the user-stored data in the r-tree is a pointer, then the new r-tree will have pointers to the same shared data */
470+
/* If the user-stored data in the r-tree is a pointer, then the new r-tree will have pointers to the same
471+
* shared data */
469472
memcpy(new_leaves, rtree->leaves, rtree->nleaves * sizeof(H5RT_leaf_t));
470473

471474
if ((new_tree = H5RT_create(rtree->rank, new_leaves, rtree->nleaves)) == NULL)
472475
HGOTO_ERROR(H5E_INTERNAL, H5E_CANTINIT, NULL, "failed to create new r-tree");
473476

474477
ret_value = new_tree;
475478

476-
done:
479+
done:
477480
if (!ret_value) {
478481
if (new_tree) {
479482
if (H5RT_free(new_tree) < 0)
480483
HDONE_ERROR(H5E_INTERNAL, H5E_CANTFREE, NULL, "unable to free partially copied r-tree");
481-
} else if (new_leaves) {
484+
}
485+
else if (new_leaves) {
482486
free(new_leaves);
483487
}
484488
}

test/rtree.c

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,17 @@ static H5RT_leaf_t **manual_search(H5RT_leaf_t *leaves, size_t leaf_count, int r
4747
static size_t get_num_leaves(H5RT_leaf_t *results_arr);
4848

4949
/* Helper function to compare r-tree search results to linear search */
50-
static herr_t verify_rtree_search(H5RT_leaf_t *results_head, H5RT_leaf_t *leaves, size_t leaf_count, hsize_t min[],
51-
hsize_t max[], int rank);
50+
static herr_t verify_rtree_search(H5RT_leaf_t *results_head, H5RT_leaf_t *leaves, size_t leaf_count,
51+
hsize_t min[], hsize_t max[], int rank);
5252

53-
54-
static herr_t verify_rtree_search(H5RT_leaf_t *results_head, H5RT_leaf_t *leaves, size_t leaf_count, hsize_t min[],
55-
hsize_t max[], int rank) {
53+
static herr_t
54+
verify_rtree_search(H5RT_leaf_t *results_head, H5RT_leaf_t *leaves, size_t leaf_count, hsize_t min[],
55+
hsize_t max[], int rank)
56+
{
5657
H5RT_leaf_t **manual_results = NULL;
5758
size_t num_manual_results = 0;
58-
size_t num_rtree_results = 0;
59-
herr_t ret_value = SUCCEED;
59+
size_t num_rtree_results = 0;
60+
herr_t ret_value = SUCCEED;
6061

6162
/* Perform manual search for comparison */
6263
manual_results = manual_search(leaves, leaf_count, rank, min, max, &num_manual_results);
@@ -325,11 +326,12 @@ test_rtree_search(void)
325326
*-------------------------------------------------------------------------
326327
*/
327328
static herr_t
328-
test_rtree_copy(void) {
329-
H5RT_t *tree = NULL;
330-
H5RT_t *tree_copy = NULL;
329+
test_rtree_copy(void)
330+
{
331+
H5RT_t *tree = NULL;
332+
H5RT_t *tree_copy = NULL;
331333
size_t leaf_count = 0;
332-
H5RT_leaf_t *leaves = NULL;
334+
H5RT_leaf_t *leaves = NULL;
333335

334336
H5RT_leaf_t *results_head = NULL;
335337
hsize_t min[H5S_MAX_RANK];
@@ -355,7 +357,7 @@ test_rtree_copy(void) {
355357
FAIL_STACK_ERROR;
356358

357359
/* Ownership is transferred */
358-
leaves = NULL;
360+
leaves = NULL;
359361

360362
/* Deep copy the tree */
361363
if ((tree_copy = H5RT_copy(tree)) == NULL)
@@ -388,7 +390,7 @@ test_rtree_copy(void) {
388390

389391
PASSED();
390392
return SUCCEED;
391-
393+
392394
error:
393395
if (leaves)
394396
free(leaves);
@@ -425,7 +427,7 @@ main(void)
425427
nerrors += test_rtree_create() < 0 ? 1 : 0;
426428
nerrors += test_rtree_search() < 0 ? 1 : 0;
427429
nerrors += test_rtree_copy() < 0 ? 1 : 0;
428-
430+
429431
if (nerrors)
430432
goto error;
431433

0 commit comments

Comments
 (0)