RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 11-Jul-2017 13:00:56 Branch: rpm-5_4 Handle: 2017071111005500 Modified files: (Branch: rpm-5_4) rpm/js rpmaug-js.c rpmbf-js.c rpmcudf-js.c rpmdb-js.c rpmdbc-js.c rpmdbe-js.c rpmdc-js.c rpmdir-js.c rpmds-js.c rpmfi-js.c rpmfts-js.c rpmhdr-js.c rpmio-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 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: JS_ConvertArguments no longer needs argc. Summary: Revision Changes Path 1.11.4.9 +9 -9 rpm/js/rpmaug-js.c 1.10.4.8 +6 -6 rpm/js/rpmbf-js.c 1.6.4.8 +2 -2 rpm/js/rpmcudf-js.c 1.31.4.7 +20 -20 rpm/js/rpmdb-js.c 1.14.4.7 +7 -7 rpm/js/rpmdbc-js.c 1.21.4.8 +40 -40 rpm/js/rpmdbe-js.c 1.9.4.8 +4 -4 rpm/js/rpmdc-js.c 1.8.4.6 +2 -2 rpm/js/rpmdir-js.c 1.20.4.7 +1 -1 rpm/js/rpmds-js.c 1.15.4.7 +1 -1 rpm/js/rpmfi-js.c 1.10.4.7 +5 -5 rpm/js/rpmfts-js.c 1.24.4.8 +5 -5 rpm/js/rpmhdr-js.c 1.9.4.8 +11 -11 rpm/js/rpmio-js.c 1.12.4.8 +4 -4 rpm/js/rpmmc-js.c 1.4.4.7 +2 -2 rpm/js/rpmmg-js.c 1.28.4.8 +5 -5 rpm/js/rpmmi-js.c 1.7.4.7 +5 -5 rpm/js/rpmmpf-js.c 1.21.4.8 +3 -3 rpm/js/rpmmpw-js.c 1.18.4.8 +1 -1 rpm/js/rpmps-js.c 1.7.4.7 +8 -8 rpm/js/rpmseq-js.c 1.8.4.7 +2 -2 rpm/js/rpmsm-js.c 1.4.4.7 +1 -1 rpm/js/rpmsp-js.c 1.10.4.6 +2 -2 rpm/js/rpmst-js.c 1.8.4.8 +1 -1 rpm/js/rpmsx-js.c 1.8.4.8 +16 -16 rpm/js/rpmsys-js.c 1.19.4.8 +3 -3 rpm/js/rpmte-js.c 1.33.4.8 +3 -3 rpm/js/rpmts-js.c 1.11.4.7 +3 -3 rpm/js/rpmtxn-js.c 1.5.4.7 +1 -1 rpm/js/rpmxar-js.c 1.9.4.7 +2 -2 rpm/js/syck-js.c 1.18.4.7 +2 -2 rpm/js/uuid-js.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/js/rpmaug-js.c ============================================================================ $ cvs diff -u -r1.11.4.8 -r1.11.4.9 rpmaug-js.c --- rpm/js/rpmaug-js.c 11 Jul 2017 10:54:44 -0000 1.11.4.8 +++ rpm/js/rpmaug-js.c 11 Jul 2017 11:00:55 -0000 1.11.4.9 @@ -42,7 +42,7 @@ _METHOD_DEBUG_ENTRY(_debug); /* XXX note optional EXPR. If EXPR is NULL, then NAME is deleted. */ - if (!(ok = JS_ConvertArguments(cx, argc, argv, "s/s", &_name, &_expr))) + if (!(ok = JS_ConvertArguments(cx, argv, "s/s", &_name, &_expr))) goto exit; switch (rpmaugDefvar(aug, _name, _expr)) { @@ -72,7 +72,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "s", &_path))) + if (!(ok = JS_ConvertArguments(cx, argv, "s", &_path))) goto exit; switch (rpmaugGet(aug, _path, &_value)) { @@ -106,7 +106,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "ss", &_path, &_value))) + if (!(ok = JS_ConvertArguments(cx, argv, "ss", &_path, &_value))) goto exit; switch (rpmaugSet(aug, _path, _value)) { @@ -137,7 +137,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "ssi", &_path, &_label, &_before))) + if (!(ok = JS_ConvertArguments(cx, argv, "ssi", &_path, &_label, &_before))) goto exit; switch (rpmaugInsert(aug, _path, _label, _before)) { @@ -166,7 +166,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "s", &_path))) + if (!(ok = JS_ConvertArguments(cx, argv, "s", &_path))) goto exit; /* XXX rpmaug_rm() returns number of deleted nodes. */ @@ -189,7 +189,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "ss", &_src, &_dst))) + if (!(ok = JS_ConvertArguments(cx, argv, "ss", &_src, &_dst))) goto exit; switch (rpmaugMv(aug, _src, _dst)) { @@ -220,7 +220,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "s", &_path))) + if (!(ok = JS_ConvertArguments(cx, argv, "s", &_path))) goto exit; nmatches = rpmaugMatch(aug, _path, &_matches); @@ -305,7 +305,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "s", &_path))) + if (!(ok = JS_ConvertArguments(cx, argv, "s", &_path))) goto exit; switch (rpmaugPrint(aug, NULL, _path)) { @@ -551,7 +551,7 @@ _CTOR_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/ssu", &_root, &_loadpath, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/ssu", &_root, &_loadpath, &_flags))) goto exit; if (JS_IsConstructing(cx, vp)) { @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmbf-js.c ============================================================================ $ cvs diff -u -r1.10.4.7 -r1.10.4.8 rpmbf-js.c --- rpm/js/rpmbf-js.c 11 Jul 2017 10:54:44 -0000 1.10.4.7 +++ rpm/js/rpmbf-js.c 11 Jul 2017 11:00:55 -0000 1.10.4.8 @@ -32,7 +32,7 @@ _METHOD_DEBUG_ENTRY(_debug); *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "s", &_s))) + if (!(ok = JS_ConvertArguments(cx, argv, "s", &_s))) goto exit; *vp = (rpmbfAdd(bf, _s, 0) == 0 ? JSVAL_TRUE : JSVAL_FALSE); @@ -54,7 +54,7 @@ _METHOD_DEBUG_ENTRY(_debug); *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "s", &_s))) + if (!(ok = JS_ConvertArguments(cx, argv, "s", &_s))) goto exit; *vp = (rpmbfChk(bf, _s, 0) > 0 ? JSVAL_TRUE : JSVAL_FALSE); @@ -91,7 +91,7 @@ _METHOD_DEBUG_ENTRY(_debug); *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "s", &_s))) + if (!(ok = JS_ConvertArguments(cx, argv, "s", &_s))) goto exit; *vp = (rpmbfDel(bf, _s, 0) == 0 ? JSVAL_TRUE : JSVAL_FALSE); @@ -114,7 +114,7 @@ _METHOD_DEBUG_ENTRY(_debug); *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "o", &o)) + if (!(ok = JS_ConvertArguments(cx, argv, "o", &o)) || (_b = JS_GetInstancePrivate(cx, o, &rpmbfClass, NULL)) == NULL) goto exit; @@ -139,7 +139,7 @@ _METHOD_DEBUG_ENTRY(_debug); *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "o", &o)) + if (!(ok = JS_ConvertArguments(cx, argv, "o", &o)) || (_b = JS_GetInstancePrivate(cx, o, &rpmbfClass, NULL)) == NULL) goto exit; @@ -385,7 +385,7 @@ _CTOR_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/uuu", &_m, &_k, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/uuu", &_m, &_k, &_flags))) goto exit; ok = false; /* XXX reset */ @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmcudf-js.c ============================================================================ $ cvs diff -u -r1.6.4.7 -r1.6.4.8 rpmcudf-js.c --- rpm/js/rpmcudf-js.c 11 Jul 2017 10:54:44 -0000 1.6.4.7 +++ rpm/js/rpmcudf-js.c 11 Jul 2017 11:00:55 -0000 1.6.4.8 @@ -52,7 +52,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "o", &fno))) + if (!(ok = JS_ConvertArguments(cx, argv, "o", &fno))) goto exit; if (fno && JSVAL_IS_STRING(OBJECT_TO_JSVAL(fno))) { @@ -313,7 +313,7 @@ _CTOR_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/oi", &fno, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/oi", &fno, &_flags))) goto exit; if (JS_IsConstructing(cx, vp)) { @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmdb-js.c ============================================================================ $ cvs diff -u -r1.31.4.6 -r1.31.4.7 rpmdb-js.c --- rpm/js/rpmdb-js.c 11 Jul 2017 10:49:38 -0000 1.31.4.6 +++ rpm/js/rpmdb-js.c 11 Jul 2017 11:00:55 -0000 1.31.4.7 @@ -153,7 +153,7 @@ if (db == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "oo/u", &o_txn, &o_db, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "oo/u", &o_txn, &o_db, &_flags))) goto exit; if (o_db && OBJ_IS_RPMDB(cx, o_db)) @@ -205,7 +205,7 @@ *vp = JSVAL_FALSE; /* FIXME todo++ */ - if (!(ok = JS_ConvertArguments(cx, argc, argv, "o/u", &o_db, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "o/u", &o_db, &_flags))) goto exit; if (o_db && OBJ_IS_RPMDB(cx, o_db)) @@ -284,7 +284,7 @@ if (db == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "o/u", &o, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "o/u", &o, &_flags))) goto exit; if (o && OBJ_IS_RPMTXN(cx, o)) @@ -325,7 +325,7 @@ if (db == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/ou", &o, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/ou", &o, &_flags))) goto exit; if (o && OBJ_IS_RPMTXN(cx, o)) @@ -377,7 +377,7 @@ if (db == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "ov/u", &o, &_kv, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "ov/u", &o, &_kv, &_flags))) goto exit; if (o && OBJ_IS_RPMTXN(cx, o)) @@ -426,7 +426,7 @@ if (db == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "ov/u", &o, &_kv, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "ov/u", &o, &_kv, &_flags))) goto exit; if (o && OBJ_IS_RPMTXN(cx, o)) @@ -478,7 +478,7 @@ if (db == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "ov/vu", &o, &_kv, &_dv, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "ov/vu", &o, &_kv, &_dv, &_flags))) goto exit; if (o && OBJ_IS_RPMTXN(cx, o)) @@ -607,7 +607,7 @@ if (db == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "ov/u", &o, &_kv, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "ov/u", &o, &_kv, &_flags))) goto exit; if (o && OBJ_IS_RPMTXN(cx, o)) @@ -665,7 +665,7 @@ if (db == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "os/suui", &o, &_file, &_database, &_type, &_oflags, &_mode))) + if (!(ok = JS_ConvertArguments(cx, argv, "os/suui", &o, &_file, &_database, &_type, &_oflags, &_mode))) goto exit; if (o && OBJ_IS_RPMTXN(cx, o)) @@ -723,7 +723,7 @@ if (db == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "ov/vu", &o, &_kv, &_dv, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "ov/vu", &o, &_kv, &_dv, &_flags))) goto exit; if (o && OBJ_IS_RPMTXN(cx, o)) @@ -777,7 +777,7 @@ if (db == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "ovv/u", &o, &_kv, &_dv, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "ovv/u", &o, &_kv, &_dv, &_flags))) goto exit; if (o && OBJ_IS_RPMTXN(cx, o)) @@ -826,7 +826,7 @@ if (db == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "s/s", &_file, &_database))) + if (!(ok = JS_ConvertArguments(cx, argv, "s/s", &_file, &_database))) goto exit; if (db->app_private == NULL) { @@ -863,7 +863,7 @@ if (db == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "sss", &_file, &_database, &_newname))) + if (!(ok = JS_ConvertArguments(cx, argv, "sss", &_file, &_database, &_newname))) goto exit; /* XXX lazy reopen in order to rename? */ @@ -900,7 +900,7 @@ if (db == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "o/u", &o, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "o/u", &o, &_flags))) goto exit; if (o && OBJ_IS_RPMTXN(cx, o)) @@ -938,7 +938,7 @@ if (db == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/u", &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/u", &_flags))) goto exit; if (db->app_private != NULL) { @@ -1003,7 +1003,7 @@ *vp = JSVAL_FALSE; /* XXX check argc? */ - if (!(ok = JS_ConvertArguments(cx, argc, argv, "o/u", &o, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "o/u", &o, &_flags))) goto exit; if (o && OBJ_IS_RPMTXN(cx, o)) @@ -1039,7 +1039,7 @@ if (db == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "s", &_file))) + if (!(ok = JS_ConvertArguments(cx, argv, "s", &_file))) goto exit; /* XXX check db->lorder, same endianness is required. */ @@ -1075,7 +1075,7 @@ if (db == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "ssu", &_file, &_database, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "ssu", &_file, &_database, &_flags))) goto exit; if (db->app_private == NULL) { @@ -1719,7 +1719,7 @@ _CTOR_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/ou", &o, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/ou", &o, &_flags))) goto exit; if (OBJ_IS_RPMDBE(cx, o)) @@ -1753,7 +1753,7 @@ bool ok = false; #ifdef NOTYET - if (!(ok = JS_ConvertArguments(cx, argc, argv, "s", &_fn))) + if (!(ok = JS_ConvertArguments(cx, argv, "s", &_fn))) goto exit; *vp = (db && _fn && (_con = rpmdbLgetfilecon(db, _fn)) != NULL) @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmdbc-js.c ============================================================================ $ cvs diff -u -r1.14.4.6 -r1.14.4.7 rpmdbc-js.c --- rpm/js/rpmdbc-js.c 11 Jul 2017 10:49:38 -0000 1.14.4.6 +++ rpm/js/rpmdbc-js.c 11 Jul 2017 11:00:55 -0000 1.14.4.7 @@ -86,7 +86,7 @@ if (dbc == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "o", &_o)) + if (!(ok = JS_ConvertArguments(cx, argv, "o", &_o)) || (_otherdbc = JS_GetInstancePrivate(cx, _o, &rpmdbcClass, NULL)) == NULL) goto exit; @@ -163,7 +163,7 @@ if (dbc == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/u", &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/u", &_flags))) goto exit; { int ret = dbc->del(dbc, _flags); @@ -199,7 +199,7 @@ if (dbc == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/u", &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/u", &_flags))) goto exit; { JSObject * _o = NULL; @@ -248,7 +248,7 @@ if (dbc == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "v/vu", &_kv, &_dv, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "v/vu", &_kv, &_dv, &_flags))) goto exit; if (rpmdb_v2dbt(cx, _kv, &_k)) goto exit; @@ -303,7 +303,7 @@ if (dbc == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "v/vu", &_kv, &_dv, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "v/vu", &_kv, &_dv, &_flags))) goto exit; if (rpmdb_v2dbt(cx, _kv, &_k)) goto exit; @@ -350,7 +350,7 @@ if (dbc == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "vv/u", &_kv, &_dv, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "vv/u", &_kv, &_dv, &_flags))) goto exit; if (rpmdb_v2dbt(cx, _kv, &_k)) goto exit; @@ -638,7 +638,7 @@ bool ok = false; #ifdef NOTYET - if (!(ok = JS_ConvertArguments(cx, argc, argv, "s", &_fn))) + if (!(ok = JS_ConvertArguments(cx, argv, "s", &_fn))) goto exit; *vp = (dbc && _fn && (_con = rpmdbcLgetfilecon(dbc, _fn)) != NULL) @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmdbe-js.c ============================================================================ $ cvs diff -u -r1.21.4.7 -r1.21.4.8 rpmdbe-js.c --- rpm/js/rpmdbe-js.c 11 Jul 2017 10:49:38 -0000 1.21.4.7 +++ rpm/js/rpmdbe-js.c 11 Jul 2017 11:00:55 -0000 1.21.4.8 @@ -243,7 +243,7 @@ if (dbenv == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "S/S", &js_file, &js_database))) + if (!(ok = JS_ConvertArguments(cx, argv, "S/S", &js_file, &js_database))) goto exit; if (dbenv) { @@ -283,7 +283,7 @@ if (dbenv == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "SSS", &js_file, &js_database, &js_newname))) + if (!(ok = JS_ConvertArguments(cx, argv, "SSS", &js_file, &js_database, &js_newname))) goto exit; if (dbenv) { @@ -322,7 +322,7 @@ if (dbenv == NULL) goto exit; *vp = JSVAL_VOID; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/u", &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/u", &_flags))) goto exit; if (dbenv->app_private != NULL) { @@ -362,7 +362,7 @@ if (dbenv == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "S/u", &js_file, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "S/u", &js_file, &_flags))) goto exit; if (dbenv->app_private != NULL) { @@ -396,7 +396,7 @@ if (dbenv == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/u", &_atype))) + if (!(ok = JS_ConvertArguments(cx, argv, "/u", &_atype))) goto exit; if (dbenv->app_private != NULL) { @@ -469,7 +469,7 @@ if (dbenv == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "u/uu", &_id, &_flags, &_mode))) + if (!(ok = JS_ConvertArguments(cx, argv, "u/uu", &_id, &_flags, &_mode))) goto exit; if (dbenv->app_private != NULL) { @@ -535,7 +535,7 @@ if (dbenv == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "u", &_id))) + if (!(ok = JS_ConvertArguments(cx, argv, "u", &_id))) goto exit; if (dbenv->app_private != NULL) { @@ -569,7 +569,7 @@ *vp = JSVAL_FALSE; #ifdef NOTYET - if (!(ok = JS_ConvertArguments(cx, argc, argv, "u/uu", &_id, &_flags, _lock_mode))) + if (!(ok = JS_ConvertArguments(cx, argv, "u/uu", &_id, &_flags, _lock_mode))) goto exit; #endif @@ -603,7 +603,7 @@ if (dbenv == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/u", &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/u", &_flags))) goto exit; if (dbenv->app_private != NULL) { @@ -637,7 +637,7 @@ if (dbenv == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/u", &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/u", &_flags))) goto exit; if (dbenv->app_private != NULL) { @@ -670,7 +670,7 @@ if (dbenv == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "u/u", &_id, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "u/u", &_id, &_flags))) goto exit; if (dbenv->app_private != NULL) { @@ -704,7 +704,7 @@ *vp = JSVAL_FALSE; /* FIXME todo++ */ - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/u", &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/u", &_flags))) goto exit; if (dbenv->app_private != NULL) { @@ -780,7 +780,7 @@ if (dbenv == NULL) goto exit; *vp = JSVAL_NULL; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "uu", &_lsn.file, &_lsn.offset))) + if (!(ok = JS_ConvertArguments(cx, argv, "uu", &_lsn.file, &_lsn.offset))) goto exit; if (dbenv->app_private != NULL) { @@ -817,7 +817,7 @@ if (dbenv == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "uu", &_lsn.file, &_lsn.offset))) + if (!(ok = JS_ConvertArguments(cx, argv, "uu", &_lsn.file, &_lsn.offset))) goto exit; if (dbenv->app_private != NULL) { @@ -850,7 +850,7 @@ *vp = JSVAL_FALSE; /*XXX FIXME: parse additional arguments */ - if (!(ok = JS_ConvertArguments(cx, argc, argv, "S", &js_fmt))) + if (!(ok = JS_ConvertArguments(cx, argv, "S", &js_fmt))) goto exit; if (dbenv->app_private != NULL) { @@ -886,7 +886,7 @@ if (dbenv == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "uu/u", &_lsn.file, &_lsn.offset, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "uu/u", &_lsn.file, &_lsn.offset, &_flags))) goto exit; if (dbenv->app_private != NULL) { @@ -921,7 +921,7 @@ if (dbenv == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/u", &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/u", &_flags))) goto exit; if (dbenv->app_private != NULL) { @@ -955,7 +955,7 @@ if (dbenv == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/u", &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/u", &_flags))) goto exit; if (dbenv->app_private != NULL) { @@ -988,7 +988,7 @@ if (dbenv == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "S/u", &js_file, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "S/u", &js_file, &_flags))) goto exit; if (dbenv->app_private != NULL) { @@ -1071,7 +1071,7 @@ *vp = JSVAL_FALSE; /* FIXME todo++ */ - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/u", &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/u", &_flags))) goto exit; if (dbenv->app_private != NULL) { @@ -1109,7 +1109,7 @@ if (dbenv == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/u", &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/u", &_flags))) goto exit; if (dbenv->app_private != NULL) { @@ -1141,7 +1141,7 @@ if (dbenv == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/uu", &_lsn.file, &_lsn.offset))) + if (!(ok = JS_ConvertArguments(cx, argv, "/uu", &_lsn.file, &_lsn.offset))) goto exit; if (dbenv->app_private != NULL) { @@ -1174,7 +1174,7 @@ if (dbenv == NULL) goto exit; *vp = JSVAL_VOID; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/i", &_percent))) + if (!(ok = JS_ConvertArguments(cx, argv, "/i", &_percent))) goto exit; if (dbenv->app_private != NULL) { @@ -1209,7 +1209,7 @@ if (dbenv == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/u", &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/u", &_flags))) goto exit; if (dbenv->app_private != NULL) { @@ -1302,7 +1302,7 @@ if (dbenv == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/u", &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/u", &_flags))) goto exit; if (dbenv->app_private != NULL) { @@ -1336,7 +1336,7 @@ if (dbenv == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/u", &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/u", &_flags))) goto exit; if (dbenv->app_private != NULL) { @@ -1400,7 +1400,7 @@ if (dbenv == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "Su/i", &js_home, &_eflags, &_mode))) + if (!(ok = JS_ConvertArguments(cx, argv, "Su/i", &js_home, &_eflags, &_mode))) goto exit; if (dbenv->app_private == NULL) { @@ -1445,7 +1445,7 @@ if (dbenv == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "S/u", &js_home, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "S/u", &js_home, &_flags))) goto exit; if (dbenv->app_private == NULL) { @@ -1483,7 +1483,7 @@ if (dbenv == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/uu", &_nsites, &_nvotes))) + if (!(ok = JS_ConvertArguments(cx, argv, "/uu", &_nsites, &_nvotes))) goto exit; if (dbenv->app_private != NULL) { @@ -1563,7 +1563,7 @@ if (dbenv == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/u", &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/u", &_flags))) goto exit; if (dbenv->app_private != NULL) { @@ -1597,7 +1597,7 @@ if (dbenv == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/u", &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/u", &_flags))) goto exit; if (dbenv->app_private != NULL) { @@ -1629,7 +1629,7 @@ if (dbenv == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/u", &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/u", &_flags))) goto exit; if (dbenv->app_private != NULL) { @@ -1685,7 +1685,7 @@ if (dbenv == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/u", &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/u", &_flags))) goto exit; if (dbenv->app_private != NULL) { @@ -1719,7 +1719,7 @@ if (dbenv == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/u", &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/u", &_flags))) goto exit; if (dbenv->app_private != NULL) { @@ -1751,7 +1751,7 @@ if (dbenv == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/u", &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/u", &_flags))) goto exit; if (dbenv->app_private != NULL) { @@ -1787,7 +1787,7 @@ if (dbenv == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "o/u", &o, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "o/u", &o, &_flags))) goto exit; if (o && OBJ_IS_RPMTXN(cx, o)) @@ -1837,7 +1837,7 @@ if (dbenv == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/uuu", &_kb, &_minutes, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/uuu", &_kb, &_minutes, &_flags))) goto exit; if (dbenv->app_private != NULL) { @@ -1919,7 +1919,7 @@ if (dbenv == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/u", &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/u", &_flags))) goto exit; if (dbenv->app_private != NULL) { @@ -1953,7 +1953,7 @@ if (dbenv == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/u", &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/u", &_flags))) goto exit; if (dbenv->app_private != NULL) { @@ -2858,7 +2858,7 @@ DB_ENV * dbenv = ptr; JSString * js_fn = NULL; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "S", &js_fn))) + if (!(ok = JS_ConvertArguments(cx, argv, "S", &js_fn))) goto exit; { @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmdc-js.c ============================================================================ $ cvs diff -u -r1.9.4.7 -r1.9.4.8 rpmdc-js.c --- rpm/js/rpmdc-js.c 11 Jul 2017 10:54:44 -0000 1.9.4.7 +++ rpm/js/rpmdc-js.c 11 Jul 2017 11:00:55 -0000 1.9.4.8 @@ -55,7 +55,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/uu", &_dalgo, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/uu", &_dalgo, &_flags))) goto exit; if (dc) { @@ -87,7 +87,7 @@ _METHOD_DEBUG_ENTRY(_debug); *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "s", &s))) + if (!(ok = JS_ConvertArguments(cx, argv, "s", &s))) goto exit; if (dc == NULL) goto exit; @@ -297,7 +297,7 @@ _CTOR_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/uu", &_dalgo, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/uu", &_dalgo, &_flags))) goto exit; if (JS_IsConstructing(cx, vp)) { @@ -326,7 +326,7 @@ unsigned int _dalgo = PGPHASHALGO_NONE; unsigned int _flags = RPMDIGEST_NONE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/s", &s))) + if (!(ok = JS_ConvertArguments(cx, argv, "/s", &s))) goto exit; if (dc) { @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmdir-js.c ============================================================================ $ cvs diff -u -r1.8.4.5 -r1.8.4.6 rpmdir-js.c --- rpm/js/rpmdir-js.c 11 Jul 2017 10:49:38 -0000 1.8.4.5 +++ rpm/js/rpmdir-js.c 11 Jul 2017 11:00:55 -0000 1.8.4.6 @@ -213,7 +213,7 @@ _CTOR_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/s", &_dn))) + if (!(ok = JS_ConvertArguments(cx, argv, "/s", &_dn))) goto exit; if (JS_IsConstructing(cx, vp)) { @@ -242,7 +242,7 @@ if (_debug) fprintf(stderr, "==> %s(%p,%p[%u],%p) o %p ptr %p\n", __FUNCTION__, cx, argv, (unsigned)argc, vp, o, ptr); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/s", &_dn))) + if (!(ok = JS_ConvertArguments(cx, argv, "/s", &_dn))) goto exit; if (dir) { @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmds-js.c ============================================================================ $ cvs diff -u -r1.20.4.6 -r1.20.4.7 rpmds-js.c --- rpm/js/rpmds-js.c 11 Jul 2017 10:54:44 -0000 1.20.4.6 +++ rpm/js/rpmds-js.c 11 Jul 2017 11:00:55 -0000 1.20.4.7 @@ -432,7 +432,7 @@ _CTOR_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "v/u", &v, &tagN))) + if (!(ok = JS_ConvertArguments(cx, argv, "v/u", &v, &tagN))) goto exit; if (JS_IsConstructing(cx, vp)) { @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmfi-js.c ============================================================================ $ cvs diff -u -r1.15.4.6 -r1.15.4.7 rpmfi-js.c --- rpm/js/rpmfi-js.c 11 Jul 2017 10:54:44 -0000 1.15.4.6 +++ rpm/js/rpmfi-js.c 11 Jul 2017 11:00:55 -0000 1.15.4.7 @@ -389,7 +389,7 @@ _CTOR_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "o/i", &hdro, &tagN))) + if (!(ok = JS_ConvertArguments(cx, argv, "o/i", &hdro, &tagN))) goto exit; if (JS_IsConstructing(cx, vp)) { @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmfts-js.c ============================================================================ $ cvs diff -u -r1.10.4.6 -r1.10.4.7 rpmfts-js.c --- rpm/js/rpmfts-js.c 11 Jul 2017 10:49:38 -0000 1.10.4.6 +++ rpm/js/rpmfts-js.c 11 Jul 2017 11:00:55 -0000 1.10.4.7 @@ -103,7 +103,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/u", &_instr))) + if (!(ok = JS_ConvertArguments(cx, argv, "/u", &_instr))) goto exit; /* XXX FIXME: FTS_children() return? */ @@ -152,7 +152,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "o/u", &dno, &_options))) + if (!(ok = JS_ConvertArguments(cx, argv, "o/u", &dno, &_options))) goto exit; if (fts) { @@ -202,7 +202,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/u", &_instr))) + if (!(ok = JS_ConvertArguments(cx, argv, "/u", &_instr))) goto exit; *vp = (fts && p && !Fts_set(fts, p, _instr) @@ -520,7 +520,7 @@ _CTOR_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/ou", &dno, &_options))) + if (!(ok = JS_ConvertArguments(cx, argv, "/ou", &dno, &_options))) goto exit; if (JS_IsConstructing(cx, vp)) { @@ -548,7 +548,7 @@ JSObject *dno = NULL; int _options = -1; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/ou", &dno, &_options))) + if (!(ok = JS_ConvertArguments(cx, argv, "/ou", &dno, &_options))) goto exit; if (fts) { @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmhdr-js.c ============================================================================ $ cvs diff -u -r1.24.4.7 -r1.24.4.8 rpmhdr-js.c --- rpm/js/rpmhdr-js.c 11 Jul 2017 10:54:44 -0000 1.24.4.7 +++ rpm/js/rpmhdr-js.c 11 Jul 2017 11:00:55 -0000 1.24.4.8 @@ -154,7 +154,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/u", &tagN))) + if (!(ok = JS_ConvertArguments(cx, argv, "/u", &tagN))) goto exit; *vp = OBJECT_TO_JSVAL(rpmjs_NewDsObject(cx, OBJECT_TO_JSVAL(obj), tagN)); ok = true; @@ -174,7 +174,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/u", &tagN))) + if (!(ok = JS_ConvertArguments(cx, argv, "/u", &tagN))) goto exit; *vp = OBJECT_TO_JSVAL(rpmjs_NewFiObject(cx, h, tagN)); ok = true; @@ -196,7 +196,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "s", &qfmt))) + if (!(ok = JS_ConvertArguments(cx, argv, "s", &qfmt))) goto exit; if ((s = headerSprintf(h, qfmt, NULL, rpmHeaderFormats, &errstr)) == NULL) @@ -235,7 +235,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "s", &s))) + if (!(ok = JS_ConvertArguments(cx, argv, "s", &s))) goto exit; (void) headerSetOrigin(h, s); @@ -471,7 +471,7 @@ _CTOR_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/o", &tso))) + if (!(ok = JS_ConvertArguments(cx, argv, "/o", &tso))) goto exit; if (JS_IsConstructing(cx, vp)) { @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmio-js.c ============================================================================ $ cvs diff -u -r1.9.4.7 -r1.9.4.8 rpmio-js.c --- rpm/js/rpmio-js.c 11 Jul 2017 10:54:44 -0000 1.9.4.7 +++ rpm/js/rpmio-js.c 11 Jul 2017 11:00:55 -0000 1.9.4.8 @@ -76,7 +76,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if ((ok = JS_ConvertArguments(cx, argc, argv, "/uu", &_dalgo, &_flags))) { + if ((ok = JS_ConvertArguments(cx, argv, "/uu", &_dalgo, &_flags))) { if (fd) fdInitDigest(fd, _dalgo, _flags); *vp = OBJECT_TO_JSVAL(obj); @@ -96,7 +96,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if ((ok = JS_ConvertArguments(cx, argc, argv, "/u", &_dalgo))) { + if ((ok = JS_ConvertArguments(cx, argv, "/u", &_dalgo))) { if (fd) { const char * s = NULL; size_t ns = 0; @@ -121,7 +121,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if ((ok = JS_ConvertArguments(cx, argc, argv, "/ii", &_uid, &_gid))) { + if ((ok = JS_ConvertArguments(cx, argv, "/ii", &_uid, &_gid))) { uid_t uid = _uid; uid_t gid = _gid; *vp = (fd && !Fchown(fd, uid, gid) @@ -166,7 +166,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "s", &_fmode))) + if (!(ok = JS_ConvertArguments(cx, argv, "s", &_fmode))) goto exit; /* XXX needs checking */ @@ -264,7 +264,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "s/s", &_fn, &_fmode))) + if (!(ok = JS_ConvertArguments(cx, argv, "s/s", &_fn, &_fmode))) goto exit; if (fd) { @@ -296,7 +296,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/u", &_nb))) + if (!(ok = JS_ConvertArguments(cx, argv, "/u", &_nb))) goto exit; if (_nb > _nbmax) _nb = _nbmax; @@ -335,7 +335,7 @@ int rc = -3; _METHOD_DEBUG_ENTRY(_debug); - if ((ok = JS_ConvertArguments(cx, argc, argv, "/ii", &_offset, _whence))) + if ((ok = JS_ConvertArguments(cx, argv, "/ii", &_offset, _whence))) rc = (fd ? Fseek(fd, _offset, _whence) : -3); *vp = INT_TO_JSVAL(rc); return ok; @@ -354,7 +354,7 @@ int rc = -3; _METHOD_DEBUG_ENTRY(_debug); - if ((ok = JS_ConvertArguments(cx, argc, argv, "i", &_offset))) { + if ((ok = JS_ConvertArguments(cx, argv, "i", &_offset))) { fpos_t pos = _offset; rc = (fd ? Fsetpos(fd, &pos) : -3); } @@ -423,7 +423,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "s", &b))) + if (!(ok = JS_ConvertArguments(cx, argv, "s", &b))) goto exit; assert(b != NULL); nb = strlen(b); @@ -673,7 +673,7 @@ _CTOR_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/ss", &_fn, &_fmode))) + if (!(ok = JS_ConvertArguments(cx, argv, "/ss", &_fn, &_fmode))) goto exit; if (JS_IsConstructing(cx, vp)) { @@ -703,7 +703,7 @@ if (_debug) fprintf(stderr, "==> %s(%p,%p[%u],%p) o %p ptr %p\n", __FUNCTION__, cx, argv, (unsigned)argc, vp, o, ptr); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/ss", &_fn, &_fmode))) + if (!(ok = JS_ConvertArguments(cx, argv, "/ss", &_fn, &_fmode))) goto exit; if (fd) { @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmmc-js.c ============================================================================ $ cvs diff -u -r1.12.4.7 -r1.12.4.8 rpmmc-js.c --- rpm/js/rpmmc-js.c 11 Jul 2017 10:54:45 -0000 1.12.4.7 +++ rpm/js/rpmmc-js.c 11 Jul 2017 11:00:55 -0000 1.12.4.8 @@ -37,7 +37,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "s", &s))) + if (!(ok = JS_ConvertArguments(cx, argv, "s", &s))) goto exit; (void) rpmDefineMacro(mc, s, lvl); @@ -59,7 +59,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "s", &s))) + if (!(ok = JS_ConvertArguments(cx, argv, "s", &s))) goto exit; (void) rpmUndefineMacro(mc, s); @@ -121,7 +121,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "s", &s))) + if (!(ok = JS_ConvertArguments(cx, argv, "s", &s))) goto exit; t = rpmMCExpand(mc, s, NULL); @@ -305,7 +305,7 @@ _CTOR_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/v", &v))) + if (!(ok = JS_ConvertArguments(cx, argv, "/v", &v))) goto exit; if (JS_IsConstructing(cx, vp)) { @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmmg-js.c ============================================================================ $ cvs diff -u -r1.4.4.6 -r1.4.4.7 rpmmg-js.c --- rpm/js/rpmmg-js.c 11 Jul 2017 10:54:45 -0000 1.4.4.6 +++ rpm/js/rpmmg-js.c 11 Jul 2017 11:00:55 -0000 1.4.4.7 @@ -213,7 +213,7 @@ _CTOR_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/su", &_magicfile, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/su", &_magicfile, &_flags))) goto exit; if (JS_IsConstructing(cx, vp)) { @@ -241,7 +241,7 @@ const char * _fn = NULL; const char * s = NULL; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/s", &_fn))) + if (!(ok = JS_ConvertArguments(cx, argv, "/s", &_fn))) goto exit; if (mg) @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmmi-js.c ============================================================================ $ cvs diff -u -r1.28.4.7 -r1.28.4.8 rpmmi-js.c --- rpm/js/rpmmi-js.c 11 Jul 2017 10:54:45 -0000 1.28.4.7 +++ rpm/js/rpmmi-js.c 11 Jul 2017 11:00:55 -0000 1.28.4.8 @@ -39,7 +39,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "vs/u", &tagid, &pattern, &type))) + if (!(ok = JS_ConvertArguments(cx, argv, "vs/u", &tagid, &pattern, &type))) goto exit; switch (type) { @@ -81,7 +81,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "u", &_u))) + if (!(ok = JS_ConvertArguments(cx, argv, "u", &_u))) goto exit; /* XXX handle arrays */ if (!rpmmiPrune(mi, &_u, 1, 1)) @@ -104,7 +104,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "u", &_u))) + if (!(ok = JS_ConvertArguments(cx, argv, "u", &_u))) goto exit; /* XXX handle arrays */ if (!rpmmiGrow(mi, &_u, 1)) @@ -127,7 +127,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "s", &_bn))) + if (!(ok = JS_ConvertArguments(cx, argv, "s", &_bn))) goto exit; /* XXX handle arrays */ if (!rpmmiGrowBasename(mi, _bn)) @@ -366,7 +366,7 @@ _CTOR_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "o/vv", &tso, &tagid, &kv))) + if (!(ok = JS_ConvertArguments(cx, argv, "o/vv", &tso, &tagid, &kv))) goto exit; if (JS_IsConstructing(cx, vp)) { @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmmpf-js.c ============================================================================ $ cvs diff -u -r1.7.4.6 -r1.7.4.7 rpmmpf-js.c --- rpm/js/rpmmpf-js.c 11 Jul 2017 10:49:38 -0000 1.7.4.6 +++ rpm/js/rpmmpf-js.c 11 Jul 2017 11:00:55 -0000 1.7.4.7 @@ -62,7 +62,7 @@ if (mpf == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/u", &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/u", &_flags))) goto exit; { int ret = mpf->close(mpf, _flags); @@ -96,7 +96,7 @@ if (mpf == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "o/u", &o, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "o/u", &o, &_flags))) goto exit; if (o && OBJ_IS_RPMTXN(cx, o)) @@ -141,7 +141,7 @@ if (mpf == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/suiu", &_file, &_flags, &_mode, &_pagesize))) + if (!(ok = JS_ConvertArguments(cx, argv, "/suiu", &_file, &_flags, &_mode, &_pagesize))) goto exit; { size_t pagesize = _pagesize; @@ -178,7 +178,7 @@ if (mpf == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/u", &_priority))) + if (!(ok = JS_ConvertArguments(cx, argv, "/u", &_priority))) goto exit; { void * _pgaddr = NULL; @@ -479,7 +479,7 @@ bool ok = false; #ifdef NOTYET - if (!(ok = JS_ConvertArguments(cx, argc, argv, "s", &_fn))) + if (!(ok = JS_ConvertArguments(cx, argv, "s", &_fn))) goto exit; *vp = (mpf && _fn && (_con = rpmmpfLgetfilecon(mpf, _fn)) != NULL) @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmmpw-js.c ============================================================================ $ cvs diff -u -r1.21.4.7 -r1.21.4.8 rpmmpw-js.c --- rpm/js/rpmmpw-js.c 11 Jul 2017 10:49:38 -0000 1.21.4.7 +++ rpm/js/rpmmpw-js.c 11 Jul 2017 11:00:55 -0000 1.21.4.8 @@ -1796,7 +1796,7 @@ bool ok; _METHOD_DEBUG_ENTRY(_debug); - if ((ok = JS_ConvertArguments(cx, argc, argv, "/u", &_base))) { + if ((ok = JS_ConvertArguments(cx, argv, "/u", &_base))) { /* XXX FIXME check _base is 0 or [2,36] */ *vp = mpw_format(cx, ptr, _base, 0); } else @@ -1836,7 +1836,7 @@ _METHOD_DEBUG_ENTRY(_debug); if (z == NULL || zsize == 0 || zdata == NULL - || (ok = JS_ConvertArguments(cx, argc, argv, "/u", &_trials))) + || (ok = JS_ConvertArguments(cx, argv, "/u", &_trials))) { /* XXX select "FIPS 186" or "Mersenne Twister" */ const randomGenerator* rng = randomGeneratorDefault(); @@ -2279,7 +2279,7 @@ _CTOR_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/v", &v))) + if (!(ok = JS_ConvertArguments(cx, argv, "/v", &v))) goto exit; if (JS_IsConstructing(cx, vp)) { @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmps-js.c ============================================================================ $ cvs diff -u -r1.18.4.7 -r1.18.4.8 rpmps-js.c --- rpm/js/rpmps-js.c 11 Jul 2017 10:54:45 -0000 1.18.4.7 +++ rpm/js/rpmps-js.c 11 Jul 2017 11:00:55 -0000 1.18.4.8 @@ -40,7 +40,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "ssoissu", + if (!(ok = JS_ConvertArguments(cx, argv, "ssoissu", &pkgNEVR, &altNEVR, &o, &type, &dn, &bn, &ui))) goto exit; rpmpsAppend(ps, type, pkgNEVR, o, dn, bn, altNEVR, ui); @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmseq-js.c ============================================================================ $ cvs diff -u -r1.7.4.6 -r1.7.4.7 rpmseq-js.c --- rpm/js/rpmseq-js.c 11 Jul 2017 10:49:38 -0000 1.7.4.6 +++ rpm/js/rpmseq-js.c 11 Jul 2017 11:00:55 -0000 1.7.4.7 @@ -58,7 +58,7 @@ if (seq == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/u", &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/u", &_flags))) goto exit; { int ret = seq->close(seq, _flags); @@ -93,7 +93,7 @@ if (seq == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "o/iu", &o, &_delta, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "o/iu", &o, &_delta, &_flags))) goto exit; if (o && OBJ_IS_RPMTXN(cx, o)) @@ -142,7 +142,7 @@ if (seq == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "ov/u", &o, &_kv, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "ov/u", &o, &_kv, &_flags))) goto exit; if (o && OBJ_IS_RPMTXN(cx, o)) @@ -186,7 +186,7 @@ if (seq == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "o/u", &o, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "o/u", &o, &_flags))) goto exit; if (o && OBJ_IS_RPMTXN(cx, o)) @@ -227,7 +227,7 @@ if (seq == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/u", &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/u", &_flags))) goto exit; { DB_SEQUENCE_STAT * sp = NULL; @@ -260,7 +260,7 @@ if (seq == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/u", &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/u", &_flags))) goto exit; { int ret = seq->stat_print(seq, _flags); @@ -609,7 +609,7 @@ _CTOR_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "o/u", &o, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "o/u", &o, &_flags))) goto exit; if (OBJ_IS_RPMDB(cx, o)) @@ -643,7 +643,7 @@ bool ok = false; #ifdef NOTYET - if (!(ok = JS_ConvertArguments(cx, argc, argv, "s", &_fn))) + if (!(ok = JS_ConvertArguments(cx, argv, "s", &_fn))) goto exit; *vp = (seq && _fn && (_con = rpmseqLgetfilecon(seq, _fn)) != NULL) @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmsm-js.c ============================================================================ $ cvs diff -u -r1.8.4.6 -r1.8.4.7 rpmsm-js.c --- rpm/js/rpmsm-js.c 11 Jul 2017 10:54:45 -0000 1.8.4.6 +++ rpm/js/rpmsm-js.c 11 Jul 2017 11:00:55 -0000 1.8.4.7 @@ -206,7 +206,7 @@ _CTOR_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/su", &_fn, &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/su", &_fn, &_flags))) goto exit; if (JS_IsConstructing(cx, vp)) { @@ -233,7 +233,7 @@ rpmsm sm = (rpmsm) ptr; const char *_cmd = NULL; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "s", &_cmd))) + if (!(ok = JS_ConvertArguments(cx, argv, "s", &_cmd))) goto exit; if (sm && _cmd) { @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmsp-js.c ============================================================================ $ cvs diff -u -r1.4.4.6 -r1.4.4.7 rpmsp-js.c --- rpm/js/rpmsp-js.c 11 Jul 2017 10:54:45 -0000 1.4.4.6 +++ rpm/js/rpmsp-js.c 11 Jul 2017 11:00:55 -0000 1.4.4.7 @@ -220,7 +220,7 @@ const char *_fn = NULL; const char * _con = NULL; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "s", &_fn))) + if (!(ok = JS_ConvertArguments(cx, argv, "s", &_fn))) goto exit; *vp = (sp && _fn && (_con = rpmspLgetfilecon(sp, _fn)) != NULL) @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmst-js.c ============================================================================ $ cvs diff -u -r1.10.4.5 -r1.10.4.6 rpmst-js.c --- rpm/js/rpmst-js.c 11 Jul 2017 10:49:38 -0000 1.10.4.5 +++ rpm/js/rpmst-js.c 11 Jul 2017 11:00:55 -0000 1.10.4.6 @@ -253,7 +253,7 @@ _CTOR_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/v", &fnv))) + if (!(ok = JS_ConvertArguments(cx, argv, "/v", &fnv))) goto exit; if (JS_IsConstructing(cx, vp)) { @@ -280,7 +280,7 @@ bool ok = false; jsval fnv = JSVAL_VOID; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/v", &fnv))) + if (!(ok = JS_ConvertArguments(cx, argv, "/v", &fnv))) goto exit; if (st) { @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmsx-js.c ============================================================================ $ cvs diff -u -r1.8.4.7 -r1.8.4.8 rpmsx-js.c --- rpm/js/rpmsx-js.c 11 Jul 2017 10:54:45 -0000 1.8.4.7 +++ rpm/js/rpmsx-js.c 11 Jul 2017 11:00:55 -0000 1.8.4.8 @@ -375,7 +375,7 @@ const char * _con = NULL; bool ok = false; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "s", &_fn))) + if (!(ok = JS_ConvertArguments(cx, argv, "s", &_fn))) goto exit; *vp = (sx && _fn && (_con = rpmsxLgetfilecon(sx, _fn)) != NULL) @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmsys-js.c ============================================================================ $ cvs diff -u -r1.8.4.7 -r1.8.4.8 rpmsys-js.c --- rpm/js/rpmsys-js.c 11 Jul 2017 10:54:45 -0000 1.8.4.7 +++ rpm/js/rpmsys-js.c 11 Jul 2017 11:00:55 -0000 1.8.4.8 @@ -71,7 +71,7 @@ bool ok; _METHOD_DEBUG_ENTRY(_debug); - if ((ok = JS_ConvertArguments(cx, argc, argv, "s/u", &_path, &_mode))) { + if ((ok = JS_ConvertArguments(cx, argv, "s/u", &_path, &_mode))) { mode_t mode = _mode; *vp = (sys && !Access(_path, mode) ? JSVAL_ZERO : INT_TO_JSVAL(errno)); @@ -91,7 +91,7 @@ bool ok; _METHOD_DEBUG_ENTRY(_debug); - if ((ok = JS_ConvertArguments(cx, argc, argv, "su", &_path, &_mode))) { + if ((ok = JS_ConvertArguments(cx, argv, "su", &_path, &_mode))) { mode_t mode = _mode; *vp = (sys && !Chmod(_path, mode) ? JSVAL_ZERO : INT_TO_JSVAL(errno)); @@ -112,7 +112,7 @@ bool ok; _METHOD_DEBUG_ENTRY(_debug); - if ((ok = JS_ConvertArguments(cx, argc, argv, "s/ii", &_path, &_uid, &_gid))) { + if ((ok = JS_ConvertArguments(cx, argv, "s/ii", &_path, &_uid, &_gid))) { uid_t uid = _uid; gid_t gid = _gid; *vp = (sys && !Chown(_path, uid, gid) @@ -136,7 +136,7 @@ bool ok; _METHOD_DEBUG_ENTRY(_debug); - if ((ok = JS_ConvertArguments(cx, argc, argv, "s/u", &_path, &_mode))) { + if ((ok = JS_ConvertArguments(cx, argv, "s/u", &_path, &_mode))) { mode_t mode = _mode; int flags = O_CREAT|O_WRONLY|O_TRUNC; int fdno = -1; @@ -165,7 +165,7 @@ bool ok; _METHOD_DEBUG_ENTRY(_debug); - if ((ok = JS_ConvertArguments(cx, argc, argv, "s/ii", &_path, &_uid, &_gid))) { + if ((ok = JS_ConvertArguments(cx, argv, "s/ii", &_path, &_uid, &_gid))) { uid_t uid = _uid; uid_t gid = _gid; *vp = (sys && !Lchown(_path, uid, gid) @@ -186,7 +186,7 @@ bool ok; _METHOD_DEBUG_ENTRY(_debug); - if ((ok = JS_ConvertArguments(cx, argc, argv, "ss", &_opath, &_npath))) { + if ((ok = JS_ConvertArguments(cx, argv, "ss", &_opath, &_npath))) { *vp = (sys && !Link(_opath, _npath) ? JSVAL_ZERO : INT_TO_JSVAL(errno)); } @@ -204,7 +204,7 @@ bool ok; _METHOD_DEBUG_ENTRY(_debug); - if ((ok = JS_ConvertArguments(cx, argc, argv, "s", &_path))) { + if ((ok = JS_ConvertArguments(cx, argv, "s", &_path))) { struct stat sb; if (sys && !Lstat(_path, &sb)) { JSObject *o; @@ -236,7 +236,7 @@ bool ok; _METHOD_DEBUG_ENTRY(_debug); - if ((ok = JS_ConvertArguments(cx, argc, argv, "s/u", &_path, &_mode))) { + if ((ok = JS_ConvertArguments(cx, argv, "s/u", &_path, &_mode))) { mode_t mode = _mode; *vp = (sys && !Mkdir(_path, mode) ? JSVAL_ZERO : INT_TO_JSVAL(errno)); @@ -256,7 +256,7 @@ bool ok; _METHOD_DEBUG_ENTRY(_debug); - if ((ok = JS_ConvertArguments(cx, argc, argv, "su", &_path, &_mode))) { + if ((ok = JS_ConvertArguments(cx, argv, "su", &_path, &_mode))) { mode_t mode = _mode; *vp = (sys && !Mkfifo(_path, mode) ? JSVAL_ZERO : INT_TO_JSVAL(errno)); @@ -277,7 +277,7 @@ bool ok; _METHOD_DEBUG_ENTRY(_debug); - if ((ok = JS_ConvertArguments(cx, argc, argv, "suu", &_path, &_mode, &_dev))) { + if ((ok = JS_ConvertArguments(cx, argv, "suu", &_path, &_mode, &_dev))) { mode_t mode = _mode; dev_t dev = _dev; *vp = (sys && !Mknod(_path, mode, dev) @@ -297,7 +297,7 @@ bool ok; _METHOD_DEBUG_ENTRY(_debug); - if ((ok = JS_ConvertArguments(cx, argc, argv, "s", &_path))) { + if ((ok = JS_ConvertArguments(cx, argv, "s", &_path))) { char b[BUFSIZ]; size_t nb = sizeof(b); ssize_t rc; @@ -325,7 +325,7 @@ bool ok; _METHOD_DEBUG_ENTRY(_debug); - if ((ok = JS_ConvertArguments(cx, argc, argv, "ss", &_opath, &_npath))) { + if ((ok = JS_ConvertArguments(cx, argv, "ss", &_opath, &_npath))) { *vp = (sys && !Rename(_opath, _npath) ? JSVAL_ZERO : INT_TO_JSVAL(errno)); } @@ -343,7 +343,7 @@ bool ok; _METHOD_DEBUG_ENTRY(_debug); - if ((ok = JS_ConvertArguments(cx, argc, argv, "s", &_path))) { + if ((ok = JS_ConvertArguments(cx, argv, "s", &_path))) { *vp = (sys && !Rmdir(_path) ? JSVAL_ZERO : INT_TO_JSVAL(errno)); } @@ -361,7 +361,7 @@ bool ok; _METHOD_DEBUG_ENTRY(_debug); - if ((ok = JS_ConvertArguments(cx, argc, argv, "s", &_path))) { + if ((ok = JS_ConvertArguments(cx, argv, "s", &_path))) { struct stat sb; if (sys && !Stat(_path, &sb)) { JSObject *o; @@ -393,7 +393,7 @@ bool ok; _METHOD_DEBUG_ENTRY(_debug); - if ((ok = JS_ConvertArguments(cx, argc, argv, "ss", &_opath, &_npath))) { + if ((ok = JS_ConvertArguments(cx, argv, "ss", &_opath, &_npath))) { *vp = (sys && !Symlink(_opath, _npath) ? JSVAL_ZERO : INT_TO_JSVAL(errno)); } @@ -411,7 +411,7 @@ bool ok; _METHOD_DEBUG_ENTRY(_debug); - if ((ok = JS_ConvertArguments(cx, argc, argv, "s", &_path))) { + if ((ok = JS_ConvertArguments(cx, argv, "s", &_path))) { *vp = (sys && !Unlink(_path) ? JSVAL_ZERO : INT_TO_JSVAL(errno)); } @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmte-js.c ============================================================================ $ cvs diff -u -r1.19.4.7 -r1.19.4.8 rpmte-js.c --- rpm/js/rpmte-js.c 11 Jul 2017 10:54:45 -0000 1.19.4.7 +++ rpm/js/rpmte-js.c 11 Jul 2017 11:00:55 -0000 1.19.4.8 @@ -47,7 +47,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/i", &tagN))) + if (!(ok = JS_ConvertArguments(cx, argv, "/i", &tagN))) goto exit; { rpmds ds = NULL; JSObject *dso = NULL; @@ -79,7 +79,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/i", &tagN))) + if (!(ok = JS_ConvertArguments(cx, argv, "/i", &tagN))) goto exit; { rpmfi fi = NULL; JSObject *fio = NULL; @@ -380,7 +380,7 @@ _CTOR_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "o/o", &tso, &hdro))) + if (!(ok = JS_ConvertArguments(cx, argv, "o/o", &tso, &hdro))) goto exit; if (JS_IsConstructing(cx, vp)) { @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmts-js.c ============================================================================ $ cvs diff -u -r1.33.4.7 -r1.33.4.8 rpmts-js.c --- rpm/js/rpmts-js.c 11 Jul 2017 10:54:45 -0000 1.33.4.7 +++ rpm/js/rpmts-js.c 11 Jul 2017 11:00:55 -0000 1.33.4.8 @@ -93,7 +93,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "s", &pkgN))) + if (!(ok = JS_ConvertArguments(cx, argv, "s", &pkgN))) goto exit; if (pkgN != NULL) { @@ -200,7 +200,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/vv", &tagid, &kv))) + if (!(ok = JS_ConvertArguments(cx, argv, "/vv", &tagid, &kv))) goto exit; if (!JSVAL_IS_VOID(tagid)) { @@ -261,7 +261,7 @@ _METHOD_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/vvu", &v, &tagid, &v, &_mode))) + if (!(ok = JS_ConvertArguments(cx, argv, "/vvu", &v, &tagid, &v, &_mode))) goto exit; if (!JSVAL_IS_VOID(tagid)) { @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmtxn-js.c ============================================================================ $ cvs diff -u -r1.11.4.6 -r1.11.4.7 rpmtxn-js.c --- rpm/js/rpmtxn-js.c 11 Jul 2017 10:49:39 -0000 1.11.4.6 +++ rpm/js/rpmtxn-js.c 11 Jul 2017 11:00:55 -0000 1.11.4.7 @@ -86,7 +86,7 @@ if (txn == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/u", &_flags))) + if (!(ok = JS_ConvertArguments(cx, argv, "/u", &_flags))) goto exit; { int ret = txn->commit(txn, _flags); @@ -153,7 +153,7 @@ if (txn == NULL) goto exit; *vp = JSVAL_FALSE; - if (!(ok = JS_ConvertArguments(cx, argc, argv, "s", &_s))) + if (!(ok = JS_ConvertArguments(cx, argv, "s", &_s))) goto exit; /* XXX todo: hex convert for _gid string? */ (void) strncpy((char *)_gid, _s, sizeof(_gid)); @@ -407,7 +407,7 @@ bool ok = false; #ifdef NOTYET - if (!(ok = JS_ConvertArguments(cx, argc, argv, "s", &_fn))) + if (!(ok = JS_ConvertArguments(cx, argv, "s", &_fn))) goto exit; *vp = (txn && _fn && (_con = rpmtxnLgetfilecon(txn, _fn)) != NULL) @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmxar-js.c ============================================================================ $ cvs diff -u -r1.5.4.6 -r1.5.4.7 rpmxar-js.c --- rpm/js/rpmxar-js.c 11 Jul 2017 10:54:45 -0000 1.5.4.6 +++ rpm/js/rpmxar-js.c 11 Jul 2017 11:00:55 -0000 1.5.4.7 @@ -229,7 +229,7 @@ _CTOR_DEBUG_ENTRY(_debug); - if (!(ok = JS_ConvertArguments(cx, argc, argv, "/ss", &_fn, &_fmode))) + if (!(ok = JS_ConvertArguments(cx, argv, "/ss", &_fn, &_fmode))) goto exit; if (JS_IsConstructing(cx, vp)) { @@ . patch -p0 <<'@@ .' Index: rpm/js/syck-js.c ============================================================================ $ cvs diff -u -r1.9.4.6 -r1.9.4.7 syck-js.c --- rpm/js/syck-js.c 11 Jul 2017 10:49:39 -0000 1.9.4.6 +++ rpm/js/syck-js.c 11 Jul 2017 11:00:55 -0000 1.9.4.7 @@ -206,7 +206,7 @@ if (_debug) fprintf(stderr, "==> %s(%p,%p,%p[%u],%p)\n", __FUNCTION__, cx, obj, argv, (unsigned)argc, vp); - ok = JS_ConvertArguments(cx, argc, argv, "s", &s); + ok = JS_ConvertArguments(cx, argv, "s", &s); if (!ok) goto exit; @@ -245,7 +245,7 @@ fprintf(stderr, "==> %s(%p,%p,%p[%u],%p)\n", __FUNCTION__, cx, obj, argv, (unsigned)argc, vp); #ifdef NOTYET - ok = JS_ConvertArguments(cx, argc, argv, "", + ok = JS_ConvertArguments(cx, argv, "", &version, &syck_ns_str, &data); #endif if (!ok) @@ . patch -p0 <<'@@ .' Index: rpm/js/uuid-js.c ============================================================================ $ cvs diff -u -r1.18.4.6 -r1.18.4.7 uuid-js.c --- rpm/js/uuid-js.c 11 Jul 2017 10:49:39 -0000 1.18.4.6 +++ rpm/js/uuid-js.c 11 Jul 2017 11:00:55 -0000 1.18.4.7 @@ -56,7 +56,7 @@ _METHOD_DEBUG_ENTRY(_debug); - ok = JS_ConvertArguments(cx, argc, argv, "i/ss", + ok = JS_ConvertArguments(cx, argv, "i/ss", &version, &uuid_ns_str, &data); if (!ok) goto exit; @@ -121,7 +121,7 @@ _METHOD_DEBUG_ENTRY(_debug); - ok = JS_ConvertArguments(cx, argc, argv, "s", &uuid_str); + ok = JS_ConvertArguments(cx, argv, "s", &uuid_str); if (!ok) goto exit; @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
