Skip to content
This repository has been archived by the owner on Dec 28, 2022. It is now read-only.

Commit

Permalink
version is also a constant
Browse files Browse the repository at this point in the history
  • Loading branch information
peter-leonov committed Jun 3, 2010
1 parent ce81ecc commit 7681aeb
Showing 1 changed file with 16 additions and 15 deletions.
31 changes: 16 additions & 15 deletions src/classes/Nginx.c
Expand Up @@ -93,10 +93,23 @@ if (!JS_SetProperty(cx, obj, name, &v)) \
return JS_FALSE; \
}

#define SET_CST(name, val) \
v_jss = JS_NewStringCopyZ(cx, val); \
if (v_jss == NULL) \
{ \
return JS_FALSE; \
} \
v = STRING_TO_JSVAL(v_jss); \
if (!JS_SetProperty(cx, obj, name, &v)) \
{ \
return JS_FALSE; \
}

static JSBool
setup_constants(JSContext *cx, JSObject *obj)
{
jsval v;
JSString *v_jss;

// NGX_LOG_*
SET_INT("LOG_STDERR", NGX_LOG_STDERR);
Expand Down Expand Up @@ -157,7 +170,9 @@ setup_constants(JSContext *cx, JSObject *obj)
SET_INT("HTTP_LAST", NGX_HTTP_LAST);
SET_INT("HTTP_FLUSH", NGX_HTTP_FLUSH);


// etc
SET_INT("version", nginx_version);
SET_CST("VERSION", NGINX_VERSION);
return JS_TRUE;
}

Expand Down Expand Up @@ -187,18 +202,6 @@ js_nginx_class_getProperty(JSContext *cx, JSObject *self, jsval id, jsval *vp)
break;

case 102: *vp = INT_TO_JSVAL(ngx_pid); break;
case 103: *vp = INT_TO_JSVAL(nginx_version); break;
case 104:
{
JSString *ver;
ver = JS_NewStringCopyZ(cx, NGINX_VERSION);
if (ver == NULL)
{
return JS_FALSE;
}
*vp = STRING_TO_JSVAL(ver);
}
break;
}
}
return JS_TRUE;
Expand All @@ -224,8 +227,6 @@ static JSPropertySpec nginx_class_props[] =
{"time", 0, JSPROP_READONLY, getter_time, NULL},
{"prefix", 101, JSPROP_READONLY, NULL, NULL},
{"pid", 102, JSPROP_READONLY, NULL, NULL},
{"version", 103, JSPROP_READONLY, NULL, NULL},
{"VERSION", 104, JSPROP_READONLY, NULL, NULL},

{0, 0, 0, NULL, NULL}
};
Expand Down

0 comments on commit 7681aeb

Please sign in to comment.