Skip to content

Remove forbidden keyword 'class' from variable names #1

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

Open
khalahan wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove forbidden keyword 'class' from variable names #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f77f09
Remove forbidden keyword 'class' from variable names
khalahan Oct 18, 2011
f0cf0b9
Node 0.6 gets angry.
BlinkyStitt Nov 16, 2011
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
18 changes: 9 additions & 9 deletions lib/ndns/ndns.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2338,19 +2338,19 @@ function MessageHeader ()
}
exports.MessageHeader = MessageHeader;

function MessageQuestion (name, type, class)
function MessageQuestion (name, type, class2)
{
this.name = name;
this.type = type;
this.class = class;
this.class2 = class2;
}
exports.MessageQuestion = MessageQuestion;

function MessageRR (name, type, class, ttl)
function MessageRR (name, type, class2, ttl)
{
this.name = name;
this.type = type;
this.class = class;
this.class2 = class2;
this.ttl = ttl;

if (arguments.length > 4) {
Expand Down Expand Up @@ -2381,14 +2381,14 @@ Message.prototype.addQuestion = function (qname, qtype, qclass)
this.question.push (q);
return q;
};
Message.prototype.addRR = function (sect, name, type, class, ttl)
Message.prototype.addRR = function (sect, name, type, class2, ttl)
{
var rr;
if (sect == ns_s.qd) {
rr = new MessageQuestion (name, type, class);
rr = new MessageQuestion (name, type, class2);
}
else {
rr = new MessageRR (name, type, class, ttl, Array.prototype.slice.call (arguments, 5));
rr = new MessageRR (name, type, class2, ttl, Array.prototype.slice.call (arguments, 5));
}

switch (sect) {
Expand Down Expand Up @@ -2517,15 +2517,15 @@ Message.prototype.writeOnce = function (buf, bufsiz)
return (-1);

if (section == ns_s.qd) {
if (ns_newmsg_q (_newmsg, _dname, rr.type, rr.class) == -1) {
if (ns_newmsg_q (_newmsg, _dname, rr.type, rr.class2) == -1) {
return (-1);
}
}
else {
var nrdata = 0;
if ((nrdata = ns_rdata_pack (rr.type, rr.rdata, _rdata, 0, _rdata.length)) == -1)
return (-1);
if (ns_newmsg_rr (_newmsg, section, _dname, rr.type, rr.class, rr.ttl, nrdata, _rdata) == -1) {
if (ns_newmsg_rr (_newmsg, section, _dname, rr.type, rr.class2, rr.ttl, nrdata, _rdata) == -1) {
return (-1);
}
}
Expand Down
4 changes: 2 additions & 2 deletions lib/ndns/ndns_client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ function resolve (domain, rrtype, rrclass, server, cb) {

var req = resolver.request(53, server);
var type = ndns.ns_t[rrtype.toLowerCase()];
var class = ndns.ns_c[rrclass.toLowerCase()];
var class2 = ndns.ns_c[rrclass.toLowerCase()];

active_queries++;

r_id = (r_id+1)%65536;
req.header.id = r_id;
req.header.rd = 1; // recursion desired.
req.header.qdcount = 1;
req.addQuestion (domain, type, class);
req.addQuestion (domain, type, class2);
req.send();

resolver.on("response", function handler(res) {
Expand Down
4 changes: 2 additions & 2 deletions lib/nmcdns.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ function startServer(port, host, callback) {
for (var i=0,l=req.question.length;i<l;i++) {
var question = req.question[i];
console.log("Question: What is",question.name,"?");
switch (question.class) {
switch (question.class2) {
case ndns.ns_c.in:
case ndns.ns_c.any:
switch(question.type) {
Expand Down Expand Up @@ -53,7 +53,7 @@ function startServer(port, host, callback) {
}
break;
default:
console.log("unhandled class:",question.class);
console.log("unhandled class:",question.class2);
// XXX unhandled class. What's the right answer for that?
}
}
Expand Down
8 changes: 4 additions & 4 deletions lib/nmcresolver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,14 +195,14 @@ function resolveFromValue(host, type, parent, chunks, value, counter, callback)
// 2. import processing
while (value.import instanceof Array && value.import.length) {
// implemented by progressively modifying the current value.
var import = value.import.shift();
if (import instanceof Array) {
return getRecord(import[0], import[1], function(err, data) {
var import2 = value.import.shift();
if (import2 instanceof Array) {
return getRecord(import2[0], import2[1], function(err, data) {
if (err) {
// XXX is this too lax?
return resolveFromValue(host, type, parent, chunks, value, counter + 1, callback);
}
var subchunks = import[1].split(".").reverse();
var subchunks = import2[1].split(".").reverse();
var base = value;
while(subchunks.length) {
var key = subchunks.shift();
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name" : "nmcsocks",
"version" : "0.4",
"version" : "0.4.0",
"description" : "A socks proxy and DNS resolver for Namecoin.",
"main" : "./nmcsocks",
"repository" : {
Expand Down