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

Jump to bottom

Fix modernize-use-nullptr warning reported by clang-tidy #1156

Merged
merged 2 commits into from
Dec 4, 2022
Merged

Fix modernize-use-nullptr warning reported by clang-tidy #1156

merged 2 commits into from
Dec 4, 2022

Conversation

MaximSmolskiy
Copy link
Contributor

Fix #1100

torwig
torwig reviewed Dec 3, 2022
View reviewed changes
src/types/geohash.cc Outdated
@@ -166,7 +166,7 @@ void geohashGetCoordRange(GeoHashRange *long_range, GeoHashRange *lat_range) {
int geohashEncode(const GeoHashRange *long_range, const GeoHashRange *lat_range, double longitude, double latitude,
uint8_t step, GeoHashBits *hash) {
/* Check basic arguments sanity. */
if (hash == NULL || step > 32 || step == 0 || RANGEPISZERO(lat_range) || RANGEPISZERO(long_range)) return 0;
if (hash == nullptr || step > 32 || step == 0 || RANGEPISZERO(lat_range) || RANGEPISZERO(long_range)) return 0;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can go further an replace hash == nullptr with !hash.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Replaced

src/types/geohash.cc Outdated
@@ -203,7 +203,7 @@ int geohashEncodeWGS84(double longitude, double latitude, uint8_t step, GeoHashB

int geohashDecode(const GeoHashRange &long_range, const GeoHashRange &lat_range, const GeoHashBits &hash,
GeoHashArea *area) {
if (HASHISZERO(hash) || NULL == area || RANGEISZERO(lat_range) || RANGEISZERO(long_range)) {
if (HASHISZERO(hash) || nullptr == area || RANGEISZERO(lat_range) || RANGEISZERO(long_range)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And the same trick here: nullptr == area => !area

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Replaced

torwig
torwig approved these changes Dec 3, 2022
View reviewed changes
Copy link
Contributor

@torwig torwig left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.
@MaximSmolskiy Thank you for your contribution.

@git-hulk
Copy link
Member

git-hulk commented Dec 4, 2022

Thanks all, merging...

@git-hulk git-hulk merged commit 3c49cb5 into apache:unstable Dec 4, 2022
@MaximSmolskiy MaximSmolskiy deleted the fix-modernize-use-nullptr-warning-reported-by-clang-tidy branch December 4, 2022 10:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@torwig torwig torwig approved these changes

@git-hulk git-hulk git-hulk approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Fix modernize-use-nullptr warning reported by clang-tidy
3 participants
@MaximSmolskiy @git-hulk @torwig