Skip to content

src: fix warning in cares_wrap.cc #25230

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
cjihrig merged 1 commit into from
Dec 31, 2018
Merged

src: fix warning in cares_wrap.cc #25230

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
src: fix warning in cares_wrap.cc 
This commit fixes the following warning:

./src/cares_wrap.cc:1268:5: warning: comparison of integers of
    different signs: 'uint32_t' (aka 'unsigned int') and 'int'
    [-Wsign-compare]
    CHECK_EQ(ret->Length(), a_count + aaaa_count);

PR-URL: #25230
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
@cjihrig
cjihrig committed Dec 31, 2018
commit da9a4d0fb4df8be01cfd5a8d582f9acbb1e10306
12 changes: 6 additions & 6 deletions src/cares_wrap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1212,15 +1212,15 @@ class QueryAnyWrap: public QueryWrap {
ret,
addrttls,
&naddrttls);
int a_count = ret->Length();
uint32_t a_count = ret->Length();
if (status != ARES_SUCCESS && status != ARES_ENODATA) {
ParseError(status);
return;
}

if (type == ns_t_a) {
CHECK_EQ(naddrttls, a_count);
for (int i = 0; i < a_count; i++) {
CHECK_EQ(static_cast<uint32_t>(naddrttls), a_count);
for (uint32_t i = 0; i < a_count; i++) {
Local<Object> obj = Object::New(env()->isolate());
obj->Set(context,
env()->address_string(),
Expand All @@ -1234,7 +1234,7 @@ class QueryAnyWrap: public QueryWrap {
ret->Set(context, i, obj).FromJust();
}
} else {
for (int i = 0; i < a_count; i++) {
for (uint32_t i = 0; i < a_count; i++) {
Local<Object> obj = Object::New(env()->isolate());
obj->Set(context,
env()->value_string(),
Expand All @@ -1258,13 +1258,13 @@ class QueryAnyWrap: public QueryWrap {
ret,
addr6ttls,
&naddr6ttls);
int aaaa_count = ret->Length() - a_count;
uint32_t aaaa_count = ret->Length() - a_count;
if (status != ARES_SUCCESS && status != ARES_ENODATA) {
ParseError(status);
return;
}

CHECK_EQ(aaaa_count, naddr6ttls);
CHECK_EQ(aaaa_count, static_cast<uint32_t>(naddr6ttls));
CHECK_EQ(ret->Length(), a_count + aaaa_count);
for (uint32_t i = a_count; i < ret->Length(); i++) {
Local<Object> obj = Object::New(env()->isolate());
Expand Down