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 13:55:38
Branch: rpm-5_4 Handle: 2017071111553700
Modified files: (Branch: rpm-5_4)
rpm/js rpmaug-js.c rpmcudf-js.c rpmdb-js.c rpmdbc-js.c
rpmdbe-js.c rpmdc-js.c rpmfi-js.c rpmfts-js.c
rpmio-js.c rpmjsfile.c rpmmc-js.c rpmmpf-js.c
rpmmpw-js.c rpmseq-js.c rpmsys-js.c rpmte-js.c
rpmts-js.c rpmtxn-js.c
Log:
=rpmjs: convert JSVAL_NULL/JSVAL_VOID returns.
Summary:
Revision Changes Path
1.11.4.12 +3 -3 rpm/js/rpmaug-js.c
1.6.4.11 +2 -2 rpm/js/rpmcudf-js.c
1.31.4.10 +10 -10 rpm/js/rpmdb-js.c
1.14.4.10 +10 -10 rpm/js/rpmdbc-js.c
1.21.4.11 +15 -15 rpm/js/rpmdbe-js.c
1.9.4.11 +2 -2 rpm/js/rpmdc-js.c
1.15.4.9 +2 -2 rpm/js/rpmfi-js.c
1.10.4.9 +2 -2 rpm/js/rpmfts-js.c
1.9.4.11 +8 -8 rpm/js/rpmio-js.c
1.4.4.4 +3 -3 rpm/js/rpmjsfile.c
1.12.4.10 +1 -1 rpm/js/rpmmc-js.c
1.7.4.10 +1 -1 rpm/js/rpmmpf-js.c
1.21.4.11 +6 -6 rpm/js/rpmmpw-js.c
1.7.4.10 +7 -7 rpm/js/rpmseq-js.c
1.8.4.10 +5 -5 rpm/js/rpmsys-js.c
1.19.4.10 +5 -5 rpm/js/rpmte-js.c
1.33.4.11 +4 -4 rpm/js/rpmts-js.c
1.11.4.10 +3 -3 rpm/js/rpmtxn-js.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/js/rpmaug-js.c
============================================================================
$ cvs diff -u -r1.11.4.11 -r1.11.4.12 rpmaug-js.c
--- rpm/js/rpmaug-js.c 11 Jul 2017 11:50:41 -0000 1.11.4.11
+++ rpm/js/rpmaug-js.c 11 Jul 2017 11:55:37 -0000 1.11.4.12
@@ -85,7 +85,7 @@
default:
case 0: /* not found */
case -1: /* multiply defined */
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
break;
}
ok = true;
@@ -115,7 +115,7 @@
break;
default:
case -1: /* multiply defined */
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
break;
}
ok = true;
@@ -225,7 +225,7 @@
nmatches = rpmaugMatch(aug, _path, &_matches);
if (nmatches <= 0) { /* not found */
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
goto exit;
} else {
JSObject *o;
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmcudf-js.c
============================================================================
$ cvs diff -u -r1.6.4.10 -r1.6.4.11 rpmcudf-js.c
--- rpm/js/rpmcudf-js.c 11 Jul 2017 11:50:41 -0000 1.6.4.10
+++ rpm/js/rpmcudf-js.c 11 Jul 2017 11:55:37 -0000 1.6.4.11
@@ -65,7 +65,7 @@
Y = rpmcudfFree(Y);
_fn = _free(_fn);
} else
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
ok = true;
exit:
@@ -90,7 +90,7 @@
*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, rpmiobStr(cudf->iob)));
(void) rpmiobEmpty(cudf->iob);
} else
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
ok = true;
return ok;
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmdb-js.c
============================================================================
$ cvs diff -u -r1.31.4.9 -r1.31.4.10 rpmdb-js.c
--- rpm/js/rpmdb-js.c 11 Jul 2017 11:50:41 -0000 1.31.4.9
+++ rpm/js/rpmdb-js.c 11 Jul 2017 11:55:37 -0000 1.31.4.10
@@ -396,7 +396,7 @@
args.rval().setBoolean(true);
break;
case DB_NOTFOUND:
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
break;
}
}
@@ -446,7 +446,7 @@
args.rval().setBoolean(true);
break;
case DB_NOTFOUND:
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
break;
}
}
@@ -508,7 +508,7 @@
*vp = STRING_TO_JSVAL(JS_NewStringCopyN(cx, _RPMDBT_PTR(_d)->data,
_RPMDBT_PTR(_d)->size));
break;
case DB_NOTFOUND:
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
break;
}
}
@@ -745,7 +745,7 @@
*vp = STRING_TO_JSVAL(JS_NewStringCopyN(cx, _RPMDBT_PTR(_d)->data,
_RPMDBT_PTR(_d)->size));
break;
case DB_NOTFOUND:
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
break;
}
}
@@ -799,7 +799,7 @@
args.rval().setBoolean(true);
break;
case DB_NOTFOUND:
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
break;
}
}
@@ -1357,7 +1357,7 @@
if (!JS_NewNumberValue(cx, d, vp))
args.rval().setBoolean(false);
} else
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
return true;
}
@@ -1406,7 +1406,7 @@
#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 8)
*vp = _GET_S(!db->get_create_dir(db, &_s));
#else
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
#endif
break;
case _ENCRYPT: *vp = _GET_U(!db->get_encrypt_flags(db, &_u)); break;
@@ -1433,7 +1433,7 @@
*vp = (o && JS_SetPrivate(cx, o, (void *)_mpf)
? OBJECT_TO_JSVAL(o) : JSVAL_VOID);
} else
- *vp = JSVAL_NULL;
+ args.rval().setNull();
} break;
case _MSGFILE:
db->get_msgfile(db, &_fp);
@@ -1453,7 +1453,7 @@
*vp = _RET_S(_s);
} else
#endif
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
break;
case _PRIORITY: *vp = _GET_U(!db->get_priority(db, &_u)); break;
case _Q_EXTENTSIZE: *vp = _GET_U(!db->get_q_extentsize(db, &_u));
break;
@@ -1569,7 +1569,7 @@
#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 8)
*vp = _PUT_S(db->set_create_dir(db, _s));
#else
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
#endif
break;
case _ENCRYPT: *vp = _PUT_S(db->set_encrypt(db, _s, DB_ENCRYPT_AES));
break;
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmdbc-js.c
============================================================================
$ cvs diff -u -r1.14.4.9 -r1.14.4.10 rpmdbc-js.c
--- rpm/js/rpmdbc-js.c 11 Jul 2017 11:50:41 -0000 1.14.4.9
+++ rpm/js/rpmdbc-js.c 11 Jul 2017 11:55:37 -0000 1.14.4.10
@@ -137,7 +137,7 @@
break;
case 0:
if (!JS_NewNumberValue(cx, (jsdouble)_count, vp))
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
break;
}
}
@@ -272,7 +272,7 @@
*vp = STRING_TO_JSVAL(JS_NewStringCopyN(cx, _RPMDBT_PTR(_d)->data,
_RPMDBT_PTR(_d)->size));
break;
case DB_NOTFOUND:
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
break;
}
}
@@ -320,7 +320,7 @@
*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, _RPMDBT_PTR(_d)->data));
break;
case DB_NOTFOUND:
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
break;
}
}
@@ -368,7 +368,7 @@
args.rval().setBoolean(true);
break;
case DB_NOTFOUND:
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
break;
}
}
@@ -423,23 +423,23 @@
switch (tiny) {
case _DEBUG:
if (!JS_NewNumberValue(cx, (jsdouble)_debug, vp))
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
break;
case _LENGTH:
{ db_recno_t _count = 0;
if (!dbc->count(dbc, &_count, 0)) {
if (!JS_NewNumberValue(cx, (jsdouble)_count, vp))
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
} else
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
} break;
case _PRIORITY:
{ DB_CACHE_PRIORITY _priority = DB_PRIORITY_UNCHANGED;
if (!dbc->get_priority(dbc, &_priority)) {
if (!JS_NewNumberValue(cx, (jsdouble)_priority, vp))
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
} else
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
} break;
default:
break;
@@ -463,7 +463,7 @@
switch (tiny) {
case _DEBUG:
if (!JS_ValueToInt32(cx, *vp, &_debug))
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
break;
case _PRIORITY:
{ uint32_t _u = 0;
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmdbe-js.c
============================================================================
$ cvs diff -u -r1.21.4.10 -r1.21.4.11 rpmdbe-js.c
--- rpm/js/rpmdbe-js.c 11 Jul 2017 11:50:41 -0000 1.21.4.10
+++ rpm/js/rpmdbe-js.c 11 Jul 2017 11:55:37 -0000 1.21.4.11
@@ -320,7 +320,7 @@
_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
if (!(ok = JS_ConvertArguments(cx, args, "/u", &_flags)))
goto exit;
@@ -503,7 +503,7 @@
_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
- *vp = JSVAL_NULL;
+ args.rval().setNull();
if (dbenv->app_private != NULL) {
uint32_t _id = 0;
@@ -720,7 +720,7 @@
break;
case 0:
if (_av == NULL) {
- *vp = JSVAL_NULL;
+ args.rval().setNull();
} else {
int _ac = argsCount(_av);
JSObject * o = JS_NewArrayObject(cx, 0, NULL);
@@ -778,7 +778,7 @@
_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
- *vp = JSVAL_NULL;
+ args.rval().setNull();
if (!(ok = JS_ConvertArguments(cx, args, "uu", &_lsn.file,
&_lsn.offset)))
goto exit;
@@ -1172,7 +1172,7 @@
_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
if (!(ok = JS_ConvertArguments(cx, args, "/i", &_percent)))
goto exit;
@@ -2361,13 +2361,13 @@
(void) JS_SetElement(cx, o, i, &v);
}
} else
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
break;
case _CREATE_DIR:
#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 8) || DB_VERSION_MAJOR > 4
*vp = _GET_S(!dbenv->get_create_dir(dbenv, &_s));
#else
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
#endif
break;
case _ENCRYPT: *vp = _GET_U(!dbenv->get_encrypt_flags(dbenv, &_u));
break;
@@ -2397,9 +2397,9 @@
if (!dbenv->get_shm_key(dbenv, &_l)) {
jsdouble d = _l;
if (!JS_NewNumberValue(cx, d, vp))
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
} else
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
break;
case _THREADCNT: *vp = _GET_U(!dbenv->get_thread_count(dbenv, &_u));
break;
@@ -2412,11 +2412,11 @@
*vp = _GET_U(!dbenv->get_timeout(dbenv, (db_timeout_t *)&_u, _u));
break;
- case _REGTIMEOUT: *vp = JSVAL_NULL; break; /* XXX FIXME */
+ case _REGTIMEOUT: args.rval().setNull(); break; /* XXX FIXME */
case _TMPDIR: *vp = _GET_S(!dbenv->get_tmp_dir(dbenv, &_s)); break;
- case _VERBOSE: *vp = JSVAL_VOID; break; /* XXX FIXME enum */
- case _LKCONFLICTS: *vp = JSVAL_VOID; break; /* XXX FIXME */
+ case _VERBOSE: args.rval().setUndefined(); break; /* XXX FIXME
enum */
+ case _LKCONFLICTS: args.rval().setUndefined(); break; /* XXX
FIXME */
case _LKDETECT: *vp = _GET_U(!dbenv->get_lk_detect(dbenv, &_u)); break;
case _LKMAXLOCKERS: *vp = _GET_U(!dbenv->get_lk_max_lockers(dbenv,
&_u)); break;
case _LKMAXLOCKS: *vp = _GET_U(!dbenv->get_lk_max_locks(dbenv,
&_u)); break;
@@ -2496,7 +2496,7 @@
_u = tstamp;
*vp = INT_TO_JSVAL(_u); /* XXX FIXME */
} else
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
} break;
default:
@@ -2555,7 +2555,7 @@
#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 8) || DB_VERSION_MAJOR > 4
*vp = _PUT_S(dbenv->add_data_dir(dbenv, _s));
#else
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
#endif
break;
case _CREATE_DIR:
@@ -2563,7 +2563,7 @@
#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 8) || DB_VERSION_MAJOR > 4
*vp = _PUT_S(dbenv->set_create_dir(dbenv, _s));
#else
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
#endif
break;
case _ENCRYPT:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmdc-js.c
============================================================================
$ cvs diff -u -r1.9.4.10 -r1.9.4.11 rpmdc-js.c
--- rpm/js/rpmdc-js.c 11 Jul 2017 11:50:41 -0000 1.9.4.10
+++ rpm/js/rpmdc-js.c 11 Jul 2017 11:55:37 -0000 1.9.4.11
@@ -350,7 +350,7 @@
if (!rpmDigestFinal(dc, &s, &ns, 1)) {
*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, s));
} else
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
s = _free(s);
/* XXX reinitialize so that _dalgo is persistent */
@@ -358,7 +358,7 @@
(void) JS_SetPrivate(cx, o, (void *)dc);
dc = ptr = rpmdc_init(cx, o, _dalgo, _flags);
} else
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
ok = true;
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmfi-js.c
============================================================================
$ cvs diff -u -r1.15.4.8 -r1.15.4.9 rpmfi-js.c
--- rpm/js/rpmfi-js.c 11 Jul 2017 11:13:11 -0000 1.15.4.8
+++ rpm/js/rpmfi-js.c 11 Jul 2017 11:55:37 -0000 1.15.4.9
@@ -208,14 +208,14 @@
{ rpmbf bf = NULL;
JSObject *bfo = NULL;
if ((bf = rpmfiFNBF(fi)) == NULL)
- *vp = JSVAL_NULL;
+ args.rval().setNull();
else
if ((bfo = JS_NewObject(cx, &rpmbfClass, NULL, NULL)) != NULL
&& JS_SetPrivate(cx, bfo, rpmbfLink(bf)))
*vp = OBJECT_TO_JSVAL(bfo);
else {
bf = rpmbfFree(bf);
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
}
} break;
default:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmfts-js.c
============================================================================
$ cvs diff -u -r1.10.4.8 -r1.10.4.9 rpmfts-js.c
--- rpm/js/rpmfts-js.c 11 Jul 2017 11:13:11 -0000 1.10.4.8
+++ rpm/js/rpmfts-js.c 11 Jul 2017 11:55:37 -0000 1.10.4.9
@@ -354,9 +354,9 @@
&& JS_SetPrivate(cx, o, (void *)st))
*vp = OBJECT_TO_JSVAL(o);
else
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
} else
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
break;
case _NAME: *vp = _GET_S(p, fts_name); break;
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmio-js.c
============================================================================
$ cvs diff -u -r1.9.4.10 -r1.9.4.11 rpmio-js.c
--- rpm/js/rpmio-js.c 11 Jul 2017 11:50:41 -0000 1.9.4.10
+++ rpm/js/rpmio-js.c 11 Jul 2017 11:55:37 -0000 1.9.4.11
@@ -103,7 +103,7 @@
fdFiniDigest(fd, _dalgo, &s, &ns, 1);
*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, s));
} else
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
}
return ok;
}
@@ -176,9 +176,9 @@
&& JS_SetPrivate(cx, o, (void *)fd))
*vp = OBJECT_TO_JSVAL(obj);
else
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
} else
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
ok = true;
exit:
@@ -306,7 +306,7 @@
char * b = alloca(nb);
size_t nr = Fread(b, 1, nb, fd);
if (nr == 0)
- *vp = JSVAL_VOID; /* XXX goofy? */
+ args.rval().setUndefined(); /* XXX goofy? */
else
if (Ferror(fd))
args.rval().setBoolean(false); /* XXX goofy? */
@@ -315,7 +315,7 @@
*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, b));
}
} else
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
ok = true;
exit:
@@ -385,10 +385,10 @@
*vp = OBJECT_TO_JSVAL(o);
else {
st = _free(st);
- *vp = JSVAL_VOID; /* XXX goofy? */
+ args.rval().setUndefined(); /* XXX goofy? */
}
} else
- *vp = JSVAL_VOID; /* XXX goofy? */
+ args.rval().setUndefined(); /* XXX goofy? */
ok = true;
return ok;
@@ -431,7 +431,7 @@
if (fd) {
size_t nw = Fwrite(b, 1, nb, fd);
if (nw == 0)
- *vp = JSVAL_VOID; /* XXX goofy? */
+ args.rval().setUndefined(); /* XXX goofy? */
else
args.rval().setBoolean((nw != nb || Ferror(fd));
} else
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmjsfile.c
============================================================================
$ cvs diff -u -r1.4.4.3 -r1.4.4.4 rpmjsfile.c
--- rpm/js/rpmjsfile.c 11 Jul 2017 11:13:12 -0000 1.4.4.3
+++ rpm/js/rpmjsfile.c 11 Jul 2017 11:55:37 -0000 1.4.4.4
@@ -1339,7 +1339,7 @@
JSString *str;
if (file->isPipe) {
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
return true;
}
@@ -2543,7 +2543,7 @@
SECURITY_CHECK(cx, NULL, "type", file);
JSFILE_CHECK_OPEN("type");
if(js_isDirectory(cx, file)){
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
break;
}
@@ -2736,7 +2736,7 @@
if(!file->hasRandomAccess){
JS_ReportWarning(cx, "File %s doesn't support random access,
can't report the position, proceeding");
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
break;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmmc-js.c
============================================================================
$ cvs diff -u -r1.12.4.9 -r1.12.4.10 rpmmc-js.c
--- rpm/js/rpmmc-js.c 11 Jul 2017 11:13:12 -0000 1.12.4.9
+++ rpm/js/rpmmc-js.c 11 Jul 2017 11:55:37 -0000 1.12.4.10
@@ -100,7 +100,7 @@
*vp = OBJECT_TO_JSVAL(JS_NewArrayObject(cx, ac, vec));
vec = _free(vec);
} else
- *vp = JSVAL_NULL; /* XXX JSVAL_VOID? */
+ args.rval().setNull(); /* XXX JSVAL_VOID? */
ok = true;
exit:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmmpf-js.c
============================================================================
$ cvs diff -u -r1.7.4.9 -r1.7.4.10 rpmmpf-js.c
--- rpm/js/rpmmpf-js.c 11 Jul 2017 11:50:41 -0000 1.7.4.9
+++ rpm/js/rpmmpf-js.c 11 Jul 2017 11:55:37 -0000 1.7.4.10
@@ -300,7 +300,7 @@
case _FTYPE: *vp = _GET_I(!mpf->get_ftype(mpf, &_i)); break;
case _LSNOFFSET: *vp = _GET_I(!mpf->get_lsn_offset(mpf, &_i)); break;
case _MAXSIZE: *vp = _GET_U(!mpf->get_maxsize(mpf, &_gb, &_u)); break;
- case _PGCOOKIE: *vp = JSVAL_VOID; break; /* XXX FIXME */
+ case _PGCOOKIE: args.rval().setUndefined(); break; /* XXX FIXME */
case _PRIORITY: *vp = _GET_U(!mpf->get_priority(mpf, (DB_CACHE_PRIORITY
*)&_u)); break;
default:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmmpw-js.c
============================================================================
$ cvs diff -u -r1.21.4.10 -r1.21.4.11 rpmmpw-js.c
--- rpm/js/rpmmpw-js.c 11 Jul 2017 11:50:41 -0000 1.21.4.10
+++ rpm/js/rpmmpw-js.c 11 Jul 2017 11:55:37 -0000 1.21.4.11
@@ -1752,7 +1752,7 @@
*vp = OBJECT_TO_JSVAL(o);
ok = true;
} else
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
if (_debug < 0)
fprintf(stderr, "<== %s(%p,%p,0x%x[%s])\t", __FUNCTION__, cx, z,
(unsigned)*vp, v2s(cx, *vp)), mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z));
return ok;
@@ -1800,7 +1800,7 @@
/* XXX FIXME check _base is 0 or [2,36] */
*vp = mpw_format(cx, ptr, _base, 0);
} else
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
return ok;
}
@@ -1887,10 +1887,10 @@
ok = mpw_wrap(cx, vp, mpw_FromMPW(qsize, wksp, 0));
mpbfree(&b);
} else
- *vp = JSVAL_NULL;
+ args.rval().setNull();
randomGeneratorContextFree(&rngc);
} else
- *vp = JSVAL_NULL;
+ args.rval().setNull();
return ok;
}
@@ -2319,7 +2319,7 @@
ok = true;
break;
default:
- *vp = JSVAL_NULL;
+ args.rval().setNull();
for (i = 0; i < argc; i++) {
v = args[i];
@@ -2436,7 +2436,7 @@
}
if (ix < 0) {
ok = true;
- *vp = JSVAL_NULL;
+ args.rval().setNull();
o = NULL;
ptr = z = NULL;
} else {
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmseq-js.c
============================================================================
$ cvs diff -u -r1.7.4.9 -r1.7.4.10 rpmseq-js.c
--- rpm/js/rpmseq-js.c 11 Jul 2017 11:50:41 -0000 1.7.4.9
+++ rpm/js/rpmseq-js.c 11 Jul 2017 11:55:37 -0000 1.7.4.10
@@ -352,7 +352,7 @@
case _DB:
{ DB * _db = NULL;
if ((ret = seq->get_db(seq, &_db)) != 0) {
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
break;
}
*vp = _db->app_private ? OBJECT_TO_JSVAL(_db->app_private) : JSVAL_NULL;
@@ -360,7 +360,7 @@
case _KEY:
{ DBT _k = {0};
if ((ret = seq->get_key(seq, &_k)) != 0) {
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
break;
}
*vp = _k.data
@@ -369,7 +369,7 @@
case _CACHESIZE:
{ int32_t _i = 0;
if ((ret = seq->get_cachesize(seq, &_i)) != 0) {
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
break;
}
d = _i;
@@ -379,7 +379,7 @@
case _FLAGS:
{ uint32_t _u = 0;
if ((ret = seq->get_flags(seq, &_u)) != 0) {
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
break;
}
d = _u;
@@ -392,7 +392,7 @@
db_seq_t _max = 0;
if ((ret = seq->get_range(seq, &_min, &_max)) != 0) {
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
break;
}
switch (tiny) {
@@ -415,7 +415,7 @@
uint32_t _flags = 0;
if ((ret = seq->stat(seq, &sp, _flags)) != 0) {
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
break;
}
switch (tiny) {
@@ -499,7 +499,7 @@
break;
}
if ((ret = seq->get_range(seq, &_min, &_max)) != 0) {
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
break;
}
switch (tiny) {
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmsys-js.c
============================================================================
$ cvs diff -u -r1.8.4.9 -r1.8.4.10 rpmsys-js.c
--- rpm/js/rpmsys-js.c 11 Jul 2017 11:13:12 -0000 1.8.4.9
+++ rpm/js/rpmsys-js.c 11 Jul 2017 11:55:37 -0000 1.8.4.10
@@ -216,7 +216,7 @@
*vp = OBJECT_TO_JSVAL(o);
else {
if (st) st = _free(st);
- *vp = JSVAL_VOID; /* XXX goofy? */
+ args.rval().setUndefined(); /* XXX goofy? */
}
} else
*vp = INT_TO_JSVAL(errno); /* XXX goofy? */
@@ -373,7 +373,7 @@
*vp = OBJECT_TO_JSVAL(o);
else {
if (st) st = _free(st);
- *vp = JSVAL_VOID; /* XXX goofy? */
+ args.rval().setUndefined(); /* XXX goofy? */
}
} else
*vp = INT_TO_JSVAL(errno); /* XXX goofy? */
@@ -541,7 +541,7 @@
jsvec[i] = INT_TO_JSVAL((int)gids[i]);
*vp = OBJECT_TO_JSVAL(JS_NewArrayObject(cx, ng, jsvec));
} else
- *vp = JSVAL_NULL;
+ args.rval().setNull();
} break;
case _HOSTID: *vp = INT_TO_JSVAL((int)gethostid()); break;/* XXX */
case _HOSTNAME:
@@ -565,7 +565,7 @@
jsvec[1] = INT_TO_JSVAL((int)tv.tv_usec);
*vp = OBJECT_TO_JSVAL(JS_NewArrayObject(cx, 2, jsvec));
} else
- *vp = JSVAL_NULL;
+ args.rval().setNull();
} break;
case _UID: *vp = INT_TO_JSVAL((int)getuid()); break;
case _UMASK:
@@ -589,7 +589,7 @@
JS_NewStringCopyN(cx, uts.machine, sizeof(uts.machine)));
*vp = OBJECT_TO_JSVAL(JS_NewArrayObject(cx, 5, jsvec));
} else
- *vp = JSVAL_NULL;
+ args.rval().setNull();
} break;
default:
break;
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmte-js.c
============================================================================
$ cvs diff -u -r1.19.4.9 -r1.19.4.10 rpmte-js.c
--- rpm/js/rpmte-js.c 11 Jul 2017 11:13:12 -0000 1.19.4.9
+++ rpm/js/rpmte-js.c 11 Jul 2017 11:55:37 -0000 1.19.4.10
@@ -52,14 +52,14 @@
{ rpmds ds = NULL;
JSObject *dso = NULL;
if ((ds = rpmteDS(te, tagN)) == NULL)
- *vp = JSVAL_NULL;
+ args.rval().setNull();
else
if ((dso = JS_NewObject(cx, &rpmdsClass, NULL, NULL)) != NULL
&& JS_SetPrivate(cx, dso, rpmdsLink(ds, __FUNCTION__)))
*vp = OBJECT_TO_JSVAL(dso);
else {
ds = rpmdsFree(ds);
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
}
}
ok = true;
@@ -84,14 +84,14 @@
{ rpmfi fi = NULL;
JSObject *fio = NULL;
if ((fi = rpmteFI(te, tagN)) == NULL)
- *vp = JSVAL_NULL;
+ args.rval().setNull();
else
if ((fio = JS_NewObject(cx, &rpmfiClass, NULL, NULL)) != NULL
&& JS_SetPrivate(cx, fio, rpmfiLink(fi, __FUNCTION__)))
*vp = OBJECT_TO_JSVAL(fio);
else {
fi = rpmfiFree(fi);
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
}
}
ok = true;
@@ -233,7 +233,7 @@
#ifdef DYING
*vp = INT_TO_JSVAL(rpmteColor(te));
#else
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
#endif
break;
case _TREE:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmts-js.c
============================================================================
$ cvs diff -u -r1.33.4.10 -r1.33.4.11 rpmts-js.c
--- rpm/js/rpmts-js.c 11 Jul 2017 11:50:41 -0000 1.33.4.10
+++ rpm/js/rpmts-js.c 11 Jul 2017 11:55:37 -0000 1.33.4.11
@@ -283,7 +283,7 @@
else if (JSVAL_IS_NUMBER(v)) {
uint32_t _u = 0;
if (!JS_ValueToECMAUint32(cx, v, &_u)) {
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
goto exit;
}
}
@@ -293,7 +293,7 @@
switch (_mode) {
default:
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
goto exit;
break;
case RPMMIRE_DEFAULT:
@@ -308,9 +308,9 @@
xx = rpmtsOpenDB(ts, O_RDONLY);
if (rpmdbMireApply(rpmtsGetRdb(ts), tag, _mode, _pat, &_av))
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
else if (_av == NULL || _av[0] == NULL)
- *vp = JSVAL_NULL;
+ args.rval().setNull();
else {
int _ac = argsCount(_av);
int i;
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmtxn-js.c
============================================================================
$ cvs diff -u -r1.11.4.9 -r1.11.4.10 rpmtxn-js.c
--- rpm/js/rpmtxn-js.c 11 Jul 2017 11:50:41 -0000 1.11.4.9
+++ rpm/js/rpmtxn-js.c 11 Jul 2017 11:55:37 -0000 1.11.4.10
@@ -215,7 +215,7 @@
switch (tiny) {
case _DEBUG:
if (!JS_NewNumberValue(cx, (jsdouble)_debug, vp))
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
break;
case _NAME:
{ const char * _s = NULL;
@@ -225,7 +225,7 @@
case _ID:
{ uint32_t _u = txn->id(txn);
if (!JS_NewNumberValue(cx, (jsdouble)_u, vp))
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
} break;
default:
break;
@@ -250,7 +250,7 @@
switch (tiny) {
case _DEBUG:
if (!JS_ValueToInt32(cx, *vp, &_debug))
- *vp = JSVAL_VOID;
+ args.rval().setUndefined();
break;
case _NAME:
{ const char * _s = JS_EncodeString(cx, JS_ValueToString(cx,
*vp));
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
