Skip to content

Commit

Permalink
Update code for smjs API change with regard to class finalizers
Browse files Browse the repository at this point in the history
  • Loading branch information
creationix committed May 10, 2012
1 parent de259f7 commit 4ba440b
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 9 deletions.
5 changes: 3 additions & 2 deletions src/lhttp_parser.c
Expand Up @@ -53,7 +53,8 @@ static int lhttp_parser_on_headers_complete(http_parser *p) {
return 0;
}

static void HttpParser_finalize(JSContext *cx, JSObject *obj);
static void HttpParser_finalize(JSFreeOp *fop, JSObject *obj);


static JSClass HttpParser_class = {
"HttpParser", JSCLASS_HAS_PRIVATE,
Expand All @@ -74,7 +75,7 @@ static JSBool HttpParser_constructor(JSContext *cx, unsigned argc, jsval *vp) {
return JS_TRUE;
}

static void HttpParser_finalize(JSContext *cx, JSObject *this) {
static void HttpParser_finalize(JSFreeOp *fop, JSObject *this) {
free(JS_GetPrivate(this));
}

Expand Down
2 changes: 1 addition & 1 deletion src/luv_handle.c
Expand Up @@ -4,7 +4,7 @@
static JSClass Handle_class = {
"Handle", 0,
JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub,
JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, NULL,
JSCLASS_NO_OPTIONAL_MEMBERS
};

Expand Down
2 changes: 1 addition & 1 deletion src/luv_stream.c
Expand Up @@ -5,7 +5,7 @@
static JSClass Stream_class = {
"Stream", 0,
JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub,
JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, NULL,
JSCLASS_NO_OPTIONAL_MEMBERS
};

Expand Down
4 changes: 2 additions & 2 deletions src/luv_tcp.c
@@ -1,7 +1,7 @@
#include "uv.h"
#include "luv_tcp.h"

static void Tcp_finalize(JSContext *cx, JSObject *obj);
static void Tcp_finalize(JSFreeOp *fop, JSObject *obj);

static JSClass Tcp_class = {
"Tcp", JSCLASS_HAS_PRIVATE,
Expand All @@ -28,7 +28,7 @@ static JSBool Tcp_constructor(JSContext *cx, unsigned argc, jsval *vp) {
}

/* Free the uv_tcp_t* when the object gets GCed */
static void Tcp_finalize(JSContext *cx, JSObject *this) {
static void Tcp_finalize(JSFreeOp *fop, JSObject *this) {
free(JS_GetPrivate(this));
}

Expand Down
4 changes: 2 additions & 2 deletions src/luv_timer.c
@@ -1,7 +1,7 @@
#include "uv.h"
#include "luv_timer.h"

static void Timer_finalize(JSContext *cx, JSObject *obj);
static void Timer_finalize(JSFreeOp *fop, JSObject *obj);

static JSClass Timer_class = {
"Timer", JSCLASS_HAS_PRIVATE,
Expand Down Expand Up @@ -29,7 +29,7 @@ static JSBool Timer_constructor(JSContext *cx, unsigned argc, jsval *vp) {
}

/* Free the uv_tcp_t* when the object gets GCed */
static void Timer_finalize(JSContext *cx, JSObject *this) {
static void Timer_finalize(JSFreeOp *fop, JSObject *this) {
free(JS_GetPrivate(this));
}

Expand Down
2 changes: 1 addition & 1 deletion src/main.c
Expand Up @@ -9,7 +9,7 @@
static JSClass global_class = {
"global", JSCLASS_GLOBAL_FLAGS,
JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub,
JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, NULL,
JSCLASS_NO_OPTIONAL_MEMBERS
};

Expand Down

0 comments on commit 4ba440b

Please sign in to comment.