Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Namespace trimming: remove node.constants

  • Loading branch information...
commit 2b557c467f8411bbcf16bfe05e715821ecfe76ca 1 parent 89d891f
@ry ry authored
Showing with 16 additions and 18 deletions.
  1. +12 −12 src/file.js
  2. +1 −3 src/node.cc
  3. +3 −3 website/api.html
View
24 src/file.js
@@ -12,7 +12,7 @@ node.fs.cat = function (path, encoding, callback) {
callback(-1);
};
- var content = (encoding == node.constants.UTF8 ? "" : []);
+ var content = (encoding == node.UTF8 ? "" : []);
var pos = 0;
var chunkSize = 16*1024;
@@ -41,9 +41,9 @@ node.fs.File = function (options) {
options = options || {};
if (options.encoding === "utf8") {
- self.encoding = node.constants.UTF8;
+ self.encoding = node.UTF8;
} else {
- self.encoding = node.constants.RAW;
+ self.encoding = node.RAW;
}
//node.debug("encoding: opts=" + options.encoding + " self=" + self.encoding);
@@ -104,22 +104,22 @@ node.fs.File = function (options) {
var flags;
switch (mode) {
case "r":
- flags = node.constants.O_RDONLY;
+ flags = node.O_RDONLY;
break;
case "r+":
- flags = node.constants.O_RDWR;
+ flags = node.O_RDWR;
break;
case "w":
- flags = node.constants.O_CREAT | node.constants.O_TRUNC | node.constants.O_WRONLY;
+ flags = node.O_CREAT | node.O_TRUNC | node.O_WRONLY;
break;
case "w+":
- flags = node.constants.O_CREAT | node.constants.O_TRUNC | node.constants.O_RDWR;
+ flags = node.O_CREAT | node.O_TRUNC | node.O_RDWR;
break;
case "a":
- flags = node.constants.O_APPEND | node.constants.O_CREAT | node.constants.O_WRONLY;
+ flags = node.O_APPEND | node.O_CREAT | node.O_WRONLY;
break;
case "a+":
- flags = node.constants.O_APPEND | node.constants.O_CREAT | node.constants.O_RDWR;
+ flags = node.O_APPEND | node.O_CREAT | node.O_RDWR;
break;
default:
throw "Unknown mode";
@@ -173,9 +173,9 @@ node.fs.File = function (options) {
};
};
-stdout = new node.fs.File({ fd: node.constants.STDOUT_FILENO });
-stderr = new node.fs.File({ fd: node.constants.STDERR_FILENO });
-stdin = new node.fs.File({ fd: node.constants.STDIN_FILENO });
+stdout = new node.fs.File({ fd: node.STDOUT_FILENO });
+stderr = new node.fs.File({ fd: node.STDERR_FILENO });
+stdin = new node.fs.File({ fd: node.STDIN_FILENO });
puts = stdout.puts;
print = stdout.print;
View
4 src/node.cc
@@ -303,9 +303,7 @@ Load (int argc, char *argv[])
Timer::Initialize(node_obj);
- Local<Object> constants = Object::New();
- node_obj->Set(String::NewSymbol("constants"), constants);
- DefineConstants(constants);
+ DefineConstants(node_obj);
Local<Object> fs = Object::New();
node_obj->Set(String::NewSymbol("fs"), fs);
View
6 website/api.html
@@ -206,7 +206,7 @@ <h3 id="file_wrappers">POSIX Wrappers</h3>
<a href="http://opengroup.org/onlinepubs/007908799/xsh/open.html">open(2)</a>
<p>
The constants like <code>O_CREAT</code> are defined at
- <code>node.constants.O_CREAT</code>.
+ <code>node.O_CREAT</code>.
</p>
</dd>
@@ -243,8 +243,8 @@ <h3 id="file_wrappers">POSIX Wrappers</h3>
</p>
<p>
- <code>encoding</code> is either <code>node.constants.UTF8</code>
- or <code>node.constants.RAW</code>.
+ <code>encoding</code> is either <code>node.UTF8</code>
+ or <code>node.RAW</code>.
</p>
</dd>
</dl>
Please sign in to comment.
Something went wrong with that request. Please try again.