Skip to content

Updated tyrant-node with bug fixes. #3

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
hoffin wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updated tyrant-node with bug fixes. #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a9ba47
Updated to be compatible with Node 0.8.20.
Feb 24, 2013
61d15e6
Converted c3 to a local varible
Feb 25, 2013
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
12 changes: 6 additions & 6 deletions tyrant.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
// IN THE SOFTWARE.

var tcp = require('tcp');
var tcp = require('net');
//process.mixin(GLOBAL, 'tcp');

var sys = require('sys');
Expand Down Expand Up @@ -109,7 +109,7 @@ var queries = {
function decode_utf8(a) {
var string = "";
var i = 0;
var c = c1 = c2 = 0;
var c = 0, c1 = 0, c2 = 0;
Copy link
Author

@hoffin hoffin Feb 24, 2013

Choose a reason for hiding this comment

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

Made these variables local rather than global.


while ( i < a.length ) {
c = a.charCodeAt(i);
Expand All @@ -124,7 +124,7 @@ function decode_utf8(a) {
}
else {
c2 = a.charCodeAt(i+1);
c3 = a.charCodeAt(i+2);
var c3 = a.charCodeAt(i+2);
string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63));
i += 3;
}
Expand Down Expand Up @@ -231,13 +231,13 @@ function responseSingle(data) {

function responseMisc(data) {
if (data.charCodeAt(0)!=0) return [null, 5, 'Tyrant Error : '+data.charCodeAt(0)];
if (data.length<9) return [null, -1, null];
if (data.length<5) return [null, -1, null];
var r=[];
var c=1;
var resultCount=unpackInt(data.slice(c, c+=4));
for (var i=0; i<resultCount; i++) {
var rlen=unpackInt(data.slice(c, c+=4));
if (data.length<(c+rlen)) return ['', -1, null];
if (isNaN(rlen) || data.length<(c+rlen)) return ['', -1, null];
r.push(decode_utf8(data.slice(c, c+=rlen)));
}
return [ r, c, null];
Expand Down Expand Up @@ -343,7 +343,7 @@ function onData(data) {
exports.quit = function() {
if (conn.readyState != "open")
throw "connection is not open";
conn.close();
conn.destroy();
emitter.emit("close");
}

Expand Down