1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

src: don't obj->Set(Integer::New(...), val)

Browse Source 
Don't create an Integer when setting a numeric index on an object or an
array, use the version of v8::Object::Set() that takes an uint32_t.

Change the types of the variables from int to uint32_t and clean up
some code consistency issues while we're here.
This commit is contained in:
Ben Noordhuis 2013-08-12 20:34:18 +02:00
parent 756ae2c536
commit 5725864dfd
4 changed files with 38 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/cares_wrap.cc
View File

@ -203,11 +203,10 @@ static Local<Array> HostentToAddresses(struct hostent* host) {
Local<Array> addresses = Array::New(); Local<Array> addresses = Array::New();
char ip[INET6_ADDRSTRLEN]; char ip[INET6_ADDRSTRLEN];
for (int i = 0; host->h_addr_list[i]; ++i) { for (uint32_t i = 0; host->h_addr_list[i] != NULL; ++i) {
uv_inet_ntop(host->h_addrtype, host->h_addr_list[i], ip, sizeof(ip)); uv_inet_ntop(host->h_addrtype, host->h_addr_list[i], ip, sizeof(ip));
Local<String> address = OneByteString(node_isolate, ip); Local<String> address = OneByteString(node_isolate, ip);
addresses->Set(Integer::New(i, node_isolate), address); addresses->Set(i, address);
} }
return scope.Close(addresses); return scope.Close(addresses);
@ -218,9 +217,9 @@ static Local<Array> HostentToNames(struct hostent* host) {
HandleScope scope(node_isolate); HandleScope scope(node_isolate);
Local<Array> names = Array::New(); Local<Array> names = Array::New();
for (int i = 0; host->h_aliases[i]; ++i) { for (uint32_t i = 0; host->h_aliases[i] != NULL; ++i) {
Local<String> address = OneByteString(node_isolate, host->h_aliases[i]); Local<String> address = OneByteString(node_isolate, host->h_aliases[i]);
names->Set(Integer::New(i, node_isolate), address); names->Set(i, address);
} }
return scope.Close(names); return scope.Close(names);
@ -455,16 +454,14 @@ class QueryMxWrap: public QueryWrap {
Local<String> priority_symbol = Local<String> priority_symbol =
FIXED_ONE_BYTE_STRING(node_isolate, "priority"); FIXED_ONE_BYTE_STRING(node_isolate, "priority");
int i = 0; ares_mx_reply* current = mx_start;
for (struct ares_mx_reply* mx_current = mx_start; for (uint32_t i = 0; current != NULL; ++i, current = current->next) {
mx_current;
mx_current = mx_current->next) {
Local<Object> mx_record = Object::New(); Local<Object> mx_record = Object::New();
mx_record->Set(exchange_symbol, mx_record->Set(exchange_symbol,
OneByteString(node_isolate, mx_current->host)); OneByteString(node_isolate, current->host));
mx_record->Set(priority_symbol, mx_record->Set(priority_symbol,
Integer::New(mx_current->priority, node_isolate)); Integer::New(current->priority, node_isolate));
mx_records->Set(Integer::New(i++, node_isolate), mx_record); mx_records->Set(i, mx_record);
} }
ares_free_data(mx_start); ares_free_data(mx_start);
@ -524,10 +521,10 @@ class QueryTxtWrap: public QueryWrap {
Local<Array> txt_records = Array::New(); Local<Array> txt_records = Array::New();
struct ares_txt_reply *current = txt_out; ares_txt_reply* current = txt_out;
for (int i = 0; current; ++i, current = current->next) { for (uint32_t i = 0; current != NULL; ++i, current = current->next) {
Local<String> txt = OneByteString(node_isolate, current->txt); Local<String> txt = OneByteString(node_isolate, current->txt);
txt_records->Set(Integer::New(i, node_isolate), txt); txt_records->Set(i, txt);
} }
ares_free_data(txt_out); ares_free_data(txt_out);
@ -573,20 +570,18 @@ class QuerySrvWrap: public QueryWrap {
Local<String> weight_symbol = Local<String> weight_symbol =
FIXED_ONE_BYTE_STRING(node_isolate, "weight"); FIXED_ONE_BYTE_STRING(node_isolate, "weight");
int i = 0; ares_srv_reply* current = srv_start;
for (struct ares_srv_reply* srv_current = srv_start; for (uint32_t i = 0; current != NULL; ++i, current = current->next) {
srv_current;
srv_current = srv_current->next) {
Local<Object> srv_record = Object::New(); Local<Object> srv_record = Object::New();
srv_record->Set(name_symbol, srv_record->Set(name_symbol,
OneByteString(node_isolate, srv_current->host)); OneByteString(node_isolate, current->host));
srv_record->Set(port_symbol, srv_record->Set(port_symbol,
Integer::New(srv_current->port, node_isolate)); Integer::New(current->port, node_isolate));
srv_record->Set(priority_symbol, srv_record->Set(priority_symbol,
Integer::New(srv_current->priority, node_isolate)); Integer::New(current->priority, node_isolate));
srv_record->Set(weight_symbol, srv_record->Set(weight_symbol,
Integer::New(srv_current->weight, node_isolate)); Integer::New(current->weight, node_isolate));
srv_records->Set(Integer::New(i++, node_isolate), srv_record); srv_records->Set(i, srv_record);
} }
ares_free_data(srv_start); ares_free_data(srv_start);
@ -637,27 +632,22 @@ class QueryNaptrWrap: public QueryWrap {
Local<String> preference_symbol = Local<String> preference_symbol =
FIXED_ONE_BYTE_STRING(node_isolate, "preference"); FIXED_ONE_BYTE_STRING(node_isolate, "preference");
int i = 0; ares_naptr_reply* current = naptr_start;
for (ares_naptr_reply* naptr_current = naptr_start; for (uint32_t i = 0; current != NULL; ++i, current = current->next) {
naptr_current;
naptr_current = naptr_current->next) {
Local<Object> naptr_record = Object::New(); Local<Object> naptr_record = Object::New();
naptr_record->Set(flags_symbol, naptr_record->Set(flags_symbol,
OneByteString(node_isolate, naptr_current->flags)); OneByteString(node_isolate, current->flags));
naptr_record->Set(service_symbol, naptr_record->Set(service_symbol,
OneByteString(node_isolate, naptr_current->service)); OneByteString(node_isolate, current->service));
naptr_record->Set(regexp_symbol, naptr_record->Set(regexp_symbol,
OneByteString(node_isolate, naptr_current->regexp)); OneByteString(node_isolate, current->regexp));
naptr_record->Set(replacement_symbol, naptr_record->Set(replacement_symbol,
OneByteString(node_isolate, OneByteString(node_isolate, current->replacement));
naptr_current->replacement)); naptr_record->Set(order_symbol,
naptr_record->Set(order_symbol, Integer::New(naptr_current->order, Integer::New(current->order, node_isolate));
node_isolate));
naptr_record->Set(preference_symbol, naptr_record->Set(preference_symbol,
Integer::New(naptr_current->preference, node_isolate)); Integer::New(current->preference, node_isolate));
naptr_records->Set(i, naptr_record);
naptr_records->Set(Integer::New(i++, node_isolate), naptr_record);
} }
ares_free_data(naptr_start); ares_free_data(naptr_start);
@ -917,7 +907,7 @@ static void GetServers(const FunctionCallbackInfo<Value>& args) {
ares_addr_node* cur = servers; ares_addr_node* cur = servers;
for (int i = 0; cur != NULL; ++i, cur = cur->next) { for (uint32_t i = 0; cur != NULL; ++i, cur = cur->next) {
char ip[INET6_ADDRSTRLEN]; char ip[INET6_ADDRSTRLEN];
const void* caddr = static_cast<const void*>(&cur->addr); const void* caddr = static_cast<const void*>(&cur->addr);

3
src/node_crypto.cc
View File

@ -1601,8 +1601,7 @@ void Connection::GetPeerCertificate(const FunctionCallbackInfo<Value>& args) {
for (int i = 0; i < sk_ASN1_OBJECT_num(eku); i++) { for (int i = 0; i < sk_ASN1_OBJECT_num(eku); i++) {
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
OBJ_obj2txt(buf, sizeof(buf) - 1, sk_ASN1_OBJECT_value(eku, i), 1); OBJ_obj2txt(buf, sizeof(buf) - 1, sk_ASN1_OBJECT_value(eku, i), 1);
ext_key_usage->Set(Integer::New(i, node_isolate), ext_key_usage->Set(i, OneByteString(node_isolate, buf));
OneByteString(node_isolate, buf));
} }
sk_ASN1_OBJECT_pop_free(eku, ASN1_OBJECT_free); sk_ASN1_OBJECT_pop_free(eku, ASN1_OBJECT_free);

12
src/node_file.cc
View File

@ -187,7 +187,7 @@ static void After(uv_fs_t *req) {
for (int i = 0; i < nnames; i++) { for (int i = 0; i < nnames; i++) {
Local<String> name = String::NewFromUtf8(node_isolate, namebuf); Local<String> name = String::NewFromUtf8(node_isolate, namebuf);
names->Set(Integer::New(i, node_isolate), name); names->Set(i, name);
#ifndef NDEBUG #ifndef NDEBUG
namebuf += strlen(namebuf); namebuf += strlen(namebuf);
assert(*namebuf == '\0'); assert(*namebuf == '\0');
@ -618,13 +618,13 @@ static void ReadDir(const FunctionCallbackInfo<Value>& args) {
} else { } else {
SYNC_CALL(readdir, *path, *path, 0 /*flags*/) SYNC_CALL(readdir, *path, *path, 0 /*flags*/)
char *namebuf = static_cast<char*>(SYNC_REQ.ptr); assert(SYNC_REQ.result >= 0);
int nnames = req_wrap.req.result; char* namebuf = static_cast<char*>(SYNC_REQ.ptr);
uint32_t nnames = SYNC_REQ.result;
Local<Array> names = Array::New(nnames); Local<Array> names = Array::New(nnames);
for (int i = 0; i < nnames; i++) { for (uint32_t i = 0; i < nnames; ++i) {
Local<String> name = String::NewFromUtf8(node_isolate, namebuf); names->Set(i, String::NewFromUtf8(node_isolate, namebuf));
names->Set(Integer::New(i, node_isolate), name);
#ifndef NDEBUG #ifndef NDEBUG
namebuf += strlen(namebuf); namebuf += strlen(namebuf);
assert(*namebuf == '\0'); assert(*namebuf == '\0');

3
src/tls_wrap.cc
View File

@ -944,8 +944,7 @@ void TLSCallbacks::GetPeerCertificate(const FunctionCallbackInfo<Value>& args) {
for (int i = 0; i < sk_ASN1_OBJECT_num(eku); i++) { for (int i = 0; i < sk_ASN1_OBJECT_num(eku); i++) {
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
OBJ_obj2txt(buf, sizeof(buf) - 1, sk_ASN1_OBJECT_value(eku, i), 1); OBJ_obj2txt(buf, sizeof(buf) - 1, sk_ASN1_OBJECT_value(eku, i), 1);
ext_key_usage->Set(Integer::New(i, node_isolate), ext_key_usage->Set(i, OneByteString(node_isolate, buf));
OneByteString(node_isolate, buf));
} }
sk_ASN1_OBJECT_pop_free(eku, ASN1_OBJECT_free); sk_ASN1_OBJECT_pop_free(eku, ASN1_OBJECT_free);