RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 11-Jul-2017 12:49:39
Branch: rpm-5_4 Handle: 2017071110493801
Modified files: (Branch: rpm-5_4)
rpm/js rpmaug-js.c rpmbc-js.c rpmbf-js.c rpmcudf-js.c
rpmdb-js.c rpmdbc-js.c rpmdbe-js.c rpmdc-js.c
rpmdig-js.c rpmdir-js.c rpmds-js.c rpmfc-js.c
rpmfi-js.c rpmfts-js.c rpmgi-js.c rpmhdr-js.c
rpmio-js.c rpmiob-js.c rpmmc-js.c rpmmg-js.c
rpmmi-js.c rpmmpf-js.c rpmmpw-js.c rpmps-js.c
rpmseq-js.c rpmsm-js.c rpmsp-js.c rpmst-js.c
rpmsw-js.c rpmsx-js.c rpmsys-js.c rpmte-js.c
rpmts-js.c rpmtxn-js.c rpmxar-js.c syck-js.c
uuid-js.c
Log:
- rpmjs: use nullptr not NULL.
Summary:
Revision Changes Path
1.11.4.7 +14 -14 rpm/js/rpmaug-js.c
1.4.4.5 +4 -4 rpm/js/rpmbc-js.c
1.10.4.6 +10 -10 rpm/js/rpmbf-js.c
1.6.4.6 +6 -6 rpm/js/rpmcudf-js.c
1.31.4.6 +26 -26 rpm/js/rpmdb-js.c
1.14.4.6 +13 -13 rpm/js/rpmdbc-js.c
1.21.4.7 +56 -56 rpm/js/rpmdbe-js.c
1.9.4.6 +7 -7 rpm/js/rpmdc-js.c
1.5.2.5 +4 -4 rpm/js/rpmdig-js.c
1.8.4.5 +5 -5 rpm/js/rpmdir-js.c
1.20.4.5 +5 -5 rpm/js/rpmds-js.c
1.4.4.5 +4 -4 rpm/js/rpmfc-js.c
1.15.4.5 +5 -5 rpm/js/rpmfi-js.c
1.10.4.6 +10 -10 rpm/js/rpmfts-js.c
1.4.4.5 +4 -4 rpm/js/rpmgi-js.c
1.24.4.6 +11 -11 rpm/js/rpmhdr-js.c
1.9.4.6 +22 -22 rpm/js/rpmio-js.c
1.4.4.5 +4 -4 rpm/js/rpmiob-js.c
1.12.4.6 +8 -8 rpm/js/rpmmc-js.c
1.4.4.5 +5 -5 rpm/js/rpmmg-js.c
1.28.4.6 +9 -9 rpm/js/rpmmi-js.c
1.7.4.6 +9 -9 rpm/js/rpmmpf-js.c
1.21.4.7 +14 -14 rpm/js/rpmmpw-js.c
1.18.4.6 +6 -6 rpm/js/rpmps-js.c
1.7.4.6 +10 -10 rpm/js/rpmseq-js.c
1.8.4.5 +4 -4 rpm/js/rpmsm-js.c
1.4.4.5 +4 -4 rpm/js/rpmsp-js.c
1.10.4.5 +4 -4 rpm/js/rpmst-js.c
1.4.4.5 +4 -4 rpm/js/rpmsw-js.c
1.8.4.6 +4 -4 rpm/js/rpmsx-js.c
1.8.4.6 +21 -21 rpm/js/rpmsys-js.c
1.19.4.6 +6 -6 rpm/js/rpmte-js.c
1.33.4.6 +14 -14 rpm/js/rpmts-js.c
1.11.4.6 +8 -8 rpm/js/rpmtxn-js.c
1.5.4.5 +5 -5 rpm/js/rpmxar-js.c
1.9.4.6 +4 -4 rpm/js/syck-js.c
1.18.4.6 +6 -6 rpm/js/uuid-js.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/js/rpmaug-js.c
============================================================================
$ cvs diff -u -r1.11.4.6 -r1.11.4.7 rpmaug-js.c
--- rpm/js/rpmaug-js.c 11 Jul 2017 10:42:14 -0000 1.11.4.6
+++ rpm/js/rpmaug-js.c 11 Jul 2017 10:49:38 -0000 1.11.4.7
@@ -33,7 +33,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, nullptr);
rpmaug aug = ptr;
bool ok = false;
const char * _name = NULL;
@@ -64,7 +64,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, nullptr);
rpmaug aug = ptr;
bool ok = false;
const char * _path = NULL;
@@ -98,7 +98,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, nullptr);
rpmaug aug = ptr;
bool ok = false;
const char * _path = NULL;
@@ -128,7 +128,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, nullptr);
rpmaug aug = ptr;
bool ok = false;
const char * _path = NULL;
@@ -159,7 +159,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, nullptr);
rpmaug aug = ptr;
bool ok = false;
const char * _path = NULL;
@@ -181,7 +181,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, nullptr);
rpmaug aug = ptr;
bool ok = false;
const char * _src = NULL;
@@ -211,7 +211,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, nullptr);
rpmaug aug = ptr;
bool ok = false;
const char * _path = NULL;
@@ -249,7 +249,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, nullptr);
rpmaug aug = ptr;
bool ok = false;
@@ -273,7 +273,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, nullptr);
rpmaug aug = ptr;
bool ok = false;
@@ -298,7 +298,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, nullptr);
rpmaug aug = ptr;
bool ok = false;
const char * _path = NULL;
@@ -352,7 +352,7 @@
static bool
rpmaug_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, nullptr);
rpmaug aug = ptr;
jsint tiny = JSVAL_TO_INT(id);
@@ -387,7 +387,7 @@
static bool
rpmaug_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, nullptr);
rpmaug aug = ptr;
jsint tiny = JSVAL_TO_INT(id);
@@ -424,7 +424,7 @@
rpmaug_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, nullptr);
rpmaug aug = ptr;
_RESOLVE_DEBUG_ENTRY(_debug);
@@ -531,7 +531,7 @@
static void
rpmaug_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, nullptr);
rpmaug aug = ptr;
_DTOR_DEBUG_ENTRY(_debug);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmbc-js.c
============================================================================
$ cvs diff -u -r1.4.4.4 -r1.4.4.5 rpmbc-js.c
--- rpm/js/rpmbc-js.c 11 Jul 2017 10:17:11 -0000 1.4.4.4
+++ rpm/js/rpmbc-js.c 11 Jul 2017 10:49:38 -0000 1.4.4.5
@@ -61,7 +61,7 @@
static bool
rpmbc_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmbcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmbcClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
@@ -82,7 +82,7 @@
static bool
rpmbc_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmbcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmbcClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
@@ -105,7 +105,7 @@
rpmbc_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmbcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmbcClass, nullptr);
_RESOLVE_DEBUG_ENTRY(_debug < 0);
@@ -166,7 +166,7 @@
static void
rpmbc_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmbcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmbcClass, nullptr);
rpmbc bc = ptr;
_DTOR_DEBUG_ENTRY(_debug);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmbf-js.c
============================================================================
$ cvs diff -u -r1.10.4.5 -r1.10.4.6 rpmbf-js.c
--- rpm/js/rpmbf-js.c 11 Jul 2017 10:42:14 -0000 1.10.4.5
+++ rpm/js/rpmbf-js.c 11 Jul 2017 10:49:38 -0000 1.10.4.6
@@ -24,7 +24,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmbfClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmbfClass, nullptr);
rpmbf bf = ptr;
bool ok = false;
const char * _s = NULL;
@@ -46,7 +46,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmbfClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmbfClass, nullptr);
rpmbf bf = ptr;
bool ok = false;
const char * _s = NULL;
@@ -67,7 +67,7 @@
rpmbf_clr(JSContext *cx, unsigned argc, Value* vp)
{
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmbfClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmbfClass, nullptr);
rpmbf bf = ptr;
bool ok = false;
@@ -83,7 +83,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmbfClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmbfClass, nullptr);
rpmbf bf = ptr;
bool ok = false;
const char * _s = NULL;
@@ -105,7 +105,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmbfClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmbfClass, nullptr);
rpmbf _a = ptr;
JSObject * o = NULL;
rpmbf _b = NULL;
@@ -130,7 +130,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmbfClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmbfClass, nullptr);
rpmbf _a = ptr;
JSObject * o = NULL;
rpmbf _b = NULL;
@@ -174,7 +174,7 @@
static bool
rpmbf_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmbfClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmbfClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
#ifdef NOTYET
@@ -213,7 +213,7 @@
static bool
rpmbf_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmbfClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmbfClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
#ifdef NOTYET
@@ -254,7 +254,7 @@
rpmbf_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmbfClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmbfClass, nullptr);
#ifdef NOTYET
rpmbf bf = ptr;
@@ -365,7 +365,7 @@
static void
rpmbf_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmbfClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmbfClass, nullptr);
rpmbf bf = ptr;
_DTOR_DEBUG_ENTRY(_debug);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmcudf-js.c
============================================================================
$ cvs diff -u -r1.6.4.5 -r1.6.4.6 rpmcudf-js.c
--- rpm/js/rpmcudf-js.c 11 Jul 2017 10:42:14 -0000 1.6.4.5
+++ rpm/js/rpmcudf-js.c 11 Jul 2017 10:49:38 -0000 1.6.4.6
@@ -45,7 +45,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmcudfClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmcudfClass, nullptr);
rpmcudf cudf = ptr;
JSObject *fno = NULL;
bool ok = false;
@@ -77,7 +77,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmcudfClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmcudfClass, nullptr);
rpmcudf cudf = ptr;
bool ok = false;
@@ -131,7 +131,7 @@
static bool
rpmcudf_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmcudfClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmcudfClass, nullptr);
rpmcudf cudf = ptr;
jsint tiny = JSVAL_TO_INT(id);
@@ -192,7 +192,7 @@
static bool
rpmcudf_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval
*vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmcudfClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmcudfClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
@@ -215,7 +215,7 @@
rpmcudf_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmcudfClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmcudfClass, nullptr);
_RESOLVE_DEBUG_ENTRY(_debug < 0);
@@ -294,7 +294,7 @@
static void
rpmcudf_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmcudfClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmcudfClass, nullptr);
rpmcudf cudf = ptr;
_DTOR_DEBUG_ENTRY(_debug);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmdb-js.c
============================================================================
$ cvs diff -u -r1.31.4.5 -r1.31.4.6 rpmdb-js.c
--- rpm/js/rpmdb-js.c 11 Jul 2017 10:42:14 -0000 1.31.4.5
+++ rpm/js/rpmdb-js.c 11 Jul 2017 10:49:38 -0000 1.31.4.6
@@ -139,7 +139,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, nullptr);
DB * db = ptr;
JSObject * o_txn = NULL;
DB_TXN * _txn = NULL;
@@ -192,7 +192,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, nullptr);
DB * db = ptr;
JSObject * o_db = NULL;
DB * _secondary = NULL;
@@ -243,7 +243,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, nullptr);
DB * db = ptr;
uint32_t _flags = 0;
bool ok = false;
@@ -272,7 +272,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, nullptr);
DB * db = ptr;
JSObject * o = NULL;
DB_TXN * _txn = NULL;
@@ -313,7 +313,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, nullptr);
DB * db = ptr;
JSObject * o = NULL;
DB_TXN * _txn = NULL;
@@ -363,7 +363,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, nullptr);
DB * db = ptr;
JSObject * o = NULL;
DB_TXN * _txn = NULL;
@@ -412,7 +412,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, nullptr);
DB * db = ptr;
JSObject * o = NULL;
DB_TXN * _txn = NULL;
@@ -462,7 +462,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, nullptr);
DB * db = ptr;
JSObject * o = NULL;
DB_TXN * _txn = NULL;
@@ -524,7 +524,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, nullptr);
DB * db = ptr;
JSObject * o = NULL;
DBC * _dbc = NULL;
@@ -593,7 +593,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, nullptr);
DB * db = ptr;
JSObject * o = NULL;
DB_TXN * _txn = NULL;
@@ -649,7 +649,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, nullptr);
DB * db = ptr;
JSObject * o = NULL;
DB_TXN * _txn = NULL;
@@ -706,7 +706,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, nullptr);
DB * db = ptr;
JSObject * o = NULL;
DB_TXN * _txn = NULL;
@@ -761,7 +761,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, nullptr);
DB * db = ptr;
JSObject * o = NULL;
DB_TXN * _txn = NULL;
@@ -815,7 +815,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, nullptr);
DB * db = ptr;
const char * _file = NULL;
const char * _database = NULL;
@@ -851,7 +851,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, nullptr);
DB * db = ptr;
const char * _file = NULL;
const char * _database = NULL;
@@ -888,7 +888,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, nullptr);
DB * db = ptr;
JSObject * o = NULL;
DB_TXN * _txn = NULL;
@@ -928,7 +928,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, nullptr);
DB * db = ptr;
uint32_t _flags = DB_STAT_ALL; /* XXX DB_FAST_STAT is saner default */
bool ok = false;
@@ -960,7 +960,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, nullptr);
DB * db = ptr;
bool ok = false;
@@ -990,7 +990,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, nullptr);
DB * db = ptr;
JSObject * o = NULL;
DB_TXN * _txn = NULL;
@@ -1029,7 +1029,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, nullptr);
DB * db = ptr;
const char * _file = NULL;
bool ok = false;
@@ -1063,7 +1063,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, nullptr);
DB * db = ptr;
const char * _file = NULL;
const char * _database = NULL;
@@ -1267,7 +1267,7 @@
rpmdb_getFastStats(JSContext *cx, JSObject *obj, jsval id, jsval *vp,
void * _txn, uint32_t flags)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, nullptr);
DB * db = ptr;
jsint tiny = JSVAL_TO_INT(id);
@@ -1373,7 +1373,7 @@
static bool
rpmdb_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, nullptr);
DB * db = ptr;
const char ** _av = NULL;
int _ac = 0;
@@ -1525,7 +1525,7 @@
static bool
rpmdb_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, nullptr);
DB * db = ptr;
const char * _s = NULL;
uint32_t _gb = 0;
@@ -1622,7 +1622,7 @@
rpmdb_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, nullptr);
_RESOLVE_DEBUG_ENTRY(_debug < 0);
@@ -1697,7 +1697,7 @@
static void
rpmdb_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, nullptr);
DB * db = ptr;
uint32_t _flags = 0;
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmdbc-js.c
============================================================================
$ cvs diff -u -r1.14.4.5 -r1.14.4.6 rpmdbc-js.c
--- rpm/js/rpmdbc-js.c 11 Jul 2017 10:42:14 -0000 1.14.4.5
+++ rpm/js/rpmdbc-js.c 11 Jul 2017 10:49:38 -0000 1.14.4.6
@@ -47,7 +47,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, nullptr);
DBC * dbc = ptr;
bool ok = false;
@@ -75,7 +75,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, nullptr);
DBC * dbc = ptr;
JSObject * _o = NULL;
DBC * _otherdbc = NULL;
@@ -118,7 +118,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, nullptr);
DBC * dbc = ptr;
bool ok = false;
@@ -153,7 +153,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, nullptr);
DBC * dbc = ptr;
uint32_t _flags = 0;
bool ok = false;
@@ -189,7 +189,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, nullptr);
DBC * dbc = ptr;
uint32_t _flags = 0;
bool ok = false;
@@ -234,7 +234,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, nullptr);
DBC * dbc = ptr;
jsval _kv = JSVAL_NULL;
_RPMDBT _k = _RPMDBT_INIT;
@@ -288,7 +288,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, nullptr);
DBC * dbc = ptr;
jsval _kv = JSVAL_NULL;
_RPMDBT _k = _RPMDBT_INIT;
@@ -336,7 +336,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, nullptr);
DBC * dbc = ptr;
jsval _kv = JSVAL_NULL;
_RPMDBT _k = _RPMDBT_INIT;
@@ -412,7 +412,7 @@
static bool
rpmdbc_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, nullptr);
DBC * dbc = ptr;
jsint tiny = JSVAL_TO_INT(id);
@@ -451,7 +451,7 @@
static bool
rpmdbc_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, nullptr);
DBC * dbc = ptr;
jsint tiny = JSVAL_TO_INT(id);
@@ -484,7 +484,7 @@
rpmdbc_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, nullptr);
_RESOLVE_DEBUG_ENTRY(_debug < 0);
@@ -504,7 +504,7 @@
rpmdbc_enumerate(JSContext *cx, JSObject *obj, JSIterateOp op,
jsval *statep, jsid *idp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, nullptr);
DBC * dbc = ptr;
_ENUMERATE_DEBUG_ENTRY(_debug < 0);
@@ -592,7 +592,7 @@
static void
rpmdbc_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, nullptr);
DBC * dbc = ptr;
_DTOR_DEBUG_ENTRY(_debug);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmdbe-js.c
============================================================================
$ cvs diff -u -r1.21.4.6 -r1.21.4.7 rpmdbe-js.c
--- rpm/js/rpmdbe-js.c 11 Jul 2017 10:42:14 -0000 1.21.4.6
+++ rpm/js/rpmdbe-js.c 11 Jul 2017 10:49:38 -0000 1.21.4.7
@@ -158,7 +158,7 @@
CallArgs argv = CallArgsFromVp(argc, vp);
#endif
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
bool ok = false;
@@ -202,7 +202,7 @@
CallArgs argv = CallArgsFromVp(argc, vp);
#endif
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
uint32_t _flags = 0;
bool ok = false;
@@ -232,7 +232,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
JSString * js_file = NULL;
JSString * js_database = NULL;
@@ -271,7 +271,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
JSString * js_file = NULL;
JSString * js_database = NULL;
@@ -312,7 +312,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
uint32_t _flags = 0;
bool ok = false;
@@ -351,7 +351,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
JSString * js_file = NULL;
uint32_t _flags = 0;
@@ -385,7 +385,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
uint32_t _flags = 0;
uint32_t _atype = DB_LOCK_EXPIRE;
@@ -457,7 +457,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
uint32_t _id = 0;
uint32_t _flags = 0;
@@ -496,7 +496,7 @@
CallArgs argv = CallArgsFromVp(argc, vp);
#endif
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
bool ok = false;
@@ -525,7 +525,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
uint32_t _id = 0;
bool ok = false;
@@ -559,7 +559,7 @@
CallArgs argv = CallArgsFromVp(argc, vp);
#endif
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
bool ok = false;
@@ -593,7 +593,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
uint32_t _flags = 0;
bool ok = false;
@@ -627,7 +627,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
uint32_t _flags = DB_STAT_ALL;
bool ok = false;
@@ -659,7 +659,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
uint32_t _id = 0;
uint32_t _flags = 0;
@@ -693,7 +693,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
uint32_t _flags = DB_ARCH_ABS | DB_ARCH_LOG;
bool ok = false;
@@ -748,7 +748,7 @@
CallArgs argv = CallArgsFromVp(argc, vp);
#endif
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
bool ok = false;
@@ -770,7 +770,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
DB_LSN _lsn = { 0, 0 };
bool ok = false;
@@ -807,7 +807,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
DB_LSN _lsn = { 0, 0 };
bool ok = false;
@@ -839,7 +839,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
JSString * js_fmt = NULL;
bool ok = false;
@@ -875,7 +875,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
DB_LSN _lsn = { 0, 0 };
uint32_t _flags = DB_FLUSH;
@@ -911,7 +911,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
uint32_t _flags = 0;
bool ok = false;
@@ -945,7 +945,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
uint32_t _flags = DB_STAT_ALL;
bool ok = false;
@@ -977,7 +977,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
JSString * js_file = NULL;
uint32_t _flags = 0;
@@ -1014,7 +1014,7 @@
CallArgs argv = CallArgsFromVp(argc, vp);
#endif
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
bool ok = false;
@@ -1038,7 +1038,7 @@
CallArgs argv = CallArgsFromVp(argc, vp);
#endif
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
bool ok = false;
@@ -1060,7 +1060,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
uint32_t _flags = 0;
bool ok = false;
@@ -1099,7 +1099,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
uint32_t _flags = DB_STAT_ALL;
bool ok = false;
@@ -1131,7 +1131,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
DB_LSN _lsn = { 0, 0 };
bool ok = false;
@@ -1164,7 +1164,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
int _percent = 20;
bool ok = false;
@@ -1199,7 +1199,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
uint32_t _flags = 0;
bool ok = false;
@@ -1233,7 +1233,7 @@
CallArgs argv = CallArgsFromVp(argc, vp);
#endif
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
bool ok = false;
@@ -1264,7 +1264,7 @@
CallArgs argv = CallArgsFromVp(argc, vp);
#endif
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
bool ok = false;
@@ -1292,7 +1292,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
uint32_t _flags = 0;
bool ok = false;
@@ -1326,7 +1326,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
uint32_t _flags = DB_STAT_ALL;
bool ok = false;
@@ -1360,7 +1360,7 @@
CallArgs argv = CallArgsFromVp(argc, vp);
#endif
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
bool ok = false;
@@ -1388,7 +1388,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
JSString * js_home = NULL;
uint32_t _eflags = 0;
@@ -1434,7 +1434,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
JSString * js_home = NULL;
uint32_t _flags = 0;
@@ -1471,7 +1471,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
uint32_t _nsites = 0;
uint32_t _nvotes = 0;
@@ -1507,7 +1507,7 @@
CallArgs argv = CallArgsFromVp(argc, vp);
#endif
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
bool ok = false;
@@ -1531,7 +1531,7 @@
CallArgs argv = CallArgsFromVp(argc, vp);
#endif
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
bool ok = false;
@@ -1553,7 +1553,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
uint32_t _flags = 0;
bool ok = false;
@@ -1587,7 +1587,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
uint32_t _flags = DB_STAT_ALL;
bool ok = false;
@@ -1619,7 +1619,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
uint32_t _flags = 0;
bool ok = false;
@@ -1653,7 +1653,7 @@
CallArgs argv = CallArgsFromVp(argc, vp);
#endif
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
bool ok = false;
@@ -1675,7 +1675,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
uint32_t _flags = 0;
bool ok = false;
@@ -1709,7 +1709,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
uint32_t _flags = DB_STAT_ALL;
bool ok = false;
@@ -1741,7 +1741,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
uint32_t _flags = DB_STAT_ALL;
bool ok = false;
@@ -1775,7 +1775,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
JSObject * o = NULL;
DB_TXN * _parent = NULL;
@@ -1825,7 +1825,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
uint32_t _kb = 0;
uint32_t _minutes = 0;
@@ -1861,7 +1861,7 @@
CallArgs argv = CallArgsFromVp(argc, vp);
#endif
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
bool ok = false;
@@ -1909,7 +1909,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
uint32_t _flags = 0;
bool ok = false;
@@ -1943,7 +1943,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
uint32_t _flags = DB_STAT_ALL;
bool ok = false;
@@ -2320,7 +2320,7 @@
static bool
rpmdbe_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
const char ** _av = NULL;
int _ac = 0;
@@ -2516,7 +2516,7 @@
static bool
rpmdbe_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
#ifdef NOTYET
const char ** _av = NULL;
@@ -2739,7 +2739,7 @@
rpmdbe_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
_RESOLVE_DEBUG_ENTRY(_debug < 0);
@@ -2812,7 +2812,7 @@
static void
rpmdbe_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
DB_ENV * dbenv = ptr;
uint32_t _flags = 0;
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmdc-js.c
============================================================================
$ cvs diff -u -r1.9.4.5 -r1.9.4.6 rpmdc-js.c
--- rpm/js/rpmdc-js.c 11 Jul 2017 10:42:14 -0000 1.9.4.5
+++ rpm/js/rpmdc-js.c 11 Jul 2017 10:49:38 -0000 1.9.4.6
@@ -47,7 +47,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdcClass, nullptr);
rpmdc dc = ptr;
bool ok = false;
unsigned int _dalgo = PGPHASHALGO_NONE;
@@ -78,7 +78,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdcClass, nullptr);
rpmdc dc = ptr;
bool ok = false;
const char * s = NULL;
@@ -106,7 +106,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdcClass, nullptr);
rpmdc dc = ptr;
bool ok = false;
const char * s = NULL;
@@ -160,7 +160,7 @@
static bool
rpmdc_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdcClass, nullptr);
rpmdc dc = ptr;
jsint tiny = JSVAL_TO_INT(id);
@@ -185,7 +185,7 @@
static bool
rpmdc_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdcClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
_PROP_DEBUG_ENTRY(_debug < 0);
@@ -211,7 +211,7 @@
rpmdc_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdcClass, nullptr);
_RESOLVE_DEBUG_ENTRY(_debug < 0);
@@ -277,7 +277,7 @@
static void
rpmdc_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdcClass, nullptr);
rpmdc dc = ptr;
_DTOR_DEBUG_ENTRY(_debug);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmdig-js.c
============================================================================
$ cvs diff -u -r1.5.2.4 -r1.5.2.5 rpmdig-js.c
--- rpm/js/rpmdig-js.c 11 Jul 2017 10:17:11 -0000 1.5.2.4
+++ rpm/js/rpmdig-js.c 11 Jul 2017 10:49:38 -0000 1.5.2.5
@@ -57,7 +57,7 @@
static bool
rpmdig_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdigClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdigClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
@@ -78,7 +78,7 @@
static bool
rpmdig_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdigClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdigClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
@@ -101,7 +101,7 @@
rpmdig_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdigClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdigClass, nullptr);
_RESOLVE_DEBUG_ENTRY(_debug < 0);
@@ -162,7 +162,7 @@
static void
rpmdig_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdigClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdigClass, nullptr);
pgpDig dig = ptr;
_DTOR_DEBUG_ENTRY(_debug);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmdir-js.c
============================================================================
$ cvs diff -u -r1.8.4.4 -r1.8.4.5 rpmdir-js.c
--- rpm/js/rpmdir-js.c 11 Jul 2017 10:17:11 -0000 1.8.4.4
+++ rpm/js/rpmdir-js.c 11 Jul 2017 10:49:38 -0000 1.8.4.5
@@ -56,7 +56,7 @@
static bool
rpmdir_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdirClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdirClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
_PROP_DEBUG_ENTRY(_debug < 0);
@@ -77,7 +77,7 @@
static bool
rpmdir_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdirClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdirClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
_PROP_DEBUG_ENTRY(_debug < 0);
@@ -102,7 +102,7 @@
rpmdir_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdirClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdirClass, nullptr);
_RESOLVE_DEBUG_ENTRY(_debug < 0);
@@ -122,7 +122,7 @@
rpmdir_enumerate(JSContext *cx, JSObject *obj, JSIterateOp op,
jsval *statep, jsid *idp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdirClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdirClass, nullptr);
DIR * dir = ptr;
struct dirent * dp;
unsigned int ix = 0;
@@ -194,7 +194,7 @@
static void
rpmdir_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdirClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdirClass, nullptr);
DIR * dir = ptr;
_DTOR_DEBUG_ENTRY(_debug);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmds-js.c
============================================================================
$ cvs diff -u -r1.20.4.4 -r1.20.4.5 rpmds-js.c
--- rpm/js/rpmds-js.c 11 Jul 2017 10:17:11 -0000 1.20.4.4
+++ rpm/js/rpmds-js.c 11 Jul 2017 10:49:38 -0000 1.20.4.5
@@ -72,7 +72,7 @@
static bool
rpmds_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdsClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdsClass, nullptr);
rpmds ds = ptr;
jsint tiny = JSVAL_TO_INT(id);
int ix;
@@ -148,7 +148,7 @@
static bool
rpmds_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdsClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdsClass, nullptr);
rpmds ds = (rpmds)ptr;
jsint tiny = JSVAL_TO_INT(id);
int myint;
@@ -217,7 +217,7 @@
rpmds_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdsClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdsClass, nullptr);
rpmds ds = ptr;
jsint ix;
bool ok = false;
@@ -274,7 +274,7 @@
rpmds_enumerate(JSContext *cx, JSObject *obj, JSIterateOp op,
jsval *statep, jsid *idp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdsClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdsClass, nullptr);
rpmds ds = (rpmds)ptr;
int ix;
@@ -413,7 +413,7 @@
static void
rpmds_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdsClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdsClass, nullptr);
rpmds ds = ptr;
_DTOR_DEBUG_ENTRY(_debug);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmfc-js.c
============================================================================
$ cvs diff -u -r1.4.4.4 -r1.4.4.5 rpmfc-js.c
--- rpm/js/rpmfc-js.c 11 Jul 2017 10:17:12 -0000 1.4.4.4
+++ rpm/js/rpmfc-js.c 11 Jul 2017 10:49:38 -0000 1.4.4.5
@@ -59,7 +59,7 @@
static bool
rpmfc_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmfcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmfcClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
@@ -80,7 +80,7 @@
static bool
rpmfc_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmfcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmfcClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
@@ -103,7 +103,7 @@
rpmfc_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmfcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmfcClass, nullptr);
_RESOLVE_DEBUG_ENTRY(_debug < 0);
@@ -164,7 +164,7 @@
static void
rpmfc_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmfcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmfcClass, nullptr);
rpmfc fc = ptr;
_DTOR_DEBUG_ENTRY(_debug);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmfi-js.c
============================================================================
$ cvs diff -u -r1.15.4.4 -r1.15.4.5 rpmfi-js.c
--- rpm/js/rpmfi-js.c 11 Jul 2017 10:17:12 -0000 1.15.4.4
+++ rpm/js/rpmfi-js.c 11 Jul 2017 10:49:38 -0000 1.15.4.5
@@ -91,7 +91,7 @@
static bool
rpmfi_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmfiClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmfiClass, nullptr);
rpmfi fi = ptr;
jsint tiny = JSVAL_TO_INT(id);
int ix;
@@ -229,7 +229,7 @@
static bool
rpmfi_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmfiClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmfiClass, nullptr);
rpmfi fi = (rpmfi)ptr;
jsint tiny = JSVAL_TO_INT(id);
int myint;
@@ -272,7 +272,7 @@
rpmfi_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmfiClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmfiClass, nullptr);
rpmfi fi = ptr;
bool ok = false;
int ix;
@@ -319,7 +319,7 @@
rpmfi_enumerate(JSContext *cx, JSObject *obj, JSIterateOp op,
jsval *statep, jsid *idp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmfiClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmfiClass, nullptr);
rpmfi fi = ptr;
int ix;
@@ -369,7 +369,7 @@
static void
rpmfi_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmfiClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmfiClass, nullptr);
rpmfi fi = ptr;
_DTOR_DEBUG_ENTRY(_debug);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmfts-js.c
============================================================================
$ cvs diff -u -r1.10.4.5 -r1.10.4.6 rpmfts-js.c
--- rpm/js/rpmfts-js.c 11 Jul 2017 10:42:14 -0000 1.10.4.5
+++ rpm/js/rpmfts-js.c 11 Jul 2017 10:49:38 -0000 1.10.4.6
@@ -95,7 +95,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmftsClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmftsClass, nullptr);
FTS * fts = ptr;
FTSENT * p;
int _instr = FTS_NOINSTR;
@@ -120,7 +120,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmftsClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmftsClass, nullptr);
FTS * fts = ptr;
bool ok = false;
@@ -144,7 +144,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmftsClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmftsClass, nullptr);
FTS * fts = ptr;
JSObject *dno = NULL;
int _options = -1;
@@ -177,7 +177,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmftsClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmftsClass, nullptr);
FTS * fts = ptr;
bool ok = false;
@@ -194,7 +194,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmftsClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmftsClass, nullptr);
FTS * fts = ptr;
FTSENT * p = (fts ? fts->fts_cur : NULL);
int _instr = FTS_NOINSTR;
@@ -302,7 +302,7 @@
static bool
rpmfts_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmftsClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmftsClass, nullptr);
FTS * fts = ptr;
FTSENT * p = (fts ? fts->fts_cur : NULL);
jsint tiny = JSVAL_TO_INT(id);
@@ -373,7 +373,7 @@
static bool
rpmfts_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmftsClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmftsClass, nullptr);
FTS * fts = ptr;
FTSENT * p = (fts ? fts->fts_cur : NULL);
jsint tiny = JSVAL_TO_INT(id);
@@ -433,7 +433,7 @@
rpmfts_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmftsClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmftsClass, nullptr);
_RESOLVE_DEBUG_ENTRY(_debug < 0);
@@ -453,7 +453,7 @@
rpmfts_enumerate(JSContext *cx, JSObject *obj, JSIterateOp op,
jsval *statep, jsid *idp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmftsClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmftsClass, nullptr);
FTS * fts = ptr;
FTSENT * p;
unsigned int ix = 0;
@@ -500,7 +500,7 @@
static void
rpmfts_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmftsClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmftsClass, nullptr);
FTS * fts = ptr;
_DTOR_DEBUG_ENTRY(_debug);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmgi-js.c
============================================================================
$ cvs diff -u -r1.4.4.4 -r1.4.4.5 rpmgi-js.c
--- rpm/js/rpmgi-js.c 11 Jul 2017 10:17:12 -0000 1.4.4.4
+++ rpm/js/rpmgi-js.c 11 Jul 2017 10:49:38 -0000 1.4.4.5
@@ -59,7 +59,7 @@
static bool
rpmgi_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmgiClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmgiClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
@@ -80,7 +80,7 @@
static bool
rpmgi_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmgiClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmgiClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
@@ -103,7 +103,7 @@
rpmgi_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmgiClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmgiClass, nullptr);
_RESOLVE_DEBUG_ENTRY(_debug < 0);
@@ -168,7 +168,7 @@
static void
rpmgi_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmgiClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmgiClass, nullptr);
rpmgi gi = ptr;
_DTOR_DEBUG_ENTRY(_debug);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmhdr-js.c
============================================================================
$ cvs diff -u -r1.24.4.5 -r1.24.4.6 rpmhdr-js.c
--- rpm/js/rpmhdr-js.c 11 Jul 2017 10:42:14 -0000 1.24.4.5
+++ rpm/js/rpmhdr-js.c 11 Jul 2017 10:49:38 -0000 1.24.4.6
@@ -148,7 +148,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmhdrClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmhdrClass, nullptr);
rpmTag tagN = RPMTAG_NAME;
bool ok = false;
@@ -167,7 +167,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmhdrClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmhdrClass, nullptr);
Header h = ptr;
rpmTag tagN = RPMTAG_BASENAMES;
bool ok = false;
@@ -187,7 +187,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmhdrClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmhdrClass, nullptr);
Header h = ptr;
char * qfmt = NULL;
const char * s = NULL;
@@ -212,7 +212,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmhdrClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmhdrClass, nullptr);
Header h = ptr;
bool ok = false;
@@ -228,7 +228,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmhdrClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmhdrClass, nullptr);
Header h = ptr;
char * s = NULL;
bool ok = false;
@@ -267,7 +267,7 @@
static bool
rpmhdr_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmhdrClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmhdrClass, nullptr);
Header h = ptr;
jsint tiny = JSVAL_TO_INT(id);
@@ -298,7 +298,7 @@
static bool
rpmhdr_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmhdrClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmhdrClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
_PROP_DEBUG_ENTRY(_debug < 0);
@@ -323,7 +323,7 @@
rpmhdr_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmhdrClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmhdrClass, nullptr);
Header h = ptr;
bool ok = false;
@@ -360,7 +360,7 @@
static void
rpmhi_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmhiClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmhiClass, nullptr);
HeaderIterator hi = ptr;
if (_debug)
@@ -381,7 +381,7 @@
rpmhdr_enumerate(JSContext *cx, JSObject *obj, JSIterateOp op,
jsval *statep, jsid *idp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmhdrClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmhdrClass, nullptr);
Header h = ptr;
HeaderIterator hi = NULL;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
@@ -453,7 +453,7 @@
static void
rpmhdr_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmhdrClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmhdrClass, nullptr);
Header h = ptr;
_DTOR_DEBUG_ENTRY(_debug);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmio-js.c
============================================================================
$ cvs diff -u -r1.9.4.5 -r1.9.4.6 rpmio-js.c
--- rpm/js/rpmio-js.c 11 Jul 2017 10:42:14 -0000 1.9.4.5
+++ rpm/js/rpmio-js.c 11 Jul 2017 10:49:38 -0000 1.9.4.6
@@ -68,7 +68,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, nullptr);
FD_t fd = ptr;
jsuint _dalgo = PGPHASHALGO_MD5;
jsuint _flags = 0;
@@ -89,7 +89,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, nullptr);
FD_t fd = ptr;
jsuint _dalgo = PGPHASHALGO_MD5;
bool ok;
@@ -113,7 +113,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, nullptr);
FD_t fd = ptr;
jsint _uid = -1;
jsint _gid = -1;
@@ -135,7 +135,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, nullptr);
FD_t fd = ptr;
bool ok = false;
@@ -159,7 +159,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, nullptr);
FD_t fd = ptr;
const char * _fmode = "r.ufdio";
bool ok = false;
@@ -190,7 +190,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, nullptr);
FD_t fd = ptr;
_METHOD_DEBUG_ENTRY(_debug);
@@ -203,7 +203,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, nullptr);
FD_t fd = ptr;
_METHOD_DEBUG_ENTRY(_debug);
@@ -217,7 +217,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, nullptr);
FD_t fd = ptr;
bool ok = JSVAL_TRUE;
int rc = -3;
@@ -241,7 +241,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, nullptr);
FD_t fd = ptr;
int fdno;
@@ -256,7 +256,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, nullptr);
FD_t fd = ptr;
const char * _fn = NULL;
const char * _fmode = "r.ufdio";
@@ -288,7 +288,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, nullptr);
FD_t fd = ptr;
bool ok = false;
static jsuint _nbmax = 16 * BUFSIZ;
@@ -327,7 +327,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, nullptr);
FD_t fd = ptr;
bool ok;
jsint _offset = 0;
@@ -347,7 +347,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, nullptr);
FD_t fd = ptr;
bool ok;
jsint _offset = 0;
@@ -368,7 +368,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, nullptr);
FD_t fd = ptr;
bool ok = false;
struct stat sb;
@@ -399,7 +399,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, nullptr);
FD_t fd = ptr;
bool ok = JSVAL_TRUE;
int rc = -3;
@@ -415,7 +415,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, nullptr);
FD_t fd = ptr;
bool ok = false;
const char * b = NULL;
@@ -447,7 +447,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, nullptr);
FD_t fd = ptr;
bool ok = JSVAL_TRUE;
@@ -525,7 +525,7 @@
static bool
rpmio_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, nullptr);
FD_t fd = ptr;
jsint tiny = JSVAL_TO_INT(id);
@@ -558,7 +558,7 @@
static bool
rpmio_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
_PROP_DEBUG_ENTRY(_debug < 0);
@@ -583,7 +583,7 @@
rpmio_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, nullptr);
_RESOLVE_DEBUG_ENTRY(_debug < 0);
@@ -604,7 +604,7 @@
jsval *statep, jsid *idp)
{
#ifdef NOTYET
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, nullptr);
FD_t fd = ptr;
unsigned int ix = 0;
#endif
@@ -654,7 +654,7 @@
static void
rpmio_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, nullptr);
FD_t fd = ptr;
_DTOR_DEBUG_ENTRY(_debug);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmiob-js.c
============================================================================
$ cvs diff -u -r1.4.4.4 -r1.4.4.5 rpmiob-js.c
--- rpm/js/rpmiob-js.c 11 Jul 2017 10:17:12 -0000 1.4.4.4
+++ rpm/js/rpmiob-js.c 11 Jul 2017 10:49:38 -0000 1.4.4.5
@@ -56,7 +56,7 @@
static bool
rpmiob_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmiobClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmiobClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
@@ -77,7 +77,7 @@
static bool
rpmiob_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmiobClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmiobClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
@@ -100,7 +100,7 @@
rpmiob_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmiobClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmiobClass, nullptr);
_RESOLVE_DEBUG_ENTRY(_debug < 0);
@@ -161,7 +161,7 @@
static void
rpmiob_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmiobClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmiobClass, nullptr);
rpmiob iob = ptr;
_DTOR_DEBUG_ENTRY(_debug);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmmc-js.c
============================================================================
$ cvs diff -u -r1.12.4.5 -r1.12.4.6 rpmmc-js.c
--- rpm/js/rpmmc-js.c 11 Jul 2017 10:42:14 -0000 1.12.4.5
+++ rpm/js/rpmmc-js.c 11 Jul 2017 10:49:38 -0000 1.12.4.6
@@ -29,7 +29,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmcClass, nullptr);
rpmmc mc = ptr;
char * s = NULL;
int lvl = 0;
@@ -52,7 +52,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmcClass, nullptr);
rpmmc mc = ptr;
char * s = NULL;
bool ok = false;
@@ -74,7 +74,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmcClass, nullptr);
rpmmc mc = ptr;
void * _mire = NULL;
int used = -1;
@@ -112,7 +112,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmcClass, nullptr);
rpmmc mc = ptr;
char * s;
char * t;
@@ -157,7 +157,7 @@
static bool
rpmmc_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmcClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
@@ -178,7 +178,7 @@
static bool
rpmmc_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmcClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
@@ -201,7 +201,7 @@
rpmmc_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmcClass, nullptr);
_RESOLVE_DEBUG_ENTRY(_debug < 0);
@@ -283,7 +283,7 @@
static void
rpmmc_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmcClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmcClass, nullptr);
rpmmc mc = ptr;
_DTOR_DEBUG_ENTRY(_debug);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmmg-js.c
============================================================================
$ cvs diff -u -r1.4.4.4 -r1.4.4.5 rpmmg-js.c
--- rpm/js/rpmmg-js.c 11 Jul 2017 10:17:12 -0000 1.4.4.4
+++ rpm/js/rpmmg-js.c 11 Jul 2017 10:49:38 -0000 1.4.4.5
@@ -57,7 +57,7 @@
static bool
rpmmg_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmgClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmgClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
_PROP_DEBUG_ENTRY(_debug < 0);
@@ -78,7 +78,7 @@
static bool
rpmmg_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmgClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmgClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
_PROP_DEBUG_ENTRY(_debug < 0);
@@ -103,7 +103,7 @@
rpmmg_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmgClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmgClass, nullptr);
_RESOLVE_DEBUG_ENTRY(_debug < 0);
@@ -124,7 +124,7 @@
jsval *statep, jsid *idp)
{
#ifdef NOTYET
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmgClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmgClass, nullptr);
rpmmg mg = ptr;
struct dirent * dp;
unsigned int ix = 0;
@@ -194,7 +194,7 @@
static void
rpmmg_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmgClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmgClass, nullptr);
rpmmg mg = ptr;
_DTOR_DEBUG_ENTRY(_debug);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmmi-js.c
============================================================================
$ cvs diff -u -r1.28.4.5 -r1.28.4.6 rpmmi-js.c
--- rpm/js/rpmmi-js.c 11 Jul 2017 10:42:14 -0000 1.28.4.5
+++ rpm/js/rpmmi-js.c 11 Jul 2017 10:49:38 -0000 1.28.4.6
@@ -29,7 +29,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmiClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmiClass, nullptr);
rpmmi mi = ptr;
jsval tagid = JSVAL_VOID;
int tag = RPMTAG_NAME;
@@ -74,7 +74,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmiClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmiClass, nullptr);
rpmmi mi = ptr;
uint32_t _u = 0;
bool ok = false;
@@ -97,7 +97,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmiClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmiClass, nullptr);
rpmmi mi = ptr;
uint32_t _u = 0;
bool ok = false;
@@ -120,7 +120,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmiClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmiClass, nullptr);
rpmmi mi = ptr;
const char * _bn = NULL;
bool ok = false;
@@ -165,7 +165,7 @@
static bool
rpmmi_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmiClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmiClass, nullptr);
rpmmi mi = ptr;
jsint tiny = JSVAL_TO_INT(id);
@@ -204,7 +204,7 @@
static bool
rpmmi_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmiClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmiClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
@@ -227,7 +227,7 @@
rpmmi_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmiClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmiClass, nullptr);
rpmmi mi = ptr;
JSObject *o = (JSVAL_IS_OBJECT(id) ? JSVAL_TO_OBJECT(id) : NULL);
JSClass *c = (o ? JS_GET_CLASS(cx, o) : NULL);
@@ -263,7 +263,7 @@
rpmmi_enumerate(JSContext *cx, JSObject *obj, JSIterateOp op,
jsval *statep, jsid *idp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmiClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmiClass, nullptr);
rpmmi mi = ptr;
Header h;
@@ -345,7 +345,7 @@
static void
rpmmi_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmiClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmiClass, nullptr);
rpmmi mi = ptr;
_DTOR_DEBUG_ENTRY(_debug);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmmpf-js.c
============================================================================
$ cvs diff -u -r1.7.4.5 -r1.7.4.6 rpmmpf-js.c
--- rpm/js/rpmmpf-js.c 11 Jul 2017 10:42:14 -0000 1.7.4.5
+++ rpm/js/rpmmpf-js.c 11 Jul 2017 10:49:38 -0000 1.7.4.6
@@ -52,7 +52,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpfClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpfClass, nullptr);
DB_MPOOLFILE * mpf = ptr;
uint32_t _flags = 0;
bool ok = false;
@@ -84,7 +84,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpfClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpfClass, nullptr);
DB_MPOOLFILE * mpf = ptr;
JSObject * o = NULL;
DB_TXN * _txn = NULL;
@@ -127,7 +127,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpfClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpfClass, nullptr);
DB_MPOOLFILE * mpf = ptr;
char * _file = NULL;
uint32_t _flags = DB_CREATE;
@@ -168,7 +168,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpfClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpfClass, nullptr);
DB_MPOOLFILE * mpf = ptr;
DB_CACHE_PRIORITY _priority = DB_PRIORITY_UNCHANGED;
bool ok = false;
@@ -207,7 +207,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpfClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpfClass, nullptr);
DB_MPOOLFILE * mpf = ptr;
bool ok = false;
@@ -280,7 +280,7 @@
static bool
rpmmpf_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpfClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpfClass, nullptr);
DB_MPOOLFILE * mpf = ptr;
int32_t _i = 0;
uint32_t _u = 0;
@@ -320,7 +320,7 @@
static bool
rpmmpf_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpfClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpfClass, nullptr);
DB_MPOOLFILE * mpf = ptr;
int32_t _i = 0;
uint32_t _u = 0;
@@ -358,7 +358,7 @@
rpmmpf_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpfClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpfClass, nullptr);
_RESOLVE_DEBUG_ENTRY(_debug < 0);
@@ -429,7 +429,7 @@
static void
rpmmpf_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpfClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpfClass, nullptr);
#ifdef NOTYET /* XXX let BDB handle DB_MPOOLFILE ptrs */
DB_MPOOLFILE * mpf = ptr;
#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmmpw-js.c
============================================================================
$ cvs diff -u -r1.21.4.6 -r1.21.4.7 rpmmpw-js.c
--- rpm/js/rpmmpw-js.c 11 Jul 2017 10:42:14 -0000 1.21.4.6
+++ rpm/js/rpmmpw-js.c 11 Jul 2017 10:49:38 -0000 1.21.4.7
@@ -1791,7 +1791,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, nullptr);
jsuint _base = 10;
bool ok;
@@ -1811,7 +1811,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, nullptr);
jsuint _base = 10;
bool ok = true;
@@ -1827,7 +1827,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, nullptr);
mpwObject * z = ptr;
size_t zsize = (z ? MPW_SIZE(z) : 0);
mpw * zdata = (z ? MPW_DATA(z) : NULL);
@@ -1865,7 +1865,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, nullptr);
mpwObject * q = ptr;
bool ok = true;
@@ -1900,7 +1900,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, nullptr);
bool ok = true;
_METHOD_DEBUG_ENTRY(_debug);
@@ -1934,7 +1934,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, nullptr);
bool ok = true;
_METHOD_DEBUG_ENTRY(_debug);
@@ -1978,7 +1978,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, nullptr);
bool ok = true;
_METHOD_DEBUG_ENTRY(_debug);
@@ -2022,7 +2022,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, nullptr);
bool ok = true;
_METHOD_DEBUG_ENTRY(_debug);
@@ -2058,7 +2058,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, nullptr);
bool ok = true;
_METHOD_DEBUG_ENTRY(_debug);
@@ -2095,7 +2095,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, nullptr);
bool ok;
_METHOD_DEBUG_ENTRY(_debug);
@@ -2142,7 +2142,7 @@
static bool
rpmmpw_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
@@ -2163,7 +2163,7 @@
static bool
rpmmpw_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
@@ -2186,7 +2186,7 @@
rpmmpw_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, nullptr);
_RESOLVE_DEBUG_ENTRY(_debug < 0);
@@ -2261,7 +2261,7 @@
static void
rpmmpw_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, nullptr);
mpwObject * z = ptr;
_DTOR_DEBUG_ENTRY(_debug);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmps-js.c
============================================================================
$ cvs diff -u -r1.18.4.5 -r1.18.4.6 rpmps-js.c
--- rpm/js/rpmps-js.c 11 Jul 2017 10:42:14 -0000 1.18.4.5
+++ rpm/js/rpmps-js.c 11 Jul 2017 10:49:38 -0000 1.18.4.6
@@ -27,7 +27,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmpsClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmpsClass, nullptr);
rpmps ps = ptr;
char *pkgNEVR;
char *altNEVR;
@@ -55,7 +55,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmpsClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmpsClass, nullptr);
rpmps ps = ptr;
bool ok = false;
@@ -88,7 +88,7 @@
static bool
rpmps_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmpsClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmpsClass, nullptr);
rpmps ps = ptr;
jsint tiny = JSVAL_TO_INT(id);
@@ -113,7 +113,7 @@
static bool
rpmps_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmpsClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmpsClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
@@ -136,7 +136,7 @@
rpmps_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmpsClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmpsClass, nullptr);
rpmps ps = ptr;
_RESOLVE_DEBUG_ENTRY(_debug);
@@ -224,7 +224,7 @@
static void
rpmps_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmpsClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmpsClass, nullptr);
rpmps ps = ptr;
_DTOR_DEBUG_ENTRY(_debug);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmseq-js.c
============================================================================
$ cvs diff -u -r1.7.4.5 -r1.7.4.6 rpmseq-js.c
--- rpm/js/rpmseq-js.c 11 Jul 2017 10:42:14 -0000 1.7.4.5
+++ rpm/js/rpmseq-js.c 11 Jul 2017 10:49:38 -0000 1.7.4.6
@@ -48,7 +48,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmseqClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmseqClass, nullptr);
DB_SEQUENCE * seq = ptr;
uint32_t _flags = 0;
bool ok = false;
@@ -80,7 +80,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmseqClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmseqClass, nullptr);
DB_SEQUENCE * seq = ptr;
JSObject * o = NULL;
DB_TXN * _txn = NULL;
@@ -128,7 +128,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmseqClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmseqClass, nullptr);
DB_SEQUENCE * seq = ptr;
JSObject * o = NULL;
DB_TXN * _txn = NULL;
@@ -174,7 +174,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmseqClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmseqClass, nullptr);
DB_SEQUENCE * seq = ptr;
JSObject * o = NULL;
DB_TXN * _txn = NULL;
@@ -217,7 +217,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmseqClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmseqClass, nullptr);
DB_SEQUENCE * seq = ptr;
uint32_t _flags = 0;
bool ok = false;
@@ -250,7 +250,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmseqClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmseqClass, nullptr);
DB_SEQUENCE * seq = ptr;
uint32_t _flags = 0;
bool ok = false;
@@ -335,7 +335,7 @@
static bool
rpmseq_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmseqClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmseqClass, nullptr);
DB_SEQUENCE * seq = ptr;
jsint tiny = JSVAL_TO_INT(id);
jsdouble d = 0;
@@ -443,7 +443,7 @@
static bool
rpmseq_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmseqClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmseqClass, nullptr);
DB_SEQUENCE * seq = ptr;
jsint tiny = JSVAL_TO_INT(id);
jsdouble d = 0;
@@ -520,7 +520,7 @@
rpmseq_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmseqClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmseqClass, nullptr);
_RESOLVE_DEBUG_ENTRY(_debug < 0);
@@ -588,7 +588,7 @@
static void
rpmseq_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmseqClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmseqClass, nullptr);
DB_SEQUENCE * seq = ptr;
_DTOR_DEBUG_ENTRY(_debug);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmsm-js.c
============================================================================
$ cvs diff -u -r1.8.4.4 -r1.8.4.5 rpmsm-js.c
--- rpm/js/rpmsm-js.c 11 Jul 2017 10:17:12 -0000 1.8.4.4
+++ rpm/js/rpmsm-js.c 11 Jul 2017 10:49:38 -0000 1.8.4.5
@@ -73,7 +73,7 @@
static bool
rpmsm_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsmClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsmClass, nullptr);
rpmsm sm = ptr;
jsint tiny = JSVAL_TO_INT(id);
@@ -104,7 +104,7 @@
static bool
rpmsm_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsmClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsmClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
@@ -126,7 +126,7 @@
rpmsm_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsmClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsmClass, nullptr);
_RESOLVE_DEBUG_ENTRY(_debug < 0);
@@ -187,7 +187,7 @@
static void
rpmsm_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsmClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsmClass, nullptr);
rpmsm sm = ptr;
_DTOR_DEBUG_ENTRY(_debug);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmsp-js.c
============================================================================
$ cvs diff -u -r1.4.4.4 -r1.4.4.5 rpmsp-js.c
--- rpm/js/rpmsp-js.c 11 Jul 2017 10:17:12 -0000 1.4.4.4
+++ rpm/js/rpmsp-js.c 11 Jul 2017 10:49:38 -0000 1.4.4.5
@@ -65,7 +65,7 @@
static bool
rpmsp_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmspClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmspClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
@@ -91,7 +91,7 @@
static bool
rpmsp_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmspClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmspClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
@@ -114,7 +114,7 @@
rpmsp_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmspClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmspClass, nullptr);
_RESOLVE_DEBUG_ENTRY(_debug < 0);
@@ -177,7 +177,7 @@
static void
rpmsp_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmspClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmspClass, nullptr);
rpmsp sp = ptr;
_DTOR_DEBUG_ENTRY(_debug);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmst-js.c
============================================================================
$ cvs diff -u -r1.10.4.4 -r1.10.4.5 rpmst-js.c
--- rpm/js/rpmst-js.c 11 Jul 2017 10:17:12 -0000 1.10.4.4
+++ rpm/js/rpmst-js.c 11 Jul 2017 10:49:38 -0000 1.10.4.5
@@ -82,7 +82,7 @@
static bool
rpmst_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmstClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmstClass, nullptr);
struct stat * st = ptr;
jsint tiny = JSVAL_TO_INT(id);
time_t mytime = (time_t)0xffffffff;
@@ -129,7 +129,7 @@
static bool
rpmst_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmstClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmstClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
_PROP_DEBUG_ENTRY(_debug < 0);
@@ -154,7 +154,7 @@
rpmst_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmstClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmstClass, nullptr);
_RESOLVE_DEBUG_ENTRY(_debug < 0);
@@ -235,7 +235,7 @@
static void
rpmst_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmstClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmstClass, nullptr);
struct stat * st = ptr;
_DTOR_DEBUG_ENTRY(_debug);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmsw-js.c
============================================================================
$ cvs diff -u -r1.4.4.4 -r1.4.4.5 rpmsw-js.c
--- rpm/js/rpmsw-js.c 11 Jul 2017 10:17:12 -0000 1.4.4.4
+++ rpm/js/rpmsw-js.c 11 Jul 2017 10:49:38 -0000 1.4.4.5
@@ -60,7 +60,7 @@
static bool
rpmsw_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmswClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmswClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
@@ -81,7 +81,7 @@
static bool
rpmsw_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmswClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmswClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
@@ -104,7 +104,7 @@
rpmsw_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmswClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmswClass, nullptr);
_RESOLVE_DEBUG_ENTRY(_debug < 0);
@@ -165,7 +165,7 @@
static void
rpmsw_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmswClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmswClass, nullptr);
rpmsw sw = ptr;
_DTOR_DEBUG_ENTRY(_debug);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmsx-js.c
============================================================================
$ cvs diff -u -r1.8.4.5 -r1.8.4.6 rpmsx-js.c
--- rpm/js/rpmsx-js.c 11 Jul 2017 10:17:12 -0000 1.8.4.5
+++ rpm/js/rpmsx-js.c 11 Jul 2017 10:49:38 -0000 1.8.4.6
@@ -150,7 +150,7 @@
static bool
rpmsx_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsxClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsxClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
#if defined(WITH_SELINUX)
security_context_t con = NULL;
@@ -230,7 +230,7 @@
rpmsx_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
#if defined(WITH_SELINUX)
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsxClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsxClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
security_context_t con = NULL;
int myint = 0xdeadbeef;
@@ -270,7 +270,7 @@
rpmsx_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsxClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsxClass, nullptr);
_RESOLVE_DEBUG_ENTRY(_debug < 0);
@@ -333,7 +333,7 @@
static void
rpmsx_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsxClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsxClass, nullptr);
rpmsx sx = ptr;
_DTOR_DEBUG_ENTRY(_debug);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmsys-js.c
============================================================================
$ cvs diff -u -r1.8.4.5 -r1.8.4.6 rpmsys-js.c
--- rpm/js/rpmsys-js.c 11 Jul 2017 10:42:14 -0000 1.8.4.5
+++ rpm/js/rpmsys-js.c 11 Jul 2017 10:49:38 -0000 1.8.4.6
@@ -64,7 +64,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, nullptr);
rpmsys sys = ptr;
const char * _path = NULL;
jsuint _mode = F_OK;
@@ -84,7 +84,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, nullptr);
rpmsys sys = ptr;
const char * _path = NULL;
jsuint _mode = F_OK;
@@ -104,7 +104,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, nullptr);
rpmsys sys = ptr;
const char * _path = NULL;
jsint _uid = -1;
@@ -129,7 +129,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, nullptr);
rpmsys sys = ptr;
const char * _path = NULL;
jsuint _mode = 0644;
@@ -157,7 +157,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, nullptr);
rpmsys sys = ptr;
const char * _path = NULL;
jsint _uid = -1;
@@ -179,7 +179,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, nullptr);
rpmsys sys = ptr;
const char * _opath = NULL;
const char * _npath = NULL;
@@ -198,7 +198,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, nullptr);
rpmsys sys = ptr;
const char * _path = NULL;
bool ok;
@@ -229,7 +229,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, nullptr);
rpmsys sys = ptr;
const char * _path = NULL;
jsuint _mode = 0755;
@@ -249,7 +249,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, nullptr);
rpmsys sys = ptr;
const char * _path = NULL;
jsuint _mode = 0755;
@@ -269,7 +269,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, nullptr);
rpmsys sys = ptr;
const char * _path = NULL;
jsuint _mode = 0755;
@@ -291,7 +291,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, nullptr);
rpmsys sys = ptr;
const char * _path = NULL;
bool ok;
@@ -318,7 +318,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, nullptr);
rpmsys sys = ptr;
const char * _opath = NULL;
const char * _npath = NULL;
@@ -337,7 +337,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, nullptr);
rpmsys sys = ptr;
const char * _path = NULL;
bool ok;
@@ -355,7 +355,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, nullptr);
rpmsys sys = ptr;
const char * _path = NULL;
bool ok;
@@ -386,7 +386,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, nullptr);
rpmsys sys = ptr;
const char * _opath = NULL;
const char * _npath = NULL;
@@ -405,7 +405,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, nullptr);
rpmsys sys = ptr;
const char * _path = NULL;
bool ok;
@@ -497,7 +497,7 @@
static bool
rpmsys_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
_PROP_DEBUG_ENTRY(_debug < 0);
@@ -601,7 +601,7 @@
static bool
rpmsys_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
_PROP_DEBUG_ENTRY(_debug < 0);
@@ -626,7 +626,7 @@
rpmsys_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, nullptr);
_RESOLVE_DEBUG_ENTRY(_debug < 0);
@@ -647,7 +647,7 @@
jsval *statep, jsid *idp)
{
#ifdef NOTYET
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, nullptr);
rpmsys sys = ptr;
#endif
@@ -696,7 +696,7 @@
static void
rpmsys_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, nullptr);
rpmsys sys = ptr;
_DTOR_DEBUG_ENTRY(_debug);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmte-js.c
============================================================================
$ cvs diff -u -r1.19.4.5 -r1.19.4.6 rpmte-js.c
--- rpm/js/rpmte-js.c 11 Jul 2017 10:42:14 -0000 1.19.4.5
+++ rpm/js/rpmte-js.c 11 Jul 2017 10:49:39 -0000 1.19.4.6
@@ -40,7 +40,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmteClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmteClass, nullptr);
rpmte te = ptr;
rpmTag tagN = RPMTAG_NAME;
bool ok = false;
@@ -72,7 +72,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmteClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmteClass, nullptr);
rpmte te = ptr;
rpmTag tagN = RPMTAG_BASENAMES;
bool ok = false;
@@ -166,7 +166,7 @@
static bool
rpmte_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmteClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmteClass, nullptr);
rpmte te = ptr;
jsint tiny = JSVAL_TO_INT(id);
@@ -264,7 +264,7 @@
static bool
rpmte_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmteClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmteClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
@@ -287,7 +287,7 @@
rpmte_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmteClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmteClass, nullptr);
_RESOLVE_DEBUG_ENTRY(_debug);
@@ -357,7 +357,7 @@
static void
rpmte_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmteClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmteClass, nullptr);
_DTOR_DEBUG_ENTRY(_debug);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmts-js.c
============================================================================
$ cvs diff -u -r1.33.4.5 -r1.33.4.6 rpmts-js.c
--- rpm/js/rpmts-js.c 11 Jul 2017 10:42:14 -0000 1.33.4.5
+++ rpm/js/rpmts-js.c 11 Jul 2017 10:49:39 -0000 1.33.4.6
@@ -48,7 +48,7 @@
static JSObject *
rpmtsLoadNVRA(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtsClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtsClass, nullptr);
rpmts ts = ptr;
JSObject * NVRA = JS_NewArrayObject(cx, 0, NULL);
ARGV_t keys = NULL;
@@ -86,7 +86,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtsClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtsClass, nullptr);
rpmts ts = ptr;
char * pkgN = 0;
bool ok = false;
@@ -128,7 +128,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtsClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtsClass, nullptr);
rpmts ts = ptr;
bool ok = false;
@@ -147,7 +147,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtsClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtsClass, nullptr);
rpmts ts = ptr;
bool ok = false;
@@ -166,7 +166,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtsClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtsClass, nullptr);
rpmts ts = ptr;
bool ok = false;
@@ -190,7 +190,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtsClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtsClass, nullptr);
rpmts ts = ptr;
jsval tagid = JSVAL_VOID;
jsval kv = JSVAL_VOID;
@@ -227,7 +227,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtsClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtsClass, nullptr);
rpmts ts = ptr;
bool ok = false;
@@ -248,7 +248,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtsClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtsClass, nullptr);
rpmts ts = ptr;
jsval tagid = JSVAL_VOID;
jsval v = JSVAL_VOID;
@@ -388,7 +388,7 @@
static bool
rpmts_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtsClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtsClass, nullptr);
rpmts ts = ptr;
jsint tiny = JSVAL_TO_INT(id);
@@ -487,7 +487,7 @@
static bool
rpmts_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtsClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtsClass, nullptr);
rpmts ts = (rpmts)ptr;
jsint tiny = JSVAL_TO_INT(id);
const char * s = NULL;
@@ -573,7 +573,7 @@
rpmts_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtsClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtsClass, nullptr);
rpmts ts = ptr;
bool ok = false;
int oc;
@@ -611,7 +611,7 @@
static void
rpmtsi_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtsiClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtsiClass, nullptr);
rpmtsi tsi = ptr;
if (_debug)
@@ -632,7 +632,7 @@
rpmts_enumerate(JSContext *cx, JSObject *obj, JSIterateOp op,
jsval *statep, jsid *idp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtsClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtsClass, nullptr);
rpmts ts = ptr;
rpmtsi tsi;
JSObject *tsio = NULL;
@@ -703,7 +703,7 @@
static void
rpmts_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtsClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtsClass, nullptr);
rpmts ts = ptr;
_DTOR_DEBUG_ENTRY(_debug);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmtxn-js.c
============================================================================
$ cvs diff -u -r1.11.4.5 -r1.11.4.6 rpmtxn-js.c
--- rpm/js/rpmtxn-js.c 11 Jul 2017 10:42:14 -0000 1.11.4.5
+++ rpm/js/rpmtxn-js.c 11 Jul 2017 10:49:39 -0000 1.11.4.6
@@ -47,7 +47,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtxnClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtxnClass, nullptr);
DB_TXN * txn = ptr;
bool ok = false;
@@ -76,7 +76,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtxnClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtxnClass, nullptr);
DB_TXN * txn = ptr;
uint32_t _flags = 0;
bool ok = false;
@@ -109,7 +109,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtxnClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtxnClass, nullptr);
DB_TXN * txn = ptr;
uint32_t _flags = 0;
bool ok = false;
@@ -139,7 +139,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtxnClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtxnClass, nullptr);
DB_TXN * txn = ptr;
#if !defined(DB_GID_SIZE)
#define DB_GID_SIZE 128
@@ -204,7 +204,7 @@
static bool
rpmtxn_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtxnClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtxnClass, nullptr);
DB_TXN * txn = ptr;
jsint tiny = JSVAL_TO_INT(id);
@@ -237,7 +237,7 @@
static bool
rpmtxn_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtxnClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtxnClass, nullptr);
DB_TXN * txn = ptr;
jsint tiny = JSVAL_TO_INT(id);
uint32_t _flags = 0;
@@ -281,7 +281,7 @@
rpmtxn_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtxnClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtxnClass, nullptr);
_RESOLVE_DEBUG_ENTRY(_debug < 0);
@@ -355,7 +355,7 @@
static void
rpmtxn_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtxnClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtxnClass, nullptr);
#ifdef NOTYET
DB_TXN * txn = ptr;
uint32_t _flags = 0;
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmxar-js.c
============================================================================
$ cvs diff -u -r1.5.4.4 -r1.5.4.5 rpmxar-js.c
--- rpm/js/rpmxar-js.c 11 Jul 2017 10:17:12 -0000 1.5.4.4
+++ rpm/js/rpmxar-js.c 11 Jul 2017 10:49:39 -0000 1.5.4.5
@@ -59,7 +59,7 @@
static bool
rpmxar_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmxarClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmxarClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
@@ -80,7 +80,7 @@
static bool
rpmxar_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmxarClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmxarClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
@@ -103,7 +103,7 @@
rpmxar_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmxarClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmxarClass, nullptr);
_RESOLVE_DEBUG_ENTRY(_debug < 0);
@@ -123,7 +123,7 @@
rpmxar_enumerate(JSContext *cx, JSObject *obj, JSIterateOp op,
jsval *statep, jsid *idp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmxarClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmxarClass, nullptr);
rpmxar xar = ptr;
int ix = 0;
@@ -210,7 +210,7 @@
static void
rpmxar_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &rpmxarClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &rpmxarClass, nullptr);
rpmxar xar = ptr;
_DTOR_DEBUG_ENTRY(_debug);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/syck-js.c
============================================================================
$ cvs diff -u -r1.9.4.5 -r1.9.4.6 syck-js.c
--- rpm/js/syck-js.c 11 Jul 2017 10:42:14 -0000 1.9.4.5
+++ rpm/js/syck-js.c 11 Jul 2017 10:49:39 -0000 1.9.4.6
@@ -304,7 +304,7 @@
static bool
syck_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &syckClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &syckClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
@@ -337,7 +337,7 @@
static bool
syck_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &syckClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &syckClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
@@ -396,7 +396,7 @@
syck_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &syckClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &syckClass, nullptr);
_RESOLVE_DEBUG_ENTRY(_debug);
@@ -407,7 +407,7 @@
static void
syck_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &syckClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &syckClass, nullptr);
_DTOR_DEBUG_ENTRY(_debug);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/uuid-js.c
============================================================================
$ cvs diff -u -r1.18.4.5 -r1.18.4.6 uuid-js.c
--- rpm/js/uuid-js.c 11 Jul 2017 10:42:14 -0000 1.18.4.5
+++ rpm/js/uuid-js.c 11 Jul 2017 10:49:39 -0000 1.18.4.6
@@ -42,7 +42,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &uuidClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &uuidClass, nullptr);
int32 version = 0;
const char *uuid_ns_str = NULL;
const char *data = NULL;
@@ -111,7 +111,7 @@
{
CallArgs argv = CallArgsFromVp(argc, vp);
RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
- void * ptr = JS_GetInstancePrivate(cx, obj, &uuidClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &uuidClass, nullptr);
uuid_t *uuid = NULL;
const char *uuid_str = NULL;
uuid_rc_t rc;
@@ -161,7 +161,7 @@
static bool
uuid_getprop(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &uuidClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &uuidClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
@@ -194,7 +194,7 @@
static bool
uuid_setprop(JSContext *cx, JSObject *obj, jsid id, bool strict, jsval *vp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &uuidClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &uuidClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
@@ -217,7 +217,7 @@
uuid_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
JSObject **objp)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &uuidClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &uuidClass, nullptr);
_RESOLVE_DEBUG_ENTRY(_debug);
@@ -272,7 +272,7 @@
static void
uuid_dtor(JSContext *cx, JSObject *obj)
{
- void * ptr = JS_GetInstancePrivate(cx, obj, &uuidClass, NULL);
+ void * ptr = JS_GetInstancePrivate(cx, obj, &uuidClass, nullptr);
_DTOR_DEBUG_ENTRY(_debug);
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
