Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Corryvreckan
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Naomi Davis
Corryvreckan
Commits
299940ef
Commit
299940ef
authored
2 years ago
by
Simon Spannagel
Browse files
Options
Downloads
Patches
Plain Diff
Some more nullptr found
parent
e15fc5bb
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/modules/EventLoaderALiBaVa/ALiBaVa/HDFRoot.cpp
+4
-4
4 additions, 4 deletions
src/modules/EventLoaderALiBaVa/ALiBaVa/HDFRoot.cpp
src/modules/EventLoaderALiBaVa/ALiBaVa/utils.h
+1
-1
1 addition, 1 deletion
src/modules/EventLoaderALiBaVa/ALiBaVa/utils.h
with
5 additions
and
5 deletions
src/modules/EventLoaderALiBaVa/ALiBaVa/HDFRoot.cpp
+
4
−
4
View file @
299940ef
...
...
@@ -86,7 +86,7 @@ herr_t read_file_data(hid_t data_set, unsigned int offset, int ncols, void* dest
*/
int
rank
=
(
ncols
>
1
?
2
:
1
);
hsize_t
mdims
[
2
]
=
{
1
,
static_cast
<
hsize_t
>
(
ncols
)};
hid_t
m_sid
=
H5Screate_simple
(
rank
,
mdims
,
NULL
);
hid_t
m_sid
=
H5Screate_simple
(
rank
,
mdims
,
nullptr
);
/*
* ...and select the hyperslab in the file dataset
...
...
@@ -94,7 +94,7 @@ herr_t read_file_data(hid_t data_set, unsigned int offset, int ncols, void* dest
hsize_t
start
[
2
]
=
{
static_cast
<
hsize_t
>
(
offset
),
0
};
hsize_t
count
[
2
]
=
{
1
,
static_cast
<
hsize_t
>
(
ncols
)};
hid_t
sid
=
H5Dget_space
(
data_set
);
/* A copy of data space for writing */
H5Sselect_hyperslab
(
sid
,
H5S_SELECT_SET
,
start
,
NULL
,
count
,
NULL
);
H5Sselect_hyperslab
(
sid
,
H5S_SELECT_SET
,
start
,
nullptr
,
count
,
nullptr
);
/*
* Now read
...
...
@@ -207,12 +207,12 @@ void HDFRoot::open(const char* name) {
hsize_t
dims
[
2
];
hid_t
dspace
=
H5Dget_space
(
priv
->
timeID
);
H5Sget_simple_extent_dims
(
dspace
,
dims
,
NULL
);
H5Sget_simple_extent_dims
(
dspace
,
dims
,
nullptr
);
H5Sclose
(
dspace
);
priv
->
nevts
=
static_cast
<
unsigned
int
>
(
dims
[
0
]);
dspace
=
H5Dget_space
(
priv
->
startID
);
H5Sget_simple_extent_dims
(
dspace
,
dims
,
NULL
);
H5Sget_simple_extent_dims
(
dspace
,
dims
,
nullptr
);
H5Sclose
(
dspace
);
priv
->
npoints
=
static_cast
<
unsigned
int
>
(
dims
[
0
]);
...
...
This diff is collapsed.
Click to expand it.
src/modules/EventLoaderALiBaVa/ALiBaVa/utils.h
+
1
−
1
View file @
299940ef
...
...
@@ -13,7 +13,7 @@
* Utils
*/
inline
bool
isws
(
char
c
,
char
const
*
const
wstr
=
"
\t\n
"
)
{
return
(
strchr
(
wstr
,
c
)
!=
NULL
);
return
(
strchr
(
wstr
,
c
)
!=
nullptr
);
}
inline
std
::
string
trim_right
(
const
std
::
string
&
s
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment