Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Made HGOTO_ERROR a do-while loop #3308

Merged
merged 14 commits into from
Aug 2, 2023
Merged

Made HGOTO_ERROR a do-while loop #3308

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f6218eb
Made HGOTO_ERROR a do-while loop
seanm Jul 28, 2023
4928823
Added semi-colon to HGOTO_ERROR() via find-replace pattern, 18 changes
seanm Jul 28, 2023
d4d429a
Added semi-colon to HGOTO_ERROR() via find-replace pattern, 25 changes
seanm Jul 28, 2023
33b2732
Added semi-colon to HGOTO_ERROR() via find-replace pattern, 37 changes
seanm Jul 28, 2023
64bfe49
Added semi-colon to HGOTO_ERROR() via find-replace pattern, 13 changes
seanm Jul 28, 2023
892fa97
Added semi-colon to HGOTO_ERROR() via find-replace pattern, 1182 changes
seanm Jul 28, 2023
983b734
Added semi-colon to HGOTO_ERROR() via find-replace pattern, 12923 cha…
seanm Jul 28, 2023
e0d3ce1
Added semi-colon to HGOTO_ERROR() via find-replace pattern, 77 changes
seanm Jul 28, 2023
420ae22
Added semi-colon to HGOTO_ERROR() by manually fixing the last ones
seanm Jul 28, 2023
e344f7b
Committing clang-format changes
github-actions[bot] Jul 29, 2023
c77fca4
Merge branch 'develop' into extra-semi4
lrknox Aug 2, 2023
555f36f
Committing clang-format changes
github-actions[bot] Aug 2, 2023
f6bd5ad
Update H5Dmpio.c
byrnHDF Aug 2, 2023
4f61e7d
Committing clang-format changes
github-actions[bot] Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions bin/make_err
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,9 +243,9 @@ sub create_init ($) {
foreach $name (keys %major) {
print HEADER " "x(0*$indent),"assert(${name}_g==(-1));\n";
print HEADER " "x(0*$indent),"if((msg = H5E__create_msg(cls, H5E_MAJOR, \"${major{$name}}\"))==NULL)\n";
print HEADER " "x(1*$indent),"HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, \"error message initialization failed\")\n";
print HEADER " "x(1*$indent),"HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, \"error message initialization failed\");\n";
print HEADER " "x(0*$indent),"if((${name}_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)\n";
print HEADER " "x(1*$indent),"HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, \"can't register error message\")\n";
print HEADER " "x(1*$indent),"HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, \"can't register error message\");\n";
}

# Iterate over all the minor error sections
Expand All @@ -259,9 +259,9 @@ sub create_init ($) {
for $name ( @{$section_list{$sect_name}}) {
print HEADER " "x(0*$indent),"assert(${name}_g==(-1));\n";
print HEADER " "x(0*$indent),"if((msg = H5E__create_msg(cls, H5E_MINOR, \"${minor{$name}}\"))==NULL)\n";
print HEADER " "x(1*$indent),"HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, \"error message initialization failed\")\n";
print HEADER " "x(1*$indent),"HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, \"error message initialization failed\");\n";
print HEADER " "x(0*$indent),"if((${name}_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)\n";
print HEADER " "x(1*$indent),"HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, \"can't register error message\")\n";
print HEADER " "x(1*$indent),"HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, \"can't register error message\");\n";
}
}

Expand Down
14 changes: 7 additions & 7 deletions src/H5.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ H5_default_vfd_init(void)
* it has of initializing the default VFD.
*/
if (H5FD_sec2_init() == H5I_INVALID_HID) {
HGOTO_ERROR(H5E_FUNC, H5E_CANTINIT, FAIL, "unable to load default VFD ID")
HGOTO_ERROR(H5E_FUNC, H5E_CANTINIT, FAIL, "unable to load default VFD ID");
}
done:
FUNC_LEAVE_NOAPI(ret_value)
Expand Down Expand Up @@ -267,7 +267,7 @@ H5_init_library(void)
for (i = 0; i < NELMTS(initializer); i++) {
if (initializer[i].func() < 0) {
HGOTO_ERROR(H5E_FUNC, H5E_CANTINIT, FAIL,
"unable to initialize %s interface", initializer[i].descr)
"unable to initialize %s interface", initializer[i].descr);
}
}
/* clang-format on */
Expand Down Expand Up @@ -576,7 +576,7 @@ H5garbage_collect(void)

/* Call the garbage collection routines in the library */
if (H5FL_garbage_coll() < 0)
HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGC, FAIL, "can't garbage collect objects")
HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGC, FAIL, "can't garbage collect objects");

done:
FUNC_LEAVE_API(ret_value)
Expand Down Expand Up @@ -622,7 +622,7 @@ H5set_free_list_limits(int reg_global_lim, int reg_list_lim, int arr_global_lim,
/* Call the free list function to actually set the limits */
if (H5FL_set_free_list_limits(reg_global_lim, reg_list_lim, arr_global_lim, arr_list_lim, blk_global_lim,
blk_list_lim, blk_global_lim, blk_list_lim) < 0)
HGOTO_ERROR(H5E_RESOURCE, H5E_CANTSET, FAIL, "can't set garbage collection limits")
HGOTO_ERROR(H5E_RESOURCE, H5E_CANTSET, FAIL, "can't set garbage collection limits");

done:
FUNC_LEAVE_API(ret_value)
Expand Down Expand Up @@ -658,7 +658,7 @@ H5get_free_list_sizes(size_t *reg_size /*out*/, size_t *arr_size /*out*/, size_t

/* Call the free list function to actually get the sizes */
if (H5FL_get_free_list_sizes(reg_size, arr_size, blk_size, fac_size) < 0)
HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, FAIL, "can't get garbage collection sizes")
HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, FAIL, "can't get garbage collection sizes");

done:
FUNC_LEAVE_API(ret_value)
Expand Down Expand Up @@ -1052,11 +1052,11 @@ H5atclose(H5_atclose_func_t func, void *ctx)

/* Check arguments */
if (NULL == func)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL func pointer")
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL func pointer");

/* Allocate space for the 'atclose' node */
if (NULL == (new_atclose = H5FL_MALLOC(H5_atclose_node_t)))
HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "can't allocate 'atclose' node")
HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "can't allocate 'atclose' node");

/* Set up 'atclose' node */
new_atclose->func = func;
Expand Down
Loading