buffer: update constructor prototype

langpavel · bnoordhuis · commit 7ab4a77d6fdb · 2012-09-13T16:31:04.000+02:00
Change Buffer::New(char*, size_t) to Buffer::New(const char*, size_t).
diff --git a/src/node_buffer.cc b/src/node_buffer.cc
@@ -137,14 +137,14 @@ Buffer* Buffer::New(size_t length) {
 }
 
 
-Buffer* Buffer::New(char* data, size_t length) {
+Buffer* Buffer::New(const char* data, size_t length) {
   HandleScope scope;
 
   Local<Value> arg = Integer::NewFromUnsigned(0);
   Local<Object> obj = constructor_template->GetFunction()->NewInstance(1, &arg);
 
   Buffer *buffer = ObjectWrap::Unwrap<Buffer>(obj);
-  buffer->Replace(data, length, NULL, NULL);
+  buffer->Replace(const_cast<char*>(data), length, NULL, NULL);
 
   return buffer;
 }
@@ -198,6 +198,8 @@ Buffer::~Buffer() {
 }
 
 
+// if replace doesn't have a callback, data must be copied
+// const_cast in Buffer::New requires this
 void Buffer::Replace(char *data, size_t length,
                      free_callback callback, void *hint) {
   HandleScope scope;
diff --git a/src/node_buffer.h b/src/node_buffer.h
@@ -102,10 +102,14 @@ class NODE_EXTERN Buffer: public ObjectWrap {
   static v8::Handle<v8::Object> New(v8::Handle<v8::String> string);
 
   static void Initialize(v8::Handle<v8::Object> target);
-  static Buffer* New(size_t length); // public constructor
-  static Buffer* New(char *data, size_t len); // public constructor
+
+  // public constructor
+  static Buffer* New(size_t length);
+  // public constructor - data is copied
+  static Buffer* New(const char *data, size_t len);
+  // public constructor
   static Buffer* New(char *data, size_t length,
-                     free_callback callback, void *hint); // public constructor
+                     free_callback callback, void *hint);
 
   private:
   static v8::Handle<v8::Value> New(const v8::Arguments &args);

Original file line number	Diff line number	Diff line change
`@@ -137,14 +137,14 @@ Buffer* Buffer::New(size_t length) {`
`137`	`137`	`}`
`138`	`138`
`139`	`139`
`140`		`-Buffer* Buffer::New(char* data, size_t length) {`
	`140`	`+Buffer* Buffer::New(const char* data, size_t length) {`
`141`	`141`	`HandleScope scope;`
`142`	`142`
`143`	`143`	`Local<Value> arg = Integer::NewFromUnsigned(0);`
`144`	`144`	`Local<Object> obj = constructor_template->GetFunction()->NewInstance(1, &arg);`
`145`	`145`
`146`	`146`	`Buffer *buffer = ObjectWrap::Unwrap<Buffer>(obj);`
`147`		`- buffer->Replace(data, length, NULL, NULL);`
	`147`	`+ buffer->Replace(const_cast<char*>(data), length, NULL, NULL);`
`148`	`148`
`149`	`149`	`return buffer;`
`150`	`150`	`}`
`@@ -198,6 +198,8 @@ Buffer::~Buffer() {`
`198`	`198`	`}`
`199`	`199`
`200`	`200`
	`201`	`+// if replace doesn't have a callback, data must be copied`
	`202`	`+// const_cast in Buffer::New requires this`
`201`	`203`	`void Buffer::Replace(char *data, size_t length,`
`202`	`204`	`free_callback callback, void *hint) {`
`203`	`205`	`HandleScope scope;`