Skip to content

fix compile warning of shadowing a previous local [-Wshadow] #1083

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

Merged
merged 5 commits into from
Oct 9, 2025
Merged

fix compile warning of shadowing a previous local [-Wshadow] #1083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0962903
darshan-runtime: fix compile warning of shadowing a previous local [-…
wkliao Oct 4, 2025
6e76c4c
unit-tests: fix compile warning of shadowing a previous local [-Wshadow]
wkliao Oct 4, 2025
e89c29e
Define varaible __darshan_disabled only in those files that make use …
wkliao Oct 8, 2025
aa5c7d7
make __darshan_disabled a local variable
wkliao Oct 8, 2025
0558741
resolve patch command on different systems
wkliao Oct 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions darshan-runtime/lib/darshan-core-init-finalize.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ DARSHAN_FORWARD_DECL(PMPI_Init_thread, int, (int *argc, char ***argv, int requir

int DARSHAN_DECL(MPI_Init)(int *argc, char ***argv)
{
int ret;
int ret, __darshan_disabled;

MAP_OR_FAIL(PMPI_Init);
(void)__darshan_disabled;
Expand All @@ -54,7 +54,7 @@ DARSHAN_WRAPPER_MAP(PMPI_Init, int, (int *argc, char ***argv), MPI_Init)

int DARSHAN_DECL(MPI_Init_thread)(int *argc, char ***argv, int required, int *provided)
{
int ret;
int ret, __darshan_disabled;

MAP_OR_FAIL(PMPI_Init_thread);
(void)__darshan_disabled;
Expand All @@ -81,7 +81,7 @@ DARSHAN_WRAPPER_MAP(PMPI_Init_thread, int, (int *argc, char ***argv, int require

int DARSHAN_DECL(MPI_Finalize)(void)
{
int ret;
int ret, __darshan_disabled;

MAP_OR_FAIL(PMPI_Finalize);
(void)__darshan_disabled;
Expand Down Expand Up @@ -119,6 +119,8 @@ __attribute__((destructor)) void serial_finalize(void)
void (*__real__exit)(int status) __attribute__ ((noreturn)) = NULL;
void _exit(int status)
{
int __darshan_disabled;

MAP_OR_FAIL(_exit);
(void)__darshan_disabled;

Expand Down
1 change: 1 addition & 0 deletions darshan-runtime/lib/darshan-core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2752,6 +2752,7 @@ extern int __real_vfprintf(FILE *stream, const char *format, va_list);
void darshan_core_fprintf(
FILE *stream, const char *format, ...)
{
int __darshan_disabled;
va_list ap;

MAP_OR_FAIL(vfprintf);
Expand Down
62 changes: 31 additions & 31 deletions darshan-runtime/lib/darshan-daos.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ int darshan_daos_contopen_comp_cb(void *arg, daos_event_t *ev, int ret)
int DARSHAN_DECL(daos_cont_open)(daos_handle_t poh, const char *cont, unsigned int flags,
daos_handle_t *coh, daos_cont_info_t *info, daos_event_t *ev)
{
int ret;
int ret, __darshan_disabled;

MAP_OR_FAIL(daos_cont_open);

Expand Down Expand Up @@ -523,7 +523,7 @@ int DARSHAN_DECL(daos_cont_open)(daos_handle_t poh, const char *cont, unsigned i

int DARSHAN_DECL(daos_cont_global2local)(daos_handle_t poh, d_iov_t glob, daos_handle_t *coh)
{
int ret;
int ret, __darshan_disabled;

MAP_OR_FAIL(daos_cont_global2local);

Expand All @@ -538,7 +538,7 @@ int DARSHAN_DECL(daos_cont_global2local)(daos_handle_t poh, d_iov_t glob, daos_h

int DARSHAN_DECL(daos_cont_close)(daos_handle_t coh, daos_event_t *ev)
{
int ret;
int ret, __darshan_disabled;
struct daos_poolcont_info *poolcont_info;

MAP_OR_FAIL(daos_cont_close);
Expand All @@ -564,7 +564,7 @@ int DARSHAN_DECL(daos_cont_close)(daos_handle_t coh, daos_event_t *ev)

int DARSHAN_DECL(daos_obj_open)(daos_handle_t coh, daos_obj_id_t oid, unsigned int mode, daos_handle_t *oh, daos_event_t *ev)
{
int ret;
int ret, __darshan_disabled;
double tm1, tm2;

MAP_OR_FAIL(daos_obj_open);
Expand Down Expand Up @@ -618,7 +618,7 @@ int DARSHAN_DECL(daos_obj_fetch)(daos_handle_t oh, daos_handle_t th, uint64_t fl
daos_key_t *dkey, unsigned int nr, daos_iod_t *iods, d_sg_list_t *sgls,
daos_iom_t *ioms, daos_event_t *ev)
{
int ret;
int ret, __darshan_disabled;
double tm1, tm2;
daos_size_t fetch_sz;

Expand Down Expand Up @@ -659,7 +659,7 @@ int DARSHAN_DECL(daos_obj_update)(daos_handle_t oh, daos_handle_t th, uint64_t f
daos_key_t *dkey, unsigned int nr, daos_iod_t *iods, d_sg_list_t *sgls,
daos_event_t *ev)
{
int ret;
int ret, __darshan_disabled;
double tm1, tm2;
daos_size_t update_sz;

Expand Down Expand Up @@ -699,7 +699,7 @@ int DARSHAN_DECL(daos_obj_update)(daos_handle_t oh, daos_handle_t th, uint64_t f
int DARSHAN_DECL(daos_obj_punch)(daos_handle_t oh, daos_handle_t th, uint64_t flags,
daos_event_t *ev)
{
int ret;
int ret, __darshan_disabled;
double tm1, tm2;
struct daos_object_record_ref *rec_ref;

Expand Down Expand Up @@ -744,7 +744,7 @@ int DARSHAN_DECL(daos_obj_punch)(daos_handle_t oh, daos_handle_t th, uint64_t fl
int DARSHAN_DECL(daos_obj_punch_dkeys)(daos_handle_t oh, daos_handle_t th, uint64_t flags,
unsigned int nr, daos_key_t *dkeys, daos_event_t *ev)
{
int ret;
int ret, __darshan_disabled;
double tm1, tm2;
struct daos_object_record_ref *rec_ref;

Expand Down Expand Up @@ -789,7 +789,7 @@ int DARSHAN_DECL(daos_obj_punch_dkeys)(daos_handle_t oh, daos_handle_t th, uint6
int DARSHAN_DECL(daos_obj_punch_akeys)(daos_handle_t oh, daos_handle_t th, uint64_t flags,
daos_key_t *dkey, unsigned int nr, daos_key_t *akeys, daos_event_t *ev)
{
int ret;
int ret, __darshan_disabled;
double tm1, tm2;
struct daos_object_record_ref *rec_ref;

Expand Down Expand Up @@ -835,7 +835,7 @@ int DARSHAN_DECL(daos_obj_punch_akeys)(daos_handle_t oh, daos_handle_t th, uint6
int DARSHAN_DECL(daos_obj_list_dkey)(daos_handle_t oh, daos_handle_t th, uint32_t *nr,
daos_key_desc_t *kds, d_sg_list_t *sgl, daos_anchor_t *anchor, daos_event_t *ev)
{
int ret;
int ret, __darshan_disabled;
double tm1, tm2;
struct daos_object_record_ref *rec_ref;

Expand Down Expand Up @@ -881,7 +881,7 @@ int DARSHAN_DECL(daos_obj_list_akey)(daos_handle_t oh, daos_handle_t th,
daos_key_t *dkey, uint32_t *nr, daos_key_desc_t *kds, d_sg_list_t *sgl,
daos_anchor_t *anchor, daos_event_t *ev)
{
int ret;
int ret, __darshan_disabled;
double tm1, tm2;
struct daos_object_record_ref *rec_ref;

Expand Down Expand Up @@ -928,7 +928,7 @@ int DARSHAN_DECL(daos_obj_list_recx)(daos_handle_t oh, daos_handle_t th,
daos_recx_t *recxs, daos_epoch_range_t *eprs, daos_anchor_t *anchor,
bool incr_order, daos_event_t *ev)
{
int ret;
int ret, __darshan_disabled;
double tm1, tm2;
struct daos_object_record_ref *rec_ref;

Expand Down Expand Up @@ -973,7 +973,7 @@ int DARSHAN_DECL(daos_obj_list_recx)(daos_handle_t oh, daos_handle_t th,

int DARSHAN_DECL(daos_obj_close)(daos_handle_t oh, daos_event_t *ev)
{
int ret;
int ret, __darshan_disabled;
double tm1, tm2;

MAP_OR_FAIL(daos_obj_close);
Expand Down Expand Up @@ -1011,7 +1011,7 @@ int DARSHAN_DECL(daos_array_create)(daos_handle_t coh, daos_obj_id_t oid,
daos_handle_t th, daos_size_t cell_size, daos_size_t chunk_size,
daos_handle_t *oh, daos_event_t *ev)
{
int ret;
int ret, __darshan_disabled;
double tm1, tm2;

MAP_OR_FAIL(daos_array_create);
Expand Down Expand Up @@ -1053,7 +1053,7 @@ int DARSHAN_DECL(daos_array_open)(daos_handle_t coh, daos_obj_id_t oid,
daos_handle_t th, unsigned int mode, daos_size_t *cell_size, daos_size_t *chunk_size,
daos_handle_t *oh, daos_event_t *ev)
{
int ret;
int ret, __darshan_disabled;
double tm1, tm2;

MAP_OR_FAIL(daos_array_open);
Expand Down Expand Up @@ -1093,7 +1093,7 @@ int DARSHAN_DECL(daos_array_open)(daos_handle_t coh, daos_obj_id_t oid,

int DARSHAN_DECL(daos_array_open_with_attr)(daos_handle_t coh, daos_obj_id_t oid, daos_handle_t th, unsigned int mode, daos_size_t cell_size, daos_size_t chunk_size, daos_handle_t *oh, daos_event_t *ev)
{
int ret;
int ret, __darshan_disabled;
double tm1, tm2;

MAP_OR_FAIL(daos_array_open_with_attr);
Expand Down Expand Up @@ -1145,7 +1145,7 @@ int DARSHAN_DECL(daos_array_open_with_attr)(daos_handle_t coh, daos_obj_id_t oid
int DARSHAN_DECL(daos_array_read)(daos_handle_t oh, daos_handle_t th,
daos_array_iod_t *iod, d_sg_list_t *sgl, daos_event_t *ev)
{
int ret;
int ret, __darshan_disabled;
double tm1, tm2;
daos_size_t read_sz;

Expand Down Expand Up @@ -1185,7 +1185,7 @@ int DARSHAN_DECL(daos_array_read)(daos_handle_t oh, daos_handle_t th,
int DARSHAN_DECL(daos_array_write)(daos_handle_t oh, daos_handle_t th,
daos_array_iod_t *iod, d_sg_list_t *sgl, daos_event_t *ev)
{
int ret;
int ret, __darshan_disabled;
double tm1, tm2;
daos_size_t write_sz;

Expand Down Expand Up @@ -1225,7 +1225,7 @@ int DARSHAN_DECL(daos_array_write)(daos_handle_t oh, daos_handle_t th,
int DARSHAN_DECL(daos_array_get_size)(daos_handle_t oh, daos_handle_t th,
daos_size_t *size, daos_event_t *ev)
{
int ret;
int ret, __darshan_disabled;
double tm1, tm2;
struct daos_object_record_ref *rec_ref;

Expand Down Expand Up @@ -1270,7 +1270,7 @@ int DARSHAN_DECL(daos_array_get_size)(daos_handle_t oh, daos_handle_t th,
int DARSHAN_DECL(daos_array_set_size)(daos_handle_t oh, daos_handle_t th,
daos_size_t size, daos_event_t *ev)
{
int ret;
int ret, __darshan_disabled;
double tm1, tm2;
struct daos_object_record_ref *rec_ref;

Expand Down Expand Up @@ -1314,7 +1314,7 @@ int DARSHAN_DECL(daos_array_set_size)(daos_handle_t oh, daos_handle_t th,

int DARSHAN_DECL(daos_array_stat)(daos_handle_t oh, daos_handle_t th, daos_array_stbuf_t *stbuf, daos_event_t *ev)
{
int ret;
int ret, __darshan_disabled;
double tm1, tm2;
struct daos_object_record_ref *rec_ref;

Expand Down Expand Up @@ -1359,7 +1359,7 @@ int DARSHAN_DECL(daos_array_stat)(daos_handle_t oh, daos_handle_t th, daos_array
int DARSHAN_DECL(daos_array_punch)(daos_handle_t oh, daos_handle_t th,
daos_array_iod_t *iod, daos_event_t *ev)
{
int ret;
int ret, __darshan_disabled;
double tm1, tm2;
struct daos_object_record_ref *rec_ref;

Expand Down Expand Up @@ -1404,7 +1404,7 @@ int DARSHAN_DECL(daos_array_punch)(daos_handle_t oh, daos_handle_t th,
int DARSHAN_DECL(daos_array_destroy)(daos_handle_t oh, daos_handle_t th,
daos_event_t *ev)
{
int ret;
int ret, __darshan_disabled;
double tm1, tm2;
struct daos_object_record_ref *rec_ref;

Expand Down Expand Up @@ -1448,7 +1448,7 @@ int DARSHAN_DECL(daos_array_destroy)(daos_handle_t oh, daos_handle_t th,

int DARSHAN_DECL(daos_array_close)(daos_handle_t oh, daos_event_t *ev)
{
int ret;
int ret, __darshan_disabled;
double tm1, tm2;

MAP_OR_FAIL(daos_array_close);
Expand Down Expand Up @@ -1485,7 +1485,7 @@ int DARSHAN_DECL(daos_array_close)(daos_handle_t oh, daos_event_t *ev)
int DARSHAN_DECL(daos_kv_open)(daos_handle_t coh, daos_obj_id_t oid, unsigned int mode,
daos_handle_t *oh, daos_event_t *ev)
{
int ret;
int ret, __darshan_disabled;
double tm1, tm2;

MAP_OR_FAIL(daos_kv_open);
Expand Down Expand Up @@ -1526,7 +1526,7 @@ int DARSHAN_DECL(daos_kv_open)(daos_handle_t coh, daos_obj_id_t oid, unsigned in
int DARSHAN_DECL(daos_kv_get)(daos_handle_t oh, daos_handle_t th, uint64_t flags,
const char *key, daos_size_t *size, void *buf, daos_event_t *ev)
{
int ret;
int ret, __darshan_disabled;
double tm1, tm2;

MAP_OR_FAIL(daos_kv_get);
Expand Down Expand Up @@ -1563,7 +1563,7 @@ int DARSHAN_DECL(daos_kv_get)(daos_handle_t oh, daos_handle_t th, uint64_t flags
int DARSHAN_DECL(daos_kv_put)(daos_handle_t oh, daos_handle_t th, uint64_t flags,
const char *key, daos_size_t size, const void *buf, daos_event_t *ev)
{
int ret;
int ret, __darshan_disabled;
double tm1, tm2;

MAP_OR_FAIL(daos_kv_put);
Expand Down Expand Up @@ -1600,7 +1600,7 @@ int DARSHAN_DECL(daos_kv_put)(daos_handle_t oh, daos_handle_t th, uint64_t flags
int DARSHAN_DECL(daos_kv_remove)(daos_handle_t oh, daos_handle_t th, uint64_t flags,
const char *key, daos_event_t *ev)
{
int ret;
int ret, __darshan_disabled;
double tm1, tm2;
struct daos_object_record_ref *rec_ref;

Expand Down Expand Up @@ -1645,7 +1645,7 @@ int DARSHAN_DECL(daos_kv_remove)(daos_handle_t oh, daos_handle_t th, uint64_t fl
int DARSHAN_DECL(daos_kv_list)(daos_handle_t oh, daos_handle_t th, uint32_t *nr,
daos_key_desc_t *kds, d_sg_list_t *sgl, daos_anchor_t *anchor, daos_event_t *ev)
{
int ret;
int ret, __darshan_disabled;
double tm1, tm2;
struct daos_object_record_ref *rec_ref;

Expand Down Expand Up @@ -1689,7 +1689,7 @@ int DARSHAN_DECL(daos_kv_list)(daos_handle_t oh, daos_handle_t th, uint32_t *nr,

int DARSHAN_DECL(daos_kv_destroy)(daos_handle_t oh, daos_handle_t th, daos_event_t *ev)
{
int ret;
int ret, __darshan_disabled;
double tm1, tm2;
struct daos_object_record_ref *rec_ref;

Expand Down Expand Up @@ -1733,7 +1733,7 @@ int DARSHAN_DECL(daos_kv_destroy)(daos_handle_t oh, daos_handle_t th, daos_event

int DARSHAN_DECL(daos_kv_close)(daos_handle_t oh, daos_event_t *ev)
{
int ret;
int ret, __darshan_disabled;
double tm1, tm2;

MAP_OR_FAIL(daos_kv_close);
Expand Down
Loading
Loading