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:17:13 Branch: rpm-5_4 Handle: 2017071110171101 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 CallArgsFromVp instead of JS_ARGV. Summary: Revision Changes Path 1.11.4.5 +11 -11 rpm/js/rpmaug-js.c 1.4.4.4 +1 -1 rpm/js/rpmbc-js.c 1.10.4.4 +6 -6 rpm/js/rpmbf-js.c 1.6.4.4 +3 -3 rpm/js/rpmcudf-js.c 1.31.4.4 +23 -23 rpm/js/rpmdb-js.c 1.14.4.4 +10 -10 rpm/js/rpmdbc-js.c 1.21.4.5 +54 -54 rpm/js/rpmdbe-js.c 1.9.4.4 +5 -5 rpm/js/rpmdc-js.c 1.5.2.4 +1 -1 rpm/js/rpmdig-js.c 1.8.4.4 +2 -2 rpm/js/rpmdir-js.c 1.20.4.4 +1 -1 rpm/js/rpmds-js.c 1.4.4.4 +1 -1 rpm/js/rpmfc-js.c 1.15.4.4 +1 -1 rpm/js/rpmfi-js.c 1.10.4.4 +7 -7 rpm/js/rpmfts-js.c 1.4.4.4 +1 -1 rpm/js/rpmgi-js.c 1.24.4.4 +6 -6 rpm/js/rpmhdr-js.c 1.9.4.4 +19 -19 rpm/js/rpmio-js.c 1.4.4.4 +1 -1 rpm/js/rpmiob-js.c 1.12.4.4 +5 -5 rpm/js/rpmmc-js.c 1.4.4.4 +2 -2 rpm/js/rpmmg-js.c 1.28.4.4 +5 -5 rpm/js/rpmmi-js.c 1.7.4.4 +7 -7 rpm/js/rpmmpf-js.c 1.21.4.5 +12 -12 rpm/js/rpmmpw-js.c 1.18.4.4 +3 -3 rpm/js/rpmps-js.c 1.7.4.4 +8 -8 rpm/js/rpmseq-js.c 1.8.4.4 +2 -2 rpm/js/rpmsm-js.c 1.4.4.4 +2 -2 rpm/js/rpmsp-js.c 1.10.4.4 +2 -2 rpm/js/rpmst-js.c 1.4.4.4 +1 -1 rpm/js/rpmsw-js.c 1.8.4.5 +2 -2 rpm/js/rpmsx-js.c 1.8.4.4 +17 -17 rpm/js/rpmsys-js.c 1.19.4.4 +3 -3 rpm/js/rpmte-js.c 1.33.4.4 +8 -8 rpm/js/rpmts-js.c 1.11.4.4 +6 -6 rpm/js/rpmtxn-js.c 1.5.4.4 +1 -1 rpm/js/rpmxar-js.c 1.9.4.4 +3 -3 rpm/js/syck-js.c 1.18.4.4 +3 -3 rpm/js/uuid-js.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/js/rpmaug-js.c ============================================================================ $ cvs diff -u -r1.11.4.4 -r1.11.4.5 rpmaug-js.c --- rpm/js/rpmaug-js.c 11 Jul 2017 10:12:47 -0000 1.11.4.4 +++ rpm/js/rpmaug-js.c 11 Jul 2017 10:17:11 -0000 1.11.4.5 @@ -31,7 +31,7 @@ static bool rpmaug_defvar(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, NULL); rpmaug aug = ptr; @@ -62,7 +62,7 @@ static bool rpmaug_get(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, NULL); rpmaug aug = ptr; @@ -96,7 +96,7 @@ static bool rpmaug_set(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, NULL); rpmaug aug = ptr; @@ -126,7 +126,7 @@ static bool rpmaug_insert(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, NULL); rpmaug aug = ptr; @@ -157,7 +157,7 @@ static bool rpmaug_rm(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, NULL); rpmaug aug = ptr; @@ -179,7 +179,7 @@ static bool rpmaug_mv(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, NULL); rpmaug aug = ptr; @@ -209,7 +209,7 @@ static bool rpmaug_match(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, NULL); rpmaug aug = ptr; @@ -247,7 +247,7 @@ static bool rpmaug_save(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, NULL); rpmaug aug = ptr; @@ -271,7 +271,7 @@ static bool rpmaug_load(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, NULL); rpmaug aug = ptr; @@ -296,7 +296,7 @@ static bool rpmaug_print(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, NULL); rpmaug aug = ptr; @@ -542,7 +542,7 @@ static bool rpmaug_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); bool ok = false; const char * _root = _rpmaugRoot; @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmbc-js.c ============================================================================ $ cvs diff -u -r1.4.4.3 -r1.4.4.4 rpmbc-js.c --- rpm/js/rpmbc-js.c 11 Jul 2017 10:12:47 -0000 1.4.4.3 +++ rpm/js/rpmbc-js.c 11 Jul 2017 10:17:11 -0000 1.4.4.4 @@ -177,7 +177,7 @@ static bool rpmbc_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); bool ok = false; @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmbf-js.c ============================================================================ $ cvs diff -u -r1.10.4.3 -r1.10.4.4 rpmbf-js.c --- rpm/js/rpmbf-js.c 11 Jul 2017 10:12:47 -0000 1.10.4.3 +++ rpm/js/rpmbf-js.c 11 Jul 2017 10:17:11 -0000 1.10.4.4 @@ -22,7 +22,7 @@ static bool rpmbf_add(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmbfClass, NULL); rpmbf bf = ptr; @@ -44,7 +44,7 @@ static bool rpmbf_chk(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmbfClass, NULL); rpmbf bf = ptr; @@ -81,7 +81,7 @@ static bool rpmbf_del(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmbfClass, NULL); rpmbf bf = ptr; @@ -103,7 +103,7 @@ static bool rpmbf_intersect(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmbfClass, NULL); rpmbf _a = ptr; @@ -128,7 +128,7 @@ static bool rpmbf_union(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmbfClass, NULL); rpmbf _a = ptr; @@ -376,7 +376,7 @@ static bool rpmbf_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); unsigned int _m = 0; unsigned int _k = 0; @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmcudf-js.c ============================================================================ $ cvs diff -u -r1.6.4.3 -r1.6.4.4 rpmcudf-js.c --- rpm/js/rpmcudf-js.c 11 Jul 2017 10:12:47 -0000 1.6.4.3 +++ rpm/js/rpmcudf-js.c 11 Jul 2017 10:17:11 -0000 1.6.4.4 @@ -43,7 +43,7 @@ static bool rpmcudf_issolution(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmcudfClass, NULL); rpmcudf cudf = ptr; @@ -75,7 +75,7 @@ static bool rpmcudf_print(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmcudfClass, NULL); rpmcudf cudf = ptr; @@ -305,7 +305,7 @@ static bool rpmcudf_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); bool ok = false; JSObject *fno = NULL; @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmdb-js.c ============================================================================ $ cvs diff -u -r1.31.4.3 -r1.31.4.4 rpmdb-js.c --- rpm/js/rpmdb-js.c 11 Jul 2017 10:12:47 -0000 1.31.4.3 +++ rpm/js/rpmdb-js.c 11 Jul 2017 10:17:11 -0000 1.31.4.4 @@ -137,7 +137,7 @@ static bool rpmdb_Associate(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL); DB * db = ptr; @@ -190,7 +190,7 @@ static bool rpmdb_AssociateForeign(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL); DB * db = ptr; @@ -241,7 +241,7 @@ static bool rpmdb_Close(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL); DB * db = ptr; @@ -270,7 +270,7 @@ static bool rpmdb_Compact(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL); DB * db = ptr; @@ -311,7 +311,7 @@ static bool rpmdb_Cursor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL); DB * db = ptr; @@ -361,7 +361,7 @@ static bool rpmdb_Del(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL); DB * db = ptr; @@ -410,7 +410,7 @@ static bool rpmdb_Exists(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL); DB * db = ptr; @@ -460,7 +460,7 @@ static bool rpmdb_Get(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL); DB * db = ptr; @@ -522,7 +522,7 @@ static bool rpmdb_Join(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL); DB * db = ptr; @@ -591,7 +591,7 @@ static bool rpmdb_KeyRange(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL); DB * db = ptr; @@ -647,7 +647,7 @@ static bool rpmdb_Open(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL); DB * db = ptr; @@ -704,7 +704,7 @@ static bool rpmdb_Pget(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL); DB * db = ptr; @@ -759,7 +759,7 @@ static bool rpmdb_Put(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL); DB * db = ptr; @@ -813,7 +813,7 @@ static bool rpmdb_Remove(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL); DB * db = ptr; @@ -849,7 +849,7 @@ static bool rpmdb_Rename(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL); DB * db = ptr; @@ -886,7 +886,7 @@ static bool rpmdb_Stat(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL); DB * db = ptr; @@ -926,7 +926,7 @@ static bool rpmdb_StatPrint(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL); DB * db = ptr; @@ -958,7 +958,7 @@ static bool rpmdb_Sync(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL); DB * db = ptr; @@ -988,7 +988,7 @@ static bool rpmdb_Truncate(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL); DB * db = ptr; @@ -1027,7 +1027,7 @@ static bool rpmdb_Upgrade(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL); DB * db = ptr; @@ -1061,7 +1061,7 @@ static bool rpmdb_Verify(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, NULL); DB * db = ptr; @@ -1710,7 +1710,7 @@ static bool rpmdb_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); JSObject * o = NULL; DB_ENV * _dbenv = NULL; @@ -1741,7 +1741,7 @@ static bool rpmdb_call(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); /* XXX obj is the global object so lookup "this" object. */ JSObject * o = JSVAL_TO_OBJECT(argv[-2]); void * ptr = JS_GetInstancePrivate(cx, o, &rpmdbClass, NULL); @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmdbc-js.c ============================================================================ $ cvs diff -u -r1.14.4.3 -r1.14.4.4 rpmdbc-js.c --- rpm/js/rpmdbc-js.c 11 Jul 2017 10:12:47 -0000 1.14.4.3 +++ rpm/js/rpmdbc-js.c 11 Jul 2017 10:17:11 -0000 1.14.4.4 @@ -45,7 +45,7 @@ static bool rpmdbc_Close(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, NULL); DBC * dbc = ptr; @@ -73,7 +73,7 @@ static bool rpmdbc_Cmp(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, NULL); DBC * dbc = ptr; @@ -116,7 +116,7 @@ static bool rpmdbc_Count(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, NULL); DBC * dbc = ptr; @@ -151,7 +151,7 @@ static bool rpmdbc_Del(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, NULL); DBC * dbc = ptr; @@ -187,7 +187,7 @@ static bool rpmdbc_Dup(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, NULL); DBC * dbc = ptr; @@ -232,7 +232,7 @@ static bool rpmdbc_Get(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, NULL); DBC * dbc = ptr; @@ -286,7 +286,7 @@ static bool rpmdbc_Pget(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, NULL); DBC * dbc = ptr; @@ -334,7 +334,7 @@ static bool rpmdbc_Put(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, NULL); DBC * dbc = ptr; @@ -604,7 +604,7 @@ static bool rpmdbc_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); bool ok = false; @@ -626,7 +626,7 @@ static bool rpmdbc_call(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); /* XXX obj is the global object so lookup "this" object. */ JSObject * o = JSVAL_TO_OBJECT(argv[-2]); void * ptr = JS_GetInstancePrivate(cx, o, &rpmdbcClass, NULL); @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmdbe-js.c ============================================================================ $ cvs diff -u -r1.21.4.4 -r1.21.4.5 rpmdbe-js.c --- rpm/js/rpmdbe-js.c 11 Jul 2017 10:12:47 -0000 1.21.4.4 +++ rpm/js/rpmdbe-js.c 11 Jul 2017 10:17:11 -0000 1.21.4.5 @@ -155,7 +155,7 @@ rpmdbe_CdsgroupBegin(JSContext *cx, unsigned argc, Value* vp) { #ifdef UNUSED - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); #endif JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); @@ -199,7 +199,7 @@ rpmdbe_Close(JSContext *cx, unsigned argc, Value* vp) { #ifdef UNUSED - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); #endif JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); @@ -230,7 +230,7 @@ static bool rpmdbe_Dbremove(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -269,7 +269,7 @@ static bool rpmdbe_Dbrename(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -310,7 +310,7 @@ static bool rpmdbe_Failchk(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -349,7 +349,7 @@ static bool rpmdbe_FileidReset(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -383,7 +383,7 @@ static bool rpmdbe_LockDetect(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -455,7 +455,7 @@ static bool rpmdbe_LockGet(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -493,7 +493,7 @@ rpmdbe_LockId(JSContext *cx, unsigned argc, Value* vp) { #ifdef UNUSED - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); #endif JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); @@ -523,7 +523,7 @@ static bool rpmdbe_LockIdFree(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -556,7 +556,7 @@ rpmdbe_LockPut(JSContext *cx, unsigned argc, Value* vp) { #ifdef UNUSED - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); #endif JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); @@ -591,7 +591,7 @@ static bool rpmdbe_LockStat(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -625,7 +625,7 @@ static bool rpmdbe_LockStatPrint(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -657,7 +657,7 @@ static bool rpmdbe_LockVec(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -691,7 +691,7 @@ static bool rpmdbe_LogArchive(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -745,7 +745,7 @@ rpmdbe_LogCursor(JSContext *cx, unsigned argc, Value* vp) { #ifdef UNUSED - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); #endif JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); @@ -768,7 +768,7 @@ static bool rpmdbe_LogFile(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -805,7 +805,7 @@ static bool rpmdbe_LogFlush(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -837,7 +837,7 @@ static bool rpmdbe_LogPrintf(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -873,7 +873,7 @@ static bool rpmdbe_LogPut(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -909,7 +909,7 @@ static bool rpmdbe_LogStat(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -943,7 +943,7 @@ static bool rpmdbe_LogStatPrint(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -975,7 +975,7 @@ static bool rpmdbe_LsnReset(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -1011,7 +1011,7 @@ rpmdbe_MempFcreate(JSContext *cx, unsigned argc, Value* vp) { #ifdef UNUSED - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); #endif JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); @@ -1035,7 +1035,7 @@ rpmdbe_MempRegister(JSContext *cx, unsigned argc, Value* vp) { #ifdef UNUSED - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); #endif JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); @@ -1058,7 +1058,7 @@ static bool rpmdbe_MempStat(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -1097,7 +1097,7 @@ static bool rpmdbe_MempStatPrint(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -1129,7 +1129,7 @@ static bool rpmdbe_MempSync(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -1162,7 +1162,7 @@ static bool rpmdbe_MempTrickle(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -1197,7 +1197,7 @@ static bool rpmdbe_MutexAlloc(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -1230,7 +1230,7 @@ rpmdbe_MutexFree(JSContext *cx, unsigned argc, Value* vp) { #ifdef UNUSED - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); #endif JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); @@ -1261,7 +1261,7 @@ rpmdbe_MutexLock(JSContext *cx, unsigned argc, Value* vp) { #ifdef UNUSED - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); #endif JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); @@ -1290,7 +1290,7 @@ static bool rpmdbe_MutexStat(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -1324,7 +1324,7 @@ static bool rpmdbe_MutexStatPrint(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -1357,7 +1357,7 @@ rpmdbe_MutexUnlock(JSContext *cx, unsigned argc, Value* vp) { #ifdef UNUSED - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); #endif JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); @@ -1386,7 +1386,7 @@ static bool rpmdbe_Open(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -1432,7 +1432,7 @@ static bool rpmdbe_Remove(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -1469,7 +1469,7 @@ static bool rpmdbe_RepElect(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -1504,7 +1504,7 @@ rpmdbe_RepProcessMessage(JSContext *cx, unsigned argc, Value* vp) { #ifdef UNUSED - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); #endif JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); @@ -1528,7 +1528,7 @@ rpmdbe_RepStart(JSContext *cx, unsigned argc, Value* vp) { #ifdef UNUSED - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); #endif JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); @@ -1551,7 +1551,7 @@ static bool rpmdbe_RepStat(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -1585,7 +1585,7 @@ static bool rpmdbe_RepStatPrint(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -1617,7 +1617,7 @@ static bool rpmdbe_RepSync(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -1650,7 +1650,7 @@ rpmdbe_RepmgrStart(JSContext *cx, unsigned argc, Value* vp) { #ifdef UNUSED - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); #endif JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); @@ -1673,7 +1673,7 @@ static bool rpmdbe_RepmgrStat(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -1707,7 +1707,7 @@ static bool rpmdbe_RepmgrStatPrint(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -1739,7 +1739,7 @@ static bool rpmdbe_StatPrint(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -1773,7 +1773,7 @@ static bool rpmdbe_TxnBegin(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -1823,7 +1823,7 @@ static bool rpmdbe_TxnCheckpoint(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -1858,7 +1858,7 @@ rpmdbe_TxnRecover(JSContext *cx, unsigned argc, Value* vp) { #ifdef UNUSED - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); #endif JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); @@ -1907,7 +1907,7 @@ static bool rpmdbe_TxnStat(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -1941,7 +1941,7 @@ static bool rpmdbe_TxnStatPrint(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, NULL); DB_ENV * dbenv = ptr; @@ -2826,7 +2826,7 @@ static bool rpmdbe_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); bool ok = false; @@ -2848,7 +2848,7 @@ static bool rpmdbe_call(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); /* XXX obj is the global object so lookup "this" object. */ JSObject * o = JSVAL_TO_OBJECT(argv[-2]); void * ptr = JS_GetInstancePrivate(cx, o, &rpmdbeClass, NULL); @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmdc-js.c ============================================================================ $ cvs diff -u -r1.9.4.3 -r1.9.4.4 rpmdc-js.c --- rpm/js/rpmdc-js.c 11 Jul 2017 10:12:47 -0000 1.9.4.3 +++ rpm/js/rpmdc-js.c 11 Jul 2017 10:17:11 -0000 1.9.4.4 @@ -45,7 +45,7 @@ static bool rpmdc_Init(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdcClass, NULL); rpmdc dc = ptr; @@ -76,7 +76,7 @@ static bool rpmdc_Update(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdcClass, NULL); rpmdc dc = ptr; @@ -104,7 +104,7 @@ static bool rpmdc_Fini(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdcClass, NULL); rpmdc dc = ptr; @@ -289,7 +289,7 @@ static bool rpmdc_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); bool ok = false; unsigned int _dalgo = PGPHASHALGO_NONE; @@ -316,7 +316,7 @@ static bool rpmdc_call(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); /* XXX obj is the global object so lookup "this" object. */ JSObject * o = JSVAL_TO_OBJECT(argv[-2]); void * ptr = JS_GetInstancePrivate(cx, o, &rpmdcClass, NULL); @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmdig-js.c ============================================================================ $ cvs diff -u -r1.5.2.3 -r1.5.2.4 rpmdig-js.c --- rpm/js/rpmdig-js.c 11 Jul 2017 10:12:47 -0000 1.5.2.3 +++ rpm/js/rpmdig-js.c 11 Jul 2017 10:17:11 -0000 1.5.2.4 @@ -174,7 +174,7 @@ static bool rpmdig_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); bool ok = false; @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmdir-js.c ============================================================================ $ cvs diff -u -r1.8.4.3 -r1.8.4.4 rpmdir-js.c --- rpm/js/rpmdir-js.c 11 Jul 2017 10:12:47 -0000 1.8.4.3 +++ rpm/js/rpmdir-js.c 11 Jul 2017 10:17:11 -0000 1.8.4.4 @@ -206,7 +206,7 @@ static bool rpmdir_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); bool ok = false; const char * _dn = NULL; @@ -232,7 +232,7 @@ static bool rpmdir_call(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); /* XXX obj is the global object so lookup "this" object. */ JSObject * o = JSVAL_TO_OBJECT(argv[-2]); void * ptr = JS_GetInstancePrivate(cx, o, &rpmdirClass, NULL); @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmds-js.c ============================================================================ $ cvs diff -u -r1.20.4.3 -r1.20.4.4 rpmds-js.c --- rpm/js/rpmds-js.c 11 Jul 2017 10:12:47 -0000 1.20.4.3 +++ rpm/js/rpmds-js.c 11 Jul 2017 10:17:11 -0000 1.20.4.4 @@ -424,7 +424,7 @@ static bool rpmds_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); bool ok = false; jsval v = JSVAL_VOID; @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmfc-js.c ============================================================================ $ cvs diff -u -r1.4.4.3 -r1.4.4.4 rpmfc-js.c --- rpm/js/rpmfc-js.c 11 Jul 2017 10:12:47 -0000 1.4.4.3 +++ rpm/js/rpmfc-js.c 11 Jul 2017 10:17:12 -0000 1.4.4.4 @@ -176,7 +176,7 @@ static bool rpmfc_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); bool ok = false; @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmfi-js.c ============================================================================ $ cvs diff -u -r1.15.4.3 -r1.15.4.4 rpmfi-js.c --- rpm/js/rpmfi-js.c 11 Jul 2017 10:12:47 -0000 1.15.4.3 +++ rpm/js/rpmfi-js.c 11 Jul 2017 10:17:12 -0000 1.15.4.4 @@ -380,7 +380,7 @@ static bool rpmfi_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); bool ok = false; rpmts ts = NULL; /* XXX FIXME: should be a ts method? */ @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmfts-js.c ============================================================================ $ cvs diff -u -r1.10.4.3 -r1.10.4.4 rpmfts-js.c --- rpm/js/rpmfts-js.c 11 Jul 2017 10:12:47 -0000 1.10.4.3 +++ rpm/js/rpmfts-js.c 11 Jul 2017 10:17:12 -0000 1.10.4.4 @@ -93,7 +93,7 @@ static bool rpmfts_children(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmftsClass, NULL); FTS * fts = ptr; @@ -118,7 +118,7 @@ static bool rpmfts_close(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmftsClass, NULL); FTS * fts = ptr; @@ -142,7 +142,7 @@ static bool rpmfts_open(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmftsClass, NULL); FTS * fts = ptr; @@ -175,7 +175,7 @@ static bool rpmfts_read(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmftsClass, NULL); FTS * fts = ptr; @@ -192,7 +192,7 @@ static bool rpmfts_set(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmftsClass, NULL); FTS * fts = ptr; @@ -512,7 +512,7 @@ static bool rpmfts_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); bool ok = false; JSObject *dno = NULL; @@ -539,7 +539,7 @@ static bool rpmfts_call(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); /* XXX obj is the global object so lookup "this" object. */ JSObject * o = JSVAL_TO_OBJECT(argv[-2]); void * ptr = JS_GetInstancePrivate(cx, o, &rpmftsClass, NULL); @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmgi-js.c ============================================================================ $ cvs diff -u -r1.4.4.3 -r1.4.4.4 rpmgi-js.c --- rpm/js/rpmgi-js.c 11 Jul 2017 10:12:47 -0000 1.4.4.3 +++ rpm/js/rpmgi-js.c 11 Jul 2017 10:17:12 -0000 1.4.4.4 @@ -180,7 +180,7 @@ static bool rpmgi_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); bool ok = false; @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmhdr-js.c ============================================================================ $ cvs diff -u -r1.24.4.3 -r1.24.4.4 rpmhdr-js.c --- rpm/js/rpmhdr-js.c 11 Jul 2017 10:12:47 -0000 1.24.4.3 +++ rpm/js/rpmhdr-js.c 11 Jul 2017 10:17:12 -0000 1.24.4.4 @@ -146,7 +146,7 @@ static bool rpmhdr_ds(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmhdrClass, NULL); rpmTag tagN = RPMTAG_NAME; @@ -165,7 +165,7 @@ static bool rpmhdr_fi(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmhdrClass, NULL); Header h = ptr; @@ -185,7 +185,7 @@ static bool rpmhdr_sprintf(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmhdrClass, NULL); Header h = ptr; @@ -210,7 +210,7 @@ static bool rpmhdr_getorigin(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmhdrClass, NULL); Header h = ptr; @@ -226,7 +226,7 @@ static bool rpmhdr_setorigin(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmhdrClass, NULL); Header h = ptr; @@ -464,7 +464,7 @@ static bool rpmhdr_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); bool ok = false; JSObject *tso = NULL; @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmio-js.c ============================================================================ $ cvs diff -u -r1.9.4.3 -r1.9.4.4 rpmio-js.c --- rpm/js/rpmio-js.c 11 Jul 2017 10:12:47 -0000 1.9.4.3 +++ rpm/js/rpmio-js.c 11 Jul 2017 10:17:12 -0000 1.9.4.4 @@ -66,7 +66,7 @@ static bool rpmio_digestinit(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL); FD_t fd = ptr; @@ -87,7 +87,7 @@ static bool rpmio_digestfini(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL); FD_t fd = ptr; @@ -111,7 +111,7 @@ static bool rpmio_fchown(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL); FD_t fd = ptr; @@ -133,7 +133,7 @@ static bool rpmio_fclose(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL); FD_t fd = ptr; @@ -157,7 +157,7 @@ static bool rpmio_fdopen(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL); FD_t fd = ptr; @@ -188,7 +188,7 @@ static bool rpmio_ferror(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL); FD_t fd = ptr; @@ -201,7 +201,7 @@ static bool rpmio_fflush(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL); FD_t fd = ptr; @@ -215,7 +215,7 @@ static bool rpmio_fgetpos(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL); FD_t fd = ptr; @@ -239,7 +239,7 @@ static bool rpmio_fileno(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL); FD_t fd = ptr; @@ -254,7 +254,7 @@ static bool rpmio_fopen(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL); FD_t fd = ptr; @@ -286,7 +286,7 @@ static bool rpmio_fread(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL); FD_t fd = ptr; @@ -325,7 +325,7 @@ static bool rpmio_fseek(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL); FD_t fd = ptr; @@ -345,7 +345,7 @@ static bool rpmio_fsetpos(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL); FD_t fd = ptr; @@ -366,7 +366,7 @@ static bool rpmio_fstat(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL); FD_t fd = ptr; @@ -397,7 +397,7 @@ static bool rpmio_ftell(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL); FD_t fd = ptr; @@ -413,7 +413,7 @@ static bool rpmio_fwrite(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL); FD_t fd = ptr; @@ -445,7 +445,7 @@ static bool rpmio_rewind(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, NULL); FD_t fd = ptr; @@ -665,7 +665,7 @@ static bool rpmio_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); bool ok = false; const char * _fn = NULL; @@ -692,7 +692,7 @@ static bool rpmio_call(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); /* XXX obj is the global object so lookup "this" object. */ JSObject * o = JSVAL_TO_OBJECT(argv[-2]); void * ptr = JS_GetInstancePrivate(cx, o, &rpmioClass, NULL); @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmiob-js.c ============================================================================ $ cvs diff -u -r1.4.4.3 -r1.4.4.4 rpmiob-js.c --- rpm/js/rpmiob-js.c 11 Jul 2017 10:12:47 -0000 1.4.4.3 +++ rpm/js/rpmiob-js.c 11 Jul 2017 10:17:12 -0000 1.4.4.4 @@ -173,7 +173,7 @@ static bool rpmiob_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); bool ok = false; @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmmc-js.c ============================================================================ $ cvs diff -u -r1.12.4.3 -r1.12.4.4 rpmmc-js.c --- rpm/js/rpmmc-js.c 11 Jul 2017 10:12:47 -0000 1.12.4.3 +++ rpm/js/rpmmc-js.c 11 Jul 2017 10:17:12 -0000 1.12.4.4 @@ -27,7 +27,7 @@ static bool rpmmc_add(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmcClass, NULL); rpmmc mc = ptr; @@ -50,7 +50,7 @@ static bool rpmmc_del(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmcClass, NULL); rpmmc mc = ptr; @@ -72,7 +72,7 @@ static bool rpmmc_list(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmcClass, NULL); rpmmc mc = ptr; @@ -110,7 +110,7 @@ static bool rpmmc_expand(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmcClass, NULL); rpmmc mc = ptr; @@ -297,7 +297,7 @@ static bool rpmmc_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); bool ok = false; jsval v = JSVAL_VOID; @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmmg-js.c ============================================================================ $ cvs diff -u -r1.4.4.3 -r1.4.4.4 rpmmg-js.c --- rpm/js/rpmmg-js.c 11 Jul 2017 10:12:47 -0000 1.4.4.3 +++ rpm/js/rpmmg-js.c 11 Jul 2017 10:17:12 -0000 1.4.4.4 @@ -205,7 +205,7 @@ static bool rpmmg_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); bool ok = false; const char * _magicfile = NULL; @@ -232,7 +232,7 @@ static bool rpmmg_call(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); /* XXX obj is the global object so lookup "this" object. */ JSObject * o = JSVAL_TO_OBJECT(argv[-2]); void * ptr = JS_GetInstancePrivate(cx, o, &rpmmgClass, NULL); @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmmi-js.c ============================================================================ $ cvs diff -u -r1.28.4.3 -r1.28.4.4 rpmmi-js.c --- rpm/js/rpmmi-js.c 11 Jul 2017 10:12:47 -0000 1.28.4.3 +++ rpm/js/rpmmi-js.c 11 Jul 2017 10:17:12 -0000 1.28.4.4 @@ -27,7 +27,7 @@ static bool rpmmi_pattern(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmiClass, NULL); rpmmi mi = ptr; @@ -72,7 +72,7 @@ static bool rpmmi_prune(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmiClass, NULL); rpmmi mi = ptr; @@ -95,7 +95,7 @@ static bool rpmmi_grow(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmiClass, NULL); rpmmi mi = ptr; @@ -118,7 +118,7 @@ static bool rpmmi_growbn(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmiClass, NULL); rpmmi mi = ptr; @@ -356,7 +356,7 @@ static bool rpmmi_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); JSObject *tso = NULL; jsval tagid = JSVAL_VOID; @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmmpf-js.c ============================================================================ $ cvs diff -u -r1.7.4.3 -r1.7.4.4 rpmmpf-js.c --- rpm/js/rpmmpf-js.c 11 Jul 2017 10:12:48 -0000 1.7.4.3 +++ rpm/js/rpmmpf-js.c 11 Jul 2017 10:17:12 -0000 1.7.4.4 @@ -50,7 +50,7 @@ static bool rpmmpf_Close(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpfClass, NULL); DB_MPOOLFILE * mpf = ptr; @@ -82,7 +82,7 @@ static bool rpmmpf_Get(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpfClass, NULL); DB_MPOOLFILE * mpf = ptr; @@ -125,7 +125,7 @@ static bool rpmmpf_Open(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpfClass, NULL); DB_MPOOLFILE * mpf = ptr; @@ -166,7 +166,7 @@ static bool rpmmpf_Put(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpfClass, NULL); DB_MPOOLFILE * mpf = ptr; @@ -205,7 +205,7 @@ static bool rpmmpf_Sync(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpfClass, NULL); DB_MPOOLFILE * mpf = ptr; @@ -445,7 +445,7 @@ static bool rpmmpf_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); bool ok = false; @@ -467,7 +467,7 @@ static bool rpmmpf_call(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); /* XXX obj is the global object so lookup "this" object. */ JSObject * o = JSVAL_TO_OBJECT(argv[-2]); void * ptr = JS_GetInstancePrivate(cx, o, &rpmmpfClass, NULL); @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmmpw-js.c ============================================================================ $ cvs diff -u -r1.21.4.4 -r1.21.4.5 rpmmpw-js.c --- rpm/js/rpmmpw-js.c 11 Jul 2017 10:12:48 -0000 1.21.4.4 +++ rpm/js/rpmmpw-js.c 11 Jul 2017 10:17:12 -0000 1.21.4.5 @@ -1789,7 +1789,7 @@ static bool mpw_toString(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, NULL); jsuint _base = 10; @@ -1809,7 +1809,7 @@ static bool mpw_valueOf(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, NULL); jsuint _base = 10; @@ -1825,7 +1825,7 @@ static bool mpw_isPrime(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, NULL); mpwObject * z = ptr; @@ -1863,7 +1863,7 @@ static bool mpw_randomK(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, NULL); mpwObject * q = ptr; @@ -1898,7 +1898,7 @@ static bool mpw_eq(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, NULL); bool ok = true; @@ -1932,7 +1932,7 @@ static bool mpw_lt(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, NULL); bool ok = true; @@ -1976,7 +1976,7 @@ static bool mpw_gt(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, NULL); bool ok = true; @@ -2020,7 +2020,7 @@ static bool mpw_min(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, NULL); bool ok = true; @@ -2056,7 +2056,7 @@ static bool mpw_max(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, NULL); bool ok = true; @@ -2093,7 +2093,7 @@ static bool mpw_Rndm(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, NULL); bool ok; @@ -2272,7 +2272,7 @@ static bool rpmmpw_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); bool ok = false; jsval v = JSVAL_NULL; @@ -2298,7 +2298,7 @@ static bool rpmmpw_call(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); /* XXX obj is the global object so lookup "this" object. */ JSObject * o = NULL; void * ptr = NULL; @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmps-js.c ============================================================================ $ cvs diff -u -r1.18.4.3 -r1.18.4.4 rpmps-js.c --- rpm/js/rpmps-js.c 11 Jul 2017 10:12:48 -0000 1.18.4.3 +++ rpm/js/rpmps-js.c 11 Jul 2017 10:17:12 -0000 1.18.4.4 @@ -25,7 +25,7 @@ static bool rpmps_push(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmpsClass, NULL); rpmps ps = ptr; @@ -53,7 +53,7 @@ static bool rpmps_print(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmpsClass, NULL); rpmps ps = ptr; @@ -235,7 +235,7 @@ static bool rpmps_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); bool ok = false; @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmseq-js.c ============================================================================ $ cvs diff -u -r1.7.4.3 -r1.7.4.4 rpmseq-js.c --- rpm/js/rpmseq-js.c 11 Jul 2017 10:12:48 -0000 1.7.4.3 +++ rpm/js/rpmseq-js.c 11 Jul 2017 10:17:12 -0000 1.7.4.4 @@ -46,7 +46,7 @@ static bool rpmseq_Close(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmseqClass, NULL); DB_SEQUENCE * seq = ptr; @@ -78,7 +78,7 @@ static bool rpmseq_Get(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmseqClass, NULL); DB_SEQUENCE * seq = ptr; @@ -126,7 +126,7 @@ static bool rpmseq_Open(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmseqClass, NULL); DB_SEQUENCE * seq = ptr; @@ -172,7 +172,7 @@ static bool rpmseq_Remove(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmseqClass, NULL); DB_SEQUENCE * seq = ptr; @@ -215,7 +215,7 @@ static bool rpmseq_Stat(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmseqClass, NULL); DB_SEQUENCE * seq = ptr; @@ -248,7 +248,7 @@ static bool rpmseq_StatPrint(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmseqClass, NULL); DB_SEQUENCE * seq = ptr; @@ -600,7 +600,7 @@ static bool rpmseq_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); JSObject * o = NULL; DB * _db = NULL; @@ -631,7 +631,7 @@ static bool rpmseq_call(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); /* XXX obj is the global object so lookup "this" object. */ JSObject * o = JSVAL_TO_OBJECT(argv[-2]); void * ptr = JS_GetInstancePrivate(cx, o, &rpmseqClass, NULL); @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmsm-js.c ============================================================================ $ cvs diff -u -r1.8.4.3 -r1.8.4.4 rpmsm-js.c --- rpm/js/rpmsm-js.c 11 Jul 2017 10:12:48 -0000 1.8.4.3 +++ rpm/js/rpmsm-js.c 11 Jul 2017 10:17:12 -0000 1.8.4.4 @@ -198,7 +198,7 @@ static bool rpmsm_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); bool ok = false; const char * _fn = NULL; @@ -225,7 +225,7 @@ static bool rpmsm_call(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); /* XXX obj is the global object so lookup "this" object. */ JSObject * o = JSVAL_TO_OBJECT(argv[-2]); void * ptr = JS_GetInstancePrivate(cx, o, &rpmsmClass, NULL); @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmsp-js.c ============================================================================ $ cvs diff -u -r1.4.4.3 -r1.4.4.4 rpmsp-js.c --- rpm/js/rpmsp-js.c 11 Jul 2017 10:12:48 -0000 1.4.4.3 +++ rpm/js/rpmsp-js.c 11 Jul 2017 10:17:12 -0000 1.4.4.4 @@ -188,7 +188,7 @@ static bool rpmsp_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); bool ok = false; @@ -210,7 +210,7 @@ static bool rpmsp_call(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); /* XXX obj is the global object so lookup "this" object. */ JSObject * o = JSVAL_TO_OBJECT(argv[-2]); void * ptr = JS_GetInstancePrivate(cx, o, &rpmspClass, NULL); @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmst-js.c ============================================================================ $ cvs diff -u -r1.10.4.3 -r1.10.4.4 rpmst-js.c --- rpm/js/rpmst-js.c 11 Jul 2017 10:12:48 -0000 1.10.4.3 +++ rpm/js/rpmst-js.c 11 Jul 2017 10:17:12 -0000 1.10.4.4 @@ -246,7 +246,7 @@ static bool rpmst_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); bool ok = false; jsval fnv = JSVAL_VOID; @@ -272,7 +272,7 @@ static bool rpmst_call(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); /* XXX obj is the global object so lookup "this" object. */ JSObject * o = JSVAL_TO_OBJECT(argv[-2]); void * ptr = JS_GetInstancePrivate(cx, o, &rpmstClass, NULL); @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmsw-js.c ============================================================================ $ cvs diff -u -r1.4.4.3 -r1.4.4.4 rpmsw-js.c --- rpm/js/rpmsw-js.c 11 Jul 2017 10:12:48 -0000 1.4.4.3 +++ rpm/js/rpmsw-js.c 11 Jul 2017 10:17:12 -0000 1.4.4.4 @@ -176,7 +176,7 @@ static bool rpmsw_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); bool ok = false; @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmsx-js.c ============================================================================ $ cvs diff -u -r1.8.4.4 -r1.8.4.5 rpmsx-js.c --- rpm/js/rpmsx-js.c 11 Jul 2017 10:12:48 -0000 1.8.4.4 +++ rpm/js/rpmsx-js.c 11 Jul 2017 10:17:12 -0000 1.8.4.5 @@ -344,7 +344,7 @@ static bool rpmsx_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); bool ok = false; @@ -366,7 +366,7 @@ static bool rpmsx_call(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); /* XXX obj is the global object so lookup "this" object. */ JSObject * o = JSVAL_TO_OBJECT(argv[-2]); void * ptr = JS_GetInstancePrivate(cx, o, &rpmsxClass, NULL); @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmsys-js.c ============================================================================ $ cvs diff -u -r1.8.4.3 -r1.8.4.4 rpmsys-js.c --- rpm/js/rpmsys-js.c 11 Jul 2017 10:12:48 -0000 1.8.4.3 +++ rpm/js/rpmsys-js.c 11 Jul 2017 10:17:12 -0000 1.8.4.4 @@ -62,7 +62,7 @@ static bool rpmsys_access(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL); rpmsys sys = ptr; @@ -82,7 +82,7 @@ static bool rpmsys_chmod(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL); rpmsys sys = ptr; @@ -102,7 +102,7 @@ static bool rpmsys_chown(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL); rpmsys sys = ptr; @@ -127,7 +127,7 @@ static bool rpmsys_creat(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL); rpmsys sys = ptr; @@ -155,7 +155,7 @@ static bool rpmsys_lchown(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL); rpmsys sys = ptr; @@ -177,7 +177,7 @@ static bool rpmsys_link(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL); rpmsys sys = ptr; @@ -196,7 +196,7 @@ static bool rpmsys_lstat(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL); rpmsys sys = ptr; @@ -227,7 +227,7 @@ static bool rpmsys_mkdir(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL); rpmsys sys = ptr; @@ -247,7 +247,7 @@ static bool rpmsys_mkfifo(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL); rpmsys sys = ptr; @@ -267,7 +267,7 @@ static bool rpmsys_mknod(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL); rpmsys sys = ptr; @@ -289,7 +289,7 @@ static bool rpmsys_readlink(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL); rpmsys sys = ptr; @@ -316,7 +316,7 @@ static bool rpmsys_rename(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL); rpmsys sys = ptr; @@ -335,7 +335,7 @@ static bool rpmsys_rmdir(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL); rpmsys sys = ptr; @@ -353,7 +353,7 @@ static bool rpmsys_stat(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL); rpmsys sys = ptr; @@ -384,7 +384,7 @@ static bool rpmsys_symlink(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL); rpmsys sys = ptr; @@ -403,7 +403,7 @@ static bool rpmsys_unlink(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, NULL); rpmsys sys = ptr; @@ -707,7 +707,7 @@ static bool rpmsys_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); bool ok = false; @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmte-js.c ============================================================================ $ cvs diff -u -r1.19.4.3 -r1.19.4.4 rpmte-js.c --- rpm/js/rpmte-js.c 11 Jul 2017 10:12:48 -0000 1.19.4.3 +++ rpm/js/rpmte-js.c 11 Jul 2017 10:17:12 -0000 1.19.4.4 @@ -38,7 +38,7 @@ static bool rpmte_ds(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmteClass, NULL); rpmte te = ptr; @@ -70,7 +70,7 @@ static bool rpmte_fi(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmteClass, NULL); rpmte te = ptr; @@ -372,7 +372,7 @@ static bool rpmte_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); bool ok = false; JSObject *tso = NULL; @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmts-js.c ============================================================================ $ cvs diff -u -r1.33.4.3 -r1.33.4.4 rpmts-js.c --- rpm/js/rpmts-js.c 11 Jul 2017 10:12:48 -0000 1.33.4.3 +++ rpm/js/rpmts-js.c 11 Jul 2017 10:17:12 -0000 1.33.4.4 @@ -84,7 +84,7 @@ static bool rpmts_add(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtsClass, NULL); rpmts ts = ptr; @@ -126,7 +126,7 @@ static bool rpmts_check(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtsClass, NULL); rpmts ts = ptr; @@ -145,7 +145,7 @@ static bool rpmts_order(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtsClass, NULL); rpmts ts = ptr; @@ -164,7 +164,7 @@ static bool rpmts_run(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtsClass, NULL); rpmts ts = ptr; @@ -188,7 +188,7 @@ static bool rpmts_mi(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtsClass, NULL); rpmts ts = ptr; @@ -225,7 +225,7 @@ static bool rpmts_dbrebuild(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtsClass, NULL); rpmts ts = ptr; @@ -246,7 +246,7 @@ static bool rpmts_dbkeys(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtsClass, NULL); rpmts ts = ptr; @@ -714,7 +714,7 @@ static bool rpmts_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); bool ok = false; @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmtxn-js.c ============================================================================ $ cvs diff -u -r1.11.4.3 -r1.11.4.4 rpmtxn-js.c --- rpm/js/rpmtxn-js.c 11 Jul 2017 10:12:48 -0000 1.11.4.3 +++ rpm/js/rpmtxn-js.c 11 Jul 2017 10:17:12 -0000 1.11.4.4 @@ -45,7 +45,7 @@ static bool rpmtxn_Abort(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtxnClass, NULL); DB_TXN * txn = ptr; @@ -74,7 +74,7 @@ static bool rpmtxn_Commit(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtxnClass, NULL); DB_TXN * txn = ptr; @@ -107,7 +107,7 @@ static bool rpmtxn_Discard(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtxnClass, NULL); DB_TXN * txn = ptr; @@ -137,7 +137,7 @@ static bool rpmtxn_Prepare(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtxnClass, NULL); DB_TXN * txn = ptr; @@ -373,7 +373,7 @@ static bool rpmtxn_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); bool ok = false; @@ -395,7 +395,7 @@ static bool rpmtxn_call(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); /* XXX obj is the global object so lookup "this" object. */ JSObject * o = JSVAL_TO_OBJECT(argv[-2]); void * ptr = JS_GetInstancePrivate(cx, o, &rpmtxnClass, NULL); @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmxar-js.c ============================================================================ $ cvs diff -u -r1.5.4.3 -r1.5.4.4 rpmxar-js.c --- rpm/js/rpmxar-js.c 11 Jul 2017 10:12:48 -0000 1.5.4.3 +++ rpm/js/rpmxar-js.c 11 Jul 2017 10:17:12 -0000 1.5.4.4 @@ -221,7 +221,7 @@ static bool rpmxar_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); bool ok = false; const char * _fn = "popt-1.14.xar"; @@ . patch -p0 <<'@@ .' Index: rpm/js/syck-js.c ============================================================================ $ cvs diff -u -r1.9.4.3 -r1.9.4.4 syck-js.c --- rpm/js/syck-js.c 11 Jul 2017 10:12:48 -0000 1.9.4.3 +++ rpm/js/syck-js.c 11 Jul 2017 10:17:12 -0000 1.9.4.4 @@ -194,7 +194,7 @@ static bool syck_load(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); SyckParser *parser = syck_new_parser(); struct parser_xtra *bonus = xcalloc(1, sizeof(*bonus)); @@ -235,7 +235,7 @@ static bool syck_dump(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); SyckEmitter *emitter = syck_new_emitter(); struct emitter_xtra * bonus = xcalloc(1, sizeof(*bonus)); @@ -417,7 +417,7 @@ static bool syck_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); bool ok = false; @@ . patch -p0 <<'@@ .' Index: rpm/js/uuid-js.c ============================================================================ $ cvs diff -u -r1.18.4.3 -r1.18.4.4 uuid-js.c --- rpm/js/uuid-js.c 11 Jul 2017 10:12:48 -0000 1.18.4.3 +++ rpm/js/uuid-js.c 11 Jul 2017 10:17:12 -0000 1.18.4.4 @@ -40,7 +40,7 @@ static bool uuid_generate(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &uuidClass, NULL); int32 version = 0; @@ -109,7 +109,7 @@ static bool uuid_describe(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_THIS_OBJECT(cx, vp); void * ptr = JS_GetInstancePrivate(cx, obj, &uuidClass, NULL); uuid_t *uuid = NULL; @@ -282,7 +282,7 @@ static bool uuid_ctor(JSContext *cx, unsigned argc, Value* vp) { - jsval *argv = JS_ARGV(cx, vp); + CallArgs argv = CallArgsFromVp(argc, vp); JSObject *obj = JS_NewObjectForConstructor(cx, vp); bool ok = false; @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org