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: 13-Jul-2017 00:06:15
Branch: rpm-5_4 Handle: 2017071222061401
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: commeny out debugging for now.
Summary:
Revision Changes Path
1.11.4.13 +14 -14 rpm/js/rpmaug-js.c
1.4.4.8 +2 -2 rpm/js/rpmbc-js.c
1.10.4.12 +6 -6 rpm/js/rpmbf-js.c
1.6.4.12 +4 -4 rpm/js/rpmcudf-js.c
1.31.4.11 +23 -23 rpm/js/rpmdb-js.c
1.14.4.11 +10 -10 rpm/js/rpmdbc-js.c
1.21.4.12 +54 -54 rpm/js/rpmdbe-js.c
1.9.4.12 +7 -7 rpm/js/rpmdc-js.c
1.5.2.8 +2 -2 rpm/js/rpmdig-js.c
1.8.4.8 +4 -4 rpm/js/rpmdir-js.c
1.20.4.9 +4 -4 rpm/js/rpmds-js.c
1.4.4.8 +2 -2 rpm/js/rpmfc-js.c
1.15.4.10 +2 -2 rpm/js/rpmfi-js.c
1.10.4.10 +9 -9 rpm/js/rpmfts-js.c
1.4.4.8 +2 -2 rpm/js/rpmgi-js.c
1.24.4.10 +9 -9 rpm/js/rpmhdr-js.c
1.9.4.13 +21 -21 rpm/js/rpmio-js.c
1.4.4.8 +2 -2 rpm/js/rpmiob-js.c
1.12.4.11 +6 -6 rpm/js/rpmmc-js.c
1.4.4.9 +4 -4 rpm/js/rpmmg-js.c
1.28.4.10 +7 -7 rpm/js/rpmmi-js.c
1.7.4.11 +7 -7 rpm/js/rpmmpf-js.c
1.21.4.12 +12 -12 rpm/js/rpmmpw-js.c
1.18.4.10 +4 -4 rpm/js/rpmps-js.c
1.7.4.11 +8 -8 rpm/js/rpmseq-js.c
1.8.4.10 +2 -2 rpm/js/rpmsm-js.c
1.4.4.9 +2 -2 rpm/js/rpmsp-js.c
1.10.4.8 +4 -4 rpm/js/rpmst-js.c
1.4.4.8 +2 -2 rpm/js/rpmsw-js.c
1.8.4.10 +2 -2 rpm/js/rpmsx-js.c
1.8.4.11 +20 -20 rpm/js/rpmsys-js.c
1.19.4.11 +4 -4 rpm/js/rpmte-js.c
1.33.4.12 +10 -10 rpm/js/rpmts-js.c
1.11.4.11 +6 -6 rpm/js/rpmtxn-js.c
1.5.4.9 +2 -2 rpm/js/rpmxar-js.c
1.9.4.9 +1 -1 rpm/js/syck-js.c
1.18.4.9 +4 -4 rpm/js/uuid-js.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/js/rpmaug-js.c
============================================================================
$ cvs diff -u -r1.11.4.12 -r1.11.4.13 rpmaug-js.c
--- rpm/js/rpmaug-js.c 11 Jul 2017 11:55:37 -0000 1.11.4.12
+++ rpm/js/rpmaug-js.c 12 Jul 2017 22:06:14 -0000 1.11.4.13
@@ -39,7 +39,7 @@
const char * _name = NULL;
const char * _expr = NULL;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
/* XXX note optional EXPR. If EXPR is NULL, then NAME is deleted. */
if (!(ok = JS_ConvertArguments(cx, args, "s/s", &_name, &_expr)))
@@ -70,7 +70,7 @@
const char * _path = NULL;
const char * _value = NULL;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (!(ok = JS_ConvertArguments(cx, args, "s", &_path)))
goto exit;
@@ -104,7 +104,7 @@
const char * _path = NULL;
const char * _value = NULL;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (!(ok = JS_ConvertArguments(cx, args, "ss", &_path, &_value)))
goto exit;
@@ -135,7 +135,7 @@
const char * _label = NULL;
int _before;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (!(ok = JS_ConvertArguments(cx, args, "ssi", &_path, &_label,
&_before)))
goto exit;
@@ -164,7 +164,7 @@
bool ok = false;
const char * _path = NULL;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (!(ok = JS_ConvertArguments(cx, args, "s", &_path)))
goto exit;
@@ -187,7 +187,7 @@
const char * _src = NULL;
const char * _dst = NULL;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (!(ok = JS_ConvertArguments(cx, args, "ss", &_src, &_dst)))
goto exit;
@@ -218,7 +218,7 @@
char ** _matches = NULL;
int nmatches;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (!(ok = JS_ConvertArguments(cx, args, "s", &_path)))
goto exit;
@@ -253,7 +253,7 @@
rpmaug aug = (rpmaug) ptr;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
switch (rpmaugSave(aug)) {
case 0: /* success */
@@ -277,7 +277,7 @@
rpmaug aug = (rpmaug) ptr;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
switch (rpmaugLoad(aug)) {
case 0: /* success */
@@ -303,7 +303,7 @@
bool ok = false;
const char * _path = NULL;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (!(ok = JS_ConvertArguments(cx, args, "s", &_path)))
goto exit;
@@ -356,7 +356,7 @@
rpmaug aug = (rpmaug) ptr;
jsint tiny = JSVAL_TO_INT(id);
-_PROP_DEBUG_ENTRY(_debug < 0);
+//_PROP_DEBUG_ENTRY(_debug < 0);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
if (ptr == NULL)
@@ -391,7 +391,7 @@
rpmaug aug = (rpmaug) ptr;
jsint tiny = JSVAL_TO_INT(id);
-_PROP_DEBUG_ENTRY(_debug < 0);
+//_PROP_DEBUG_ENTRY(_debug < 0);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
if (ptr == NULL)
@@ -427,7 +427,7 @@
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmaugClass, nullptr);
rpmaug aug = (rpmaug) ptr;
-_RESOLVE_DEBUG_ENTRY(_debug);
+//_RESOLVE_DEBUG_ENTRY(_debug);
if (ptr == NULL) { /* don't resolve to parent prototypes objects.
*/
*objp = NULL;
@@ -490,7 +490,7 @@
jsval *statep, jsid *idp)
{
-_ENUMERATE_DEBUG_ENTRY(_debug);
+//_ENUMERATE_DEBUG_ENTRY(_debug);
switch (op) {
case JSENUMERATE_INIT:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmbc-js.c
============================================================================
$ cvs diff -u -r1.4.4.7 -r1.4.4.8 rpmbc-js.c
--- rpm/js/rpmbc-js.c 11 Jul 2017 11:13:11 -0000 1.4.4.7
+++ rpm/js/rpmbc-js.c 12 Jul 2017 22:06:14 -0000 1.4.4.8
@@ -107,7 +107,7 @@
{
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmbcClass, nullptr);
-_RESOLVE_DEBUG_ENTRY(_debug < 0);
+//_RESOLVE_DEBUG_ENTRY(_debug < 0);
if ((flags & JSRESOLVE_ASSIGNING)
|| (ptr == NULL)) { /* don't resolve to parent prototypes objects. */
@@ -126,7 +126,7 @@
jsval *statep, jsid *idp)
{
-_ENUMERATE_DEBUG_ENTRY(_debug < 0);
+//_ENUMERATE_DEBUG_ENTRY(_debug < 0);
switch (op) {
case JSENUMERATE_INIT:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmbf-js.c
============================================================================
$ cvs diff -u -r1.10.4.11 -r1.10.4.12 rpmbf-js.c
--- rpm/js/rpmbf-js.c 12 Jul 2017 19:48:41 -0000 1.10.4.11
+++ rpm/js/rpmbf-js.c 12 Jul 2017 22:06:14 -0000 1.10.4.12
@@ -30,7 +30,7 @@
rpmbf bf = (rpmbf) ptr;
bool ok = true;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
RootedString str(cx, ToString(cx, args[0]));
const char * _s = JS_EncodeStringToUTF8(cx, str);
@@ -49,7 +49,7 @@
rpmbf bf = (rpmbf) ptr;
bool ok = true;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
RootedString str(cx, ToString(cx, args[0]));
const char * _s = JS_EncodeStringToUTF8(cx, str);
@@ -68,7 +68,7 @@
rpmbf bf = (rpmbf) ptr;
bool ok = true;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
args.rval().setBoolean(rpmbfClr(bf) == 0);
return ok;
@@ -84,7 +84,7 @@
rpmbf bf = (rpmbf) ptr;
bool ok = true;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
RootedString str(cx, ToString(cx, args[0]));
const char * _s = JS_EncodeStringToUTF8(cx, str);
@@ -103,7 +103,7 @@
rpmbf _a = (rpmbf) ptr;
bool ok = true;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
RootedObject o(cx, ToObject(cx, args[0]));
rpmbf _b = (rpmbf) JS_GetInstancePrivate(cx, o, &rpmbfClass, nullptr);
@@ -122,7 +122,7 @@
rpmbf _a = (rpmbf) ptr;
bool ok = true;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
RootedObject o(cx, ToObject(cx, args[0]));
rpmbf _b = (rpmbf) JS_GetInstancePrivate(cx, o, &rpmbfClass, nullptr);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmcudf-js.c
============================================================================
$ cvs diff -u -r1.6.4.11 -r1.6.4.12 rpmcudf-js.c
--- rpm/js/rpmcudf-js.c 11 Jul 2017 11:55:37 -0000 1.6.4.11
+++ rpm/js/rpmcudf-js.c 12 Jul 2017 22:06:14 -0000 1.6.4.12
@@ -50,7 +50,7 @@
JSObject *fno = NULL;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (!(ok = JS_ConvertArguments(cx, args, "o", &fno)))
goto exit;
@@ -81,7 +81,7 @@
rpmcudf cudf = (rpmcudf) ptr;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (cudf && cudf->V.typ == RPMCUDV_CUDFDOC) {
rpmcudfPrintPreamble(cudf);
@@ -215,7 +215,7 @@
{
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmcudfClass, nullptr);
-_RESOLVE_DEBUG_ENTRY(_debug < 0);
+//_RESOLVE_DEBUG_ENTRY(_debug < 0);
if ((flags & JSRESOLVE_ASSIGNING)
|| (ptr == NULL)) { /* don't resolve to parent prototypes objects. */
@@ -234,7 +234,7 @@
jsval *statep, jsid *idp)
{
-_ENUMERATE_DEBUG_ENTRY(_debug < 0);
+//_ENUMERATE_DEBUG_ENTRY(_debug < 0);
switch (op) {
case JSENUMERATE_INIT:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmdb-js.c
============================================================================
$ cvs diff -u -r1.31.4.10 -r1.31.4.11 rpmdb-js.c
--- rpm/js/rpmdb-js.c 11 Jul 2017 11:55:37 -0000 1.31.4.10
+++ rpm/js/rpmdb-js.c 12 Jul 2017 22:06:14 -0000 1.31.4.11
@@ -148,7 +148,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (db == NULL) goto exit;
args.rval().setBoolean(false);
@@ -199,7 +199,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (db == NULL) goto exit;
args.rval().setBoolean(false);
@@ -248,7 +248,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (db == NULL) goto exit;
args.rval().setBoolean(false);
@@ -279,7 +279,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (db == NULL) goto exit;
args.rval().setBoolean(false);
@@ -320,7 +320,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (db == NULL) goto exit;
args.rval().setBoolean(false);
@@ -372,7 +372,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (db == NULL) goto exit;
args.rval().setBoolean(false);
@@ -421,7 +421,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (db == NULL) goto exit;
args.rval().setBoolean(false);
@@ -473,7 +473,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (db == NULL) goto exit;
args.rval().setBoolean(false);
@@ -535,7 +535,7 @@
jsval v;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (db == NULL) goto exit;
args.rval().setBoolean(false);
@@ -602,7 +602,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (db == NULL) goto exit;
args.rval().setBoolean(false);
@@ -660,7 +660,7 @@
int _mode = 0644;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (db == NULL) goto exit;
args.rval().setBoolean(false);
@@ -718,7 +718,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (db == NULL) goto exit;
args.rval().setBoolean(false);
@@ -772,7 +772,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (db == NULL) goto exit;
args.rval().setBoolean(false);
@@ -821,7 +821,7 @@
const char * _database = NULL;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (db == NULL) goto exit;
args.rval().setBoolean(false);
@@ -858,7 +858,7 @@
const char * _newname = NULL;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (db == NULL) goto exit;
args.rval().setBoolean(false);
@@ -895,7 +895,7 @@
uint32_t _flags = DB_STAT_ALL; /* XXX DB_FAST_STAT is saner default */
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (db == NULL) goto exit;
args.rval().setBoolean(false);
@@ -933,7 +933,7 @@
uint32_t _flags = DB_STAT_ALL; /* XXX DB_FAST_STAT is saner default */
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (db == NULL) goto exit;
args.rval().setBoolean(false);
@@ -964,7 +964,7 @@
DB * db = ptr;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (db == NULL) goto exit;
args.rval().setBoolean(false);
@@ -997,7 +997,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (db == NULL) goto exit;
args.rval().setBoolean(false);
@@ -1034,7 +1034,7 @@
const char * _file = NULL;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (db == NULL) goto exit;
args.rval().setBoolean(false);
@@ -1070,7 +1070,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (db == NULL) goto exit;
args.rval().setBoolean(false);
@@ -1624,7 +1624,7 @@
{
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbClass, nullptr);
-_RESOLVE_DEBUG_ENTRY(_debug < 0);
+//_RESOLVE_DEBUG_ENTRY(_debug < 0);
if ((flags & JSRESOLVE_ASSIGNING)
|| (ptr == NULL)) { /* don't resolve to parent prototypes objects. */
@@ -1643,7 +1643,7 @@
jsval *statep, jsid *idp)
{
-_ENUMERATE_DEBUG_ENTRY(_debug < 0);
+//_ENUMERATE_DEBUG_ENTRY(_debug < 0);
switch (op) {
case JSENUMERATE_INIT:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmdbc-js.c
============================================================================
$ cvs diff -u -r1.14.4.10 -r1.14.4.11 rpmdbc-js.c
--- rpm/js/rpmdbc-js.c 11 Jul 2017 11:55:37 -0000 1.14.4.10
+++ rpm/js/rpmdbc-js.c 12 Jul 2017 22:06:14 -0000 1.14.4.11
@@ -51,7 +51,7 @@
DBC * dbc = ptr;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbc == NULL) goto exit;
args.rval().setBoolean(false);
@@ -81,7 +81,7 @@
DBC * _otherdbc = NULL;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbc == NULL) goto exit;
args.rval().setBoolean(false);
@@ -122,7 +122,7 @@
DBC * dbc = ptr;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbc == NULL) goto exit;
args.rval().setBoolean(false);
@@ -158,7 +158,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbc == NULL) goto exit;
args.rval().setBoolean(false);
@@ -194,7 +194,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbc == NULL) goto exit;
args.rval().setBoolean(false);
@@ -243,7 +243,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbc == NULL) goto exit;
args.rval().setBoolean(false);
@@ -298,7 +298,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbc == NULL) goto exit;
args.rval().setBoolean(false);
@@ -345,7 +345,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbc == NULL) goto exit;
args.rval().setBoolean(false);
@@ -485,7 +485,7 @@
{
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, nullptr);
-_RESOLVE_DEBUG_ENTRY(_debug < 0);
+//_RESOLVE_DEBUG_ENTRY(_debug < 0);
if ((flags & JSRESOLVE_ASSIGNING)
|| (ptr == NULL)) { /* don't resolve to parent prototypes objects. */
@@ -506,7 +506,7 @@
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbcClass, nullptr);
DBC * dbc = ptr;
-_ENUMERATE_DEBUG_ENTRY(_debug < 0);
+//_ENUMERATE_DEBUG_ENTRY(_debug < 0);
switch (op) {
case JSENUMERATE_INIT:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmdbe-js.c
============================================================================
$ cvs diff -u -r1.21.4.11 -r1.21.4.12 rpmdbe-js.c
--- rpm/js/rpmdbe-js.c 11 Jul 2017 11:55:37 -0000 1.21.4.11
+++ rpm/js/rpmdbe-js.c 12 Jul 2017 22:06:14 -0000 1.21.4.12
@@ -162,7 +162,7 @@
DB_ENV * dbenv = ptr;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -207,7 +207,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -238,7 +238,7 @@
JSString * js_database = NULL;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -278,7 +278,7 @@
JSString * js_newname = NULL;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -317,7 +317,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setUndefined();
@@ -357,7 +357,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -391,7 +391,7 @@
uint32_t _atype = DB_LOCK_EXPIRE;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -464,7 +464,7 @@
uint32_t _mode = DB_LOCK_WRITE;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -500,7 +500,7 @@
DB_ENV * dbenv = ptr;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setNull();
@@ -530,7 +530,7 @@
uint32_t _id = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -563,7 +563,7 @@
DB_ENV * dbenv = ptr;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -598,7 +598,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -632,7 +632,7 @@
uint32_t _flags = DB_STAT_ALL;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -665,7 +665,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -698,7 +698,7 @@
uint32_t _flags = DB_ARCH_ABS | DB_ARCH_LOG;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -752,7 +752,7 @@
DB_ENV * dbenv = ptr;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -775,7 +775,7 @@
DB_LSN _lsn = { 0, 0 };
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setNull();
@@ -812,7 +812,7 @@
DB_LSN _lsn = { 0, 0 };
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -844,7 +844,7 @@
JSString * js_fmt = NULL;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -881,7 +881,7 @@
uint32_t _flags = DB_FLUSH;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -916,7 +916,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -950,7 +950,7 @@
uint32_t _flags = DB_STAT_ALL;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -983,7 +983,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -1018,7 +1018,7 @@
DB_ENV * dbenv = ptr;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -1042,7 +1042,7 @@
DB_ENV * dbenv = ptr;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -1065,7 +1065,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -1104,7 +1104,7 @@
uint32_t _flags = DB_STAT_ALL;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -1136,7 +1136,7 @@
DB_LSN _lsn = { 0, 0 };
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -1169,7 +1169,7 @@
int _percent = 20;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setUndefined();
@@ -1204,7 +1204,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -1237,7 +1237,7 @@
DB_ENV * dbenv = ptr;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -1268,7 +1268,7 @@
DB_ENV * dbenv = ptr;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -1297,7 +1297,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -1331,7 +1331,7 @@
uint32_t _flags = DB_STAT_ALL;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -1364,7 +1364,7 @@
DB_ENV * dbenv = ptr;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -1395,7 +1395,7 @@
int _mode = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -1440,7 +1440,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -1478,7 +1478,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -1511,7 +1511,7 @@
DB_ENV * dbenv = ptr;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -1535,7 +1535,7 @@
DB_ENV * dbenv = ptr;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -1558,7 +1558,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -1592,7 +1592,7 @@
uint32_t _flags = DB_STAT_ALL;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -1624,7 +1624,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -1657,7 +1657,7 @@
DB_ENV * dbenv = ptr;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -1680,7 +1680,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -1714,7 +1714,7 @@
uint32_t _flags = DB_STAT_ALL;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -1746,7 +1746,7 @@
uint32_t _flags = DB_STAT_ALL;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -1782,7 +1782,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -1832,7 +1832,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -1865,7 +1865,7 @@
DB_ENV * dbenv = ptr;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -1914,7 +1914,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -1948,7 +1948,7 @@
uint32_t _flags = DB_STAT_ALL;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (dbenv == NULL) goto exit;
args.rval().setBoolean(false);
@@ -2741,7 +2741,7 @@
{
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdbeClass, nullptr);
-_RESOLVE_DEBUG_ENTRY(_debug < 0);
+//_RESOLVE_DEBUG_ENTRY(_debug < 0);
if ((flags & JSRESOLVE_ASSIGNING)
|| (ptr == NULL)) { /* don't resolve to parent prototypes objects. */
@@ -2760,7 +2760,7 @@
jsval *statep, jsid *idp)
{
-_ENUMERATE_DEBUG_ENTRY(_debug < 0);
+//_ENUMERATE_DEBUG_ENTRY(_debug < 0);
switch (op) {
case JSENUMERATE_INIT:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmdc-js.c
============================================================================
$ cvs diff -u -r1.9.4.11 -r1.9.4.12 rpmdc-js.c
--- rpm/js/rpmdc-js.c 11 Jul 2017 11:55:37 -0000 1.9.4.11
+++ rpm/js/rpmdc-js.c 12 Jul 2017 22:06:14 -0000 1.9.4.12
@@ -53,7 +53,7 @@
unsigned int _dalgo = PGPHASHALGO_NONE;
unsigned int _flags = RPMDIGEST_NONE;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (!(ok = JS_ConvertArguments(cx, args, "/uu", &_dalgo, &_flags)))
goto exit;
@@ -84,7 +84,7 @@
const char * s = NULL;
size_t ns = 0;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
args.rval().setBoolean(false);
if (!(ok = JS_ConvertArguments(cx, args, "s", &s)))
@@ -112,7 +112,7 @@
const char * s = NULL;
size_t ns = 0;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
args.rval().setBoolean(false);
if (dc == NULL)
@@ -164,7 +164,7 @@
rpmdc dc = (rpmdc) ptr;
jsint tiny = JSVAL_TO_INT(id);
-_PROP_DEBUG_ENTRY(_debug < 0);
+//_PROP_DEBUG_ENTRY(_debug < 0);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
if (ptr == NULL)
@@ -188,7 +188,7 @@
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdcClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
-_PROP_DEBUG_ENTRY(_debug < 0);
+//_PROP_DEBUG_ENTRY(_debug < 0);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
if (ptr == NULL)
@@ -213,7 +213,7 @@
{
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdcClass, nullptr);
-_RESOLVE_DEBUG_ENTRY(_debug < 0);
+//_RESOLVE_DEBUG_ENTRY(_debug < 0);
if ((flags & JSRESOLVE_ASSIGNING)
|| (ptr == NULL)) { /* don't resolve to parent prototypes objects. */
@@ -232,7 +232,7 @@
jsval *statep, jsid *idp)
{
-_ENUMERATE_DEBUG_ENTRY(_debug < 0);
+//_ENUMERATE_DEBUG_ENTRY(_debug < 0);
switch (op) {
case JSENUMERATE_INIT:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmdig-js.c
============================================================================
$ cvs diff -u -r1.5.2.7 -r1.5.2.8 rpmdig-js.c
--- rpm/js/rpmdig-js.c 11 Jul 2017 11:13:11 -0000 1.5.2.7
+++ rpm/js/rpmdig-js.c 12 Jul 2017 22:06:14 -0000 1.5.2.8
@@ -103,7 +103,7 @@
{
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdigClass, nullptr);
-_RESOLVE_DEBUG_ENTRY(_debug < 0);
+//_RESOLVE_DEBUG_ENTRY(_debug < 0);
if ((flags & JSRESOLVE_ASSIGNING)
|| (ptr == NULL)) { /* don't resolve to parent prototypes objects. */
@@ -122,7 +122,7 @@
jsval *statep, jsid *idp)
{
-_ENUMERATE_DEBUG_ENTRY(_debug < 0);
+//_ENUMERATE_DEBUG_ENTRY(_debug < 0);
switch (op) {
case JSENUMERATE_INIT:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmdir-js.c
============================================================================
$ cvs diff -u -r1.8.4.7 -r1.8.4.8 rpmdir-js.c
--- rpm/js/rpmdir-js.c 11 Jul 2017 11:13:11 -0000 1.8.4.7
+++ rpm/js/rpmdir-js.c 12 Jul 2017 22:06:14 -0000 1.8.4.8
@@ -59,7 +59,7 @@
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdirClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
-_PROP_DEBUG_ENTRY(_debug < 0);
+//_PROP_DEBUG_ENTRY(_debug < 0);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
if (ptr == NULL)
@@ -80,7 +80,7 @@
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdirClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
-_PROP_DEBUG_ENTRY(_debug < 0);
+//_PROP_DEBUG_ENTRY(_debug < 0);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
if (ptr == NULL)
@@ -104,7 +104,7 @@
{
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmdirClass, nullptr);
-_RESOLVE_DEBUG_ENTRY(_debug < 0);
+//_RESOLVE_DEBUG_ENTRY(_debug < 0);
if ((flags & JSRESOLVE_ASSIGNING)
|| (ptr == NULL)) { /* don't resolve to parent prototypes objects. */
@@ -128,7 +128,7 @@
unsigned int ix = 0;
/* XXX VG: JS_Enumerate (jsobj.c:4211) doesn't initialize some fields. */
-_ENUMERATE_DEBUG_ENTRY(_debug < 0);
+//_ENUMERATE_DEBUG_ENTRY(_debug < 0);
switch (op) {
case JSENUMERATE_INIT:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmds-js.c
============================================================================
$ cvs diff -u -r1.20.4.8 -r1.20.4.9 rpmds-js.c
--- rpm/js/rpmds-js.c 11 Jul 2017 11:13:11 -0000 1.20.4.8
+++ rpm/js/rpmds-js.c 12 Jul 2017 22:06:14 -0000 1.20.4.9
@@ -77,7 +77,7 @@
jsint tiny = JSVAL_TO_INT(id);
int ix;
-_PROP_DEBUG_ENTRY(_debug < 0);
+//_PROP_DEBUG_ENTRY(_debug < 0);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
if (ptr == NULL)
@@ -154,7 +154,7 @@
int myint;
int ix;
-_PROP_DEBUG_ENTRY(_debug < 0);
+//_PROP_DEBUG_ENTRY(_debug < 0);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
if (ptr == NULL)
@@ -222,7 +222,7 @@
jsint ix;
bool ok = false;
-_RESOLVE_DEBUG_ENTRY(_debug < 0);
+//_RESOLVE_DEBUG_ENTRY(_debug < 0);
if ((flags & JSRESOLVE_ASSIGNING)
|| (ds == NULL)) { /* don't resolve to parent prototypes objects.
*/
@@ -278,7 +278,7 @@
rpmds ds = (rpmds)ptr;
int ix;
-_ENUMERATE_DEBUG_ENTRY(_debug < 0);
+//_ENUMERATE_DEBUG_ENTRY(_debug < 0);
switch (op) {
case JSENUMERATE_INIT:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmfc-js.c
============================================================================
$ cvs diff -u -r1.4.4.7 -r1.4.4.8 rpmfc-js.c
--- rpm/js/rpmfc-js.c 11 Jul 2017 11:13:11 -0000 1.4.4.7
+++ rpm/js/rpmfc-js.c 12 Jul 2017 22:06:14 -0000 1.4.4.8
@@ -105,7 +105,7 @@
{
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmfcClass, nullptr);
-_RESOLVE_DEBUG_ENTRY(_debug < 0);
+//_RESOLVE_DEBUG_ENTRY(_debug < 0);
if ((flags & JSRESOLVE_ASSIGNING)
|| (ptr == NULL)) { /* don't resolve to parent prototypes objects. */
@@ -124,7 +124,7 @@
jsval *statep, jsid *idp)
{
-_ENUMERATE_DEBUG_ENTRY(_debug < 0);
+//_ENUMERATE_DEBUG_ENTRY(_debug < 0);
switch (op) {
case JSENUMERATE_INIT:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmfi-js.c
============================================================================
$ cvs diff -u -r1.15.4.9 -r1.15.4.10 rpmfi-js.c
--- rpm/js/rpmfi-js.c 11 Jul 2017 11:55:37 -0000 1.15.4.9
+++ rpm/js/rpmfi-js.c 12 Jul 2017 22:06:14 -0000 1.15.4.10
@@ -277,7 +277,7 @@
bool ok = false;
int ix;
-_RESOLVE_DEBUG_ENTRY(_debug);
+//_RESOLVE_DEBUG_ENTRY(_debug);
if ((flags & JSRESOLVE_ASSIGNING)
|| (fi == NULL)) { /* don't resolve to parent prototypes objects. */
@@ -323,7 +323,7 @@
rpmfi fi = (rpmfi) ptr;
int ix;
-_ENUMERATE_DEBUG_ENTRY(_debug);
+//_ENUMERATE_DEBUG_ENTRY(_debug);
switch (op) {
case JSENUMERATE_INIT:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmfts-js.c
============================================================================
$ cvs diff -u -r1.10.4.9 -r1.10.4.10 rpmfts-js.c
--- rpm/js/rpmfts-js.c 11 Jul 2017 11:55:37 -0000 1.10.4.9
+++ rpm/js/rpmfts-js.c 12 Jul 2017 22:06:14 -0000 1.10.4.10
@@ -101,7 +101,7 @@
int _instr = FTS_NOINSTR;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (!(ok = JS_ConvertArguments(cx, args, "/u", &_instr)))
goto exit;
@@ -124,7 +124,7 @@
FTS * fts = ptr;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
/* XXX FIXME: _options are not persistent across fts.close() */
if (fts) {
@@ -150,7 +150,7 @@
int _options = -1;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (!(ok = JS_ConvertArguments(cx, args, "o/u", &dno, &_options)))
goto exit;
@@ -181,7 +181,7 @@
FTS * fts = ptr;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
*vp = (fts && Fts_read(fts) ? OBJECT_TO_JSVAL(obj) : JSVAL_FALSE);
@@ -200,7 +200,7 @@
int _instr = FTS_NOINSTR;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (!(ok = JS_ConvertArguments(cx, args, "/u", &_instr)))
goto exit;
@@ -307,7 +307,7 @@
FTSENT * p = (fts ? fts->fts_cur : NULL);
jsint tiny = JSVAL_TO_INT(id);
-_PROP_DEBUG_ENTRY(_debug < 0);
+//_PROP_DEBUG_ENTRY(_debug < 0);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
if (ptr == NULL)
@@ -379,7 +379,7 @@
jsint tiny = JSVAL_TO_INT(id);
int myint = 0;
-_PROP_DEBUG_ENTRY(_debug < 0);
+//_PROP_DEBUG_ENTRY(_debug < 0);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
if (ptr == NULL)
@@ -435,7 +435,7 @@
{
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmftsClass, nullptr);
-_RESOLVE_DEBUG_ENTRY(_debug < 0);
+//_RESOLVE_DEBUG_ENTRY(_debug < 0);
if ((flags & JSRESOLVE_ASSIGNING)
|| (ptr == NULL)) { /* don't resolve to parent prototypes objects. */
@@ -458,7 +458,7 @@
FTSENT * p;
unsigned int ix = 0;
-_ENUMERATE_DEBUG_ENTRY(_debug < 0);
+//_ENUMERATE_DEBUG_ENTRY(_debug < 0);
switch (op) {
case JSENUMERATE_INIT:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmgi-js.c
============================================================================
$ cvs diff -u -r1.4.4.7 -r1.4.4.8 rpmgi-js.c
--- rpm/js/rpmgi-js.c 11 Jul 2017 11:13:11 -0000 1.4.4.7
+++ rpm/js/rpmgi-js.c 12 Jul 2017 22:06:14 -0000 1.4.4.8
@@ -105,7 +105,7 @@
{
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmgiClass, nullptr);
-_RESOLVE_DEBUG_ENTRY(_debug < 0);
+//_RESOLVE_DEBUG_ENTRY(_debug < 0);
if ((flags & JSRESOLVE_ASSIGNING)
|| (ptr == NULL)) { /* don't resolve to parent prototypes objects. */
@@ -124,7 +124,7 @@
jsval *statep, jsid *idp)
{
-_ENUMERATE_DEBUG_ENTRY(_debug < 0);
+//_ENUMERATE_DEBUG_ENTRY(_debug < 0);
switch (op) {
case JSENUMERATE_INIT:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmhdr-js.c
============================================================================
$ cvs diff -u -r1.24.4.9 -r1.24.4.10 rpmhdr-js.c
--- rpm/js/rpmhdr-js.c 11 Jul 2017 11:13:11 -0000 1.24.4.9
+++ rpm/js/rpmhdr-js.c 12 Jul 2017 22:06:14 -0000 1.24.4.10
@@ -152,7 +152,7 @@
rpmTag tagN = RPMTAG_NAME;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (!(ok = JS_ConvertArguments(cx, args, "/u", &tagN)))
goto exit;
@@ -172,7 +172,7 @@
rpmTag tagN = RPMTAG_BASENAMES;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (!(ok = JS_ConvertArguments(cx, args, "/u", &tagN)))
goto exit;
@@ -194,7 +194,7 @@
const char * errstr = NULL;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (!(ok = JS_ConvertArguments(cx, args, "s", &qfmt)))
goto exit;
@@ -216,7 +216,7 @@
Header h = (Header) ptr;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, headerGetOrigin(h)));
ok = true;
@@ -233,7 +233,7 @@
char * s = NULL;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (!(ok = JS_ConvertArguments(cx, args, "s", &s)))
goto exit;
@@ -271,7 +271,7 @@
Header h = (Header) ptr;
jsint tiny = JSVAL_TO_INT(id);
-_PROP_DEBUG_ENTRY(_debug < 0);
+//_PROP_DEBUG_ENTRY(_debug < 0);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
if (ptr == NULL)
@@ -301,7 +301,7 @@
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmhdrClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
-_PROP_DEBUG_ENTRY(_debug < 0);
+//_PROP_DEBUG_ENTRY(_debug < 0);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
if (ptr == NULL)
@@ -327,7 +327,7 @@
Header h = (Header) ptr;
bool ok = false;
-_RESOLVE_DEBUG_ENTRY(_debug);
+//_RESOLVE_DEBUG_ENTRY(_debug);
if ((flags & JSRESOLVE_ASSIGNING)
|| (h == NULL)) { /* don't resolve to parent prototypes objects.
*/
@@ -388,7 +388,7 @@
JSObject *ho = NULL;
bool ok = false;
-_ENUMERATE_DEBUG_ENTRY(_debug);
+//_ENUMERATE_DEBUG_ENTRY(_debug);
switch (op) {
case JSENUMERATE_INIT:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmio-js.c
============================================================================
$ cvs diff -u -r1.9.4.12 -r1.9.4.13 rpmio-js.c
--- rpm/js/rpmio-js.c 12 Jul 2017 20:00:58 -0000 1.9.4.12
+++ rpm/js/rpmio-js.c 12 Jul 2017 22:06:14 -0000 1.9.4.13
@@ -74,7 +74,7 @@
jsuint _flags = 0;
bool ok;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if ((ok = JS_ConvertArguments(cx, args, "/uu", &_dalgo, &_flags))) {
if (fd)
@@ -94,7 +94,7 @@
jsuint _dalgo = PGPHASHALGO_MD5;
bool ok;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if ((ok = JS_ConvertArguments(cx, args, "/u", &_dalgo))) {
if (fd) {
@@ -119,7 +119,7 @@
jsint _gid = -1;
bool ok;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if ((ok = JS_ConvertArguments(cx, args, "/ii", &_uid, &_gid))) {
uid_t uid = _uid;
@@ -139,7 +139,7 @@
FD_t fd = (FD_t) ptr;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
/* XXX FIXME: _fmode is not persistent across io.fclose() */
if (fd) {
@@ -164,7 +164,7 @@
const char * _fmode = "r.ufdio";
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (!(ok = JS_ConvertArguments(cx, args, "s", &_fmode)))
goto exit;
@@ -193,7 +193,7 @@
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, nullptr);
FD_t fd = (FD_t) ptr;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
args.rval().setBoolean(fd && !Ferror(fd));
return true;
}
@@ -206,7 +206,7 @@
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, nullptr);
FD_t fd = (FD_t) ptr;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
args.rval().setBoolean((fd && !Fflush(fd));
return true;
}
@@ -222,7 +222,7 @@
bool ok = true;
int rc = -3;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
_rpmio_debug = -1;
if (fd) {
@@ -245,7 +245,7 @@
FD_t fd = (FD_t) ptr;
int fdno;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
*vp = (fd && (fdno = Fileno(fd)) >= 0
? INT_TO_JSVAL(fdno) : INT_TO_JSVAL(-1));
return true;
@@ -262,7 +262,7 @@
const char * _fmode = "r.ufdio";
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (!(ok = JS_ConvertArguments(cx, args, "s/s", &_fn, &_fmode)))
goto exit;
@@ -294,7 +294,7 @@
static jsuint _nbmax = 16 * BUFSIZ;
jsuint _nb = BUFSIZ;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (!(ok = JS_ConvertArguments(cx, args, "/u", &_nb)))
goto exit;
@@ -334,7 +334,7 @@
jsint _whence = SEEK_CUR;
int rc = -3;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if ((ok = JS_ConvertArguments(cx, args, "/ii", &_offset, _whence)))
rc = (fd ? Fseek(fd, _offset, _whence) : -3);
*vp = INT_TO_JSVAL(rc);
@@ -353,7 +353,7 @@
jsint _offset = 0;
int rc = -3;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if ((ok = JS_ConvertArguments(cx, args, "i", &_offset))) {
fpos_t pos = _offset;
rc = (fd ? Fsetpos(fd, &pos) : -3);
@@ -373,7 +373,7 @@
bool ok = false;
struct stat sb;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (fd && !Fstat(fd, &sb)) {
JSObject *o;
@@ -404,7 +404,7 @@
bool ok = JSVAL_TRUE;
int rc = -3;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
rc = (int)(fd ? Ftell(fd) : -3);
*vp = INT_TO_JSVAL(rc);
return ok;
@@ -421,7 +421,7 @@
const char * b = NULL;
size_t nb;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (!(ok = JS_ConvertArguments(cx, args, "s", &b)))
goto exit;
@@ -451,7 +451,7 @@
FD_t fd = (FD_t) ptr;
bool ok = JSVAL_TRUE;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
/* XXX should return fd object */
if (fd) {
Rewind(fd);
@@ -529,7 +529,7 @@
FD_t fd = (FD_t) ptr;
jsint tiny = JSVAL_TO_INT(id);
-_PROP_DEBUG_ENTRY(_debug < 0);
+//_PROP_DEBUG_ENTRY(_debug < 0);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
if (ptr == NULL)
@@ -561,7 +561,7 @@
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
-_PROP_DEBUG_ENTRY(_debug < 0);
+//_PROP_DEBUG_ENTRY(_debug < 0);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
if (ptr == NULL)
@@ -585,7 +585,7 @@
{
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmioClass, nullptr);
-_RESOLVE_DEBUG_ENTRY(_debug < 0);
+//_RESOLVE_DEBUG_ENTRY(_debug < 0);
if ((flags & JSRESOLVE_ASSIGNING)
|| (ptr == NULL)) { /* don't resolve to parent prototypes objects. */
@@ -610,7 +610,7 @@
#endif
/* XXX VG: JS_Enumerate (jsobj.c:4211) doesn't initialize some fields. */
-_ENUMERATE_DEBUG_ENTRY(_debug < 0);
+//_ENUMERATE_DEBUG_ENTRY(_debug < 0);
#ifdef NOTYET
switch (op) {
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmiob-js.c
============================================================================
$ cvs diff -u -r1.4.4.7 -r1.4.4.8 rpmiob-js.c
--- rpm/js/rpmiob-js.c 11 Jul 2017 11:13:12 -0000 1.4.4.7
+++ rpm/js/rpmiob-js.c 12 Jul 2017 22:06:15 -0000 1.4.4.8
@@ -102,7 +102,7 @@
{
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmiobClass, nullptr);
-_RESOLVE_DEBUG_ENTRY(_debug < 0);
+//_RESOLVE_DEBUG_ENTRY(_debug < 0);
if ((flags & JSRESOLVE_ASSIGNING)
|| (ptr == NULL)) { /* don't resolve to parent prototypes objects. */
@@ -121,7 +121,7 @@
jsval *statep, jsid *idp)
{
-_ENUMERATE_DEBUG_ENTRY(_debug < 0);
+//_ENUMERATE_DEBUG_ENTRY(_debug < 0);
switch (op) {
case JSENUMERATE_INIT:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmmc-js.c
============================================================================
$ cvs diff -u -r1.12.4.10 -r1.12.4.11 rpmmc-js.c
--- rpm/js/rpmmc-js.c 11 Jul 2017 11:55:37 -0000 1.12.4.10
+++ rpm/js/rpmmc-js.c 12 Jul 2017 22:06:15 -0000 1.12.4.11
@@ -35,7 +35,7 @@
int lvl = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (!(ok = JS_ConvertArguments(cx, args, "s", &s)))
goto exit;
@@ -57,7 +57,7 @@
char * s = NULL;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (!(ok = JS_ConvertArguments(cx, args, "s", &s)))
goto exit;
@@ -82,7 +82,7 @@
int ac = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
/*@-globs@*/
ac = rpmGetMacroEntries(mc, _mire, used, &av);
@@ -119,7 +119,7 @@
JSString *valstr;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (!(ok = JS_ConvertArguments(cx, args, "s", &s)))
goto exit;
@@ -203,7 +203,7 @@
{
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmcClass, nullptr);
-_RESOLVE_DEBUG_ENTRY(_debug < 0);
+//_RESOLVE_DEBUG_ENTRY(_debug < 0);
if ((flags & JSRESOLVE_ASSIGNING)
|| (ptr == NULL)) { /* don't resolve to parent prototypes objects. */
@@ -222,7 +222,7 @@
jsval *statep, jsid *idp)
{
-_ENUMERATE_DEBUG_ENTRY(_debug < 0);
+//_ENUMERATE_DEBUG_ENTRY(_debug < 0);
switch (op) {
case JSENUMERATE_INIT:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmmg-js.c
============================================================================
$ cvs diff -u -r1.4.4.8 -r1.4.4.9 rpmmg-js.c
--- rpm/js/rpmmg-js.c 11 Jul 2017 11:13:12 -0000 1.4.4.8
+++ rpm/js/rpmmg-js.c 12 Jul 2017 22:06:15 -0000 1.4.4.9
@@ -60,7 +60,7 @@
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmgClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
-_PROP_DEBUG_ENTRY(_debug < 0);
+//_PROP_DEBUG_ENTRY(_debug < 0);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
if (ptr == NULL)
@@ -81,7 +81,7 @@
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmgClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
-_PROP_DEBUG_ENTRY(_debug < 0);
+//_PROP_DEBUG_ENTRY(_debug < 0);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
if (ptr == NULL)
@@ -105,7 +105,7 @@
{
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmgClass, nullptr);
-_RESOLVE_DEBUG_ENTRY(_debug < 0);
+//_RESOLVE_DEBUG_ENTRY(_debug < 0);
if ((flags & JSRESOLVE_ASSIGNING)
|| (ptr == NULL)) { /* don't resolve to parent prototypes objects. */
@@ -130,7 +130,7 @@
unsigned int ix = 0;
#endif
-_ENUMERATE_DEBUG_ENTRY(_debug < 0);
+//_ENUMERATE_DEBUG_ENTRY(_debug < 0);
#ifdef NOTYET
switch (op) {
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmmi-js.c
============================================================================
$ cvs diff -u -r1.28.4.9 -r1.28.4.10 rpmmi-js.c
--- rpm/js/rpmmi-js.c 11 Jul 2017 11:13:12 -0000 1.28.4.9
+++ rpm/js/rpmmi-js.c 12 Jul 2017 22:06:15 -0000 1.28.4.10
@@ -37,7 +37,7 @@
char * pattern = NULL;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (!(ok = JS_ConvertArguments(cx, args, "vs/u", &tagid, &pattern,
&type)))
goto exit;
@@ -79,7 +79,7 @@
uint32_t _u = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (!(ok = JS_ConvertArguments(cx, args, "u", &_u)))
goto exit;
@@ -102,7 +102,7 @@
uint32_t _u = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (!(ok = JS_ConvertArguments(cx, args, "u", &_u)))
goto exit;
@@ -125,7 +125,7 @@
const char * _bn = NULL;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (!(ok = JS_ConvertArguments(cx, args, "s", &_bn)))
goto exit;
@@ -169,7 +169,7 @@
rpmmi mi = (rpmmi) ptr;
jsint tiny = JSVAL_TO_INT(id);
-_PROP_DEBUG_ENTRY(_debug < 0);
+//_PROP_DEBUG_ENTRY(_debug < 0);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
if (ptr == NULL)
@@ -232,7 +232,7 @@
JSObject *o = (JSVAL_IS_OBJECT(id) ? JSVAL_TO_OBJECT(id) : NULL);
JSClass *c = (o ? JS_GET_CLASS(cx, o) : NULL);
-_RESOLVE_DEBUG_ENTRY(_debug);
+//_RESOLVE_DEBUG_ENTRY(_debug);
if ((flags & JSRESOLVE_ASSIGNING)
|| (mi == NULL)) { /* don't resolve to parent prototypes objects.
*/
@@ -267,7 +267,7 @@
rpmmi mi = (rpmmi) ptr;
Header h;
-_ENUMERATE_DEBUG_ENTRY(_debug);
+//_ENUMERATE_DEBUG_ENTRY(_debug);
switch (op) {
case JSENUMERATE_INIT:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmmpf-js.c
============================================================================
$ cvs diff -u -r1.7.4.10 -r1.7.4.11 rpmmpf-js.c
--- rpm/js/rpmmpf-js.c 11 Jul 2017 11:55:37 -0000 1.7.4.10
+++ rpm/js/rpmmpf-js.c 12 Jul 2017 22:06:15 -0000 1.7.4.11
@@ -57,7 +57,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (mpf == NULL) goto exit;
args.rval().setBoolean(false);
@@ -91,7 +91,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (mpf == NULL) goto exit;
args.rval().setBoolean(false);
@@ -136,7 +136,7 @@
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (mpf == NULL) goto exit;
args.rval().setBoolean(false);
@@ -173,7 +173,7 @@
DB_CACHE_PRIORITY _priority = DB_PRIORITY_UNCHANGED;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (mpf == NULL) goto exit;
args.rval().setBoolean(false);
@@ -211,7 +211,7 @@
DB_MPOOLFILE * mpf = ptr;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (mpf == NULL) goto exit;
args.rval().setBoolean(false);
@@ -360,7 +360,7 @@
{
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpfClass, nullptr);
-_RESOLVE_DEBUG_ENTRY(_debug < 0);
+//_RESOLVE_DEBUG_ENTRY(_debug < 0);
if ((flags & JSRESOLVE_ASSIGNING)
|| (ptr == NULL)) { /* don't resolve to parent prototypes objects. */
@@ -379,7 +379,7 @@
jsval *statep, jsid *idp)
{
-_ENUMERATE_DEBUG_ENTRY(_debug < 0);
+//_ENUMERATE_DEBUG_ENTRY(_debug < 0);
switch (op) {
case JSENUMERATE_INIT:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmmpw-js.c
============================================================================
$ cvs diff -u -r1.21.4.11 -r1.21.4.12 rpmmpw-js.c
--- rpm/js/rpmmpw-js.c 11 Jul 2017 11:55:37 -0000 1.21.4.11
+++ rpm/js/rpmmpw-js.c 12 Jul 2017 22:06:15 -0000 1.21.4.12
@@ -1795,7 +1795,7 @@
jsuint _base = 10;
bool ok;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if ((ok = JS_ConvertArguments(cx, args, "/u", &_base))) {
/* XXX FIXME check _base is 0 or [2,36] */
*vp = mpw_format(cx, ptr, _base, 0);
@@ -1815,7 +1815,7 @@
jsuint _base = 10;
bool ok = true;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
*vp = mpw_format(cx, ptr, _base, 0);
return ok;
}
@@ -1834,7 +1834,7 @@
jsuint _trials = mpptrials(MP_WORDS_TO_BITS(zsize));
bool ok = true;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (z == NULL || zsize == 0 || zdata == NULL
|| (ok = JS_ConvertArguments(cx, args, "/u", &_trials)))
{
@@ -1869,7 +1869,7 @@
mpwObject * q = ptr;
bool ok = true;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (q) {
/* XXX select "FIPS 186" or "Mersenne Twister" */
const randomGenerator* rng = randomGeneratorDefault();
@@ -1903,7 +1903,7 @@
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, nullptr);
bool ok = true;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (argc == 2) {
mpwObject * x = mpw_j2mpw(cx, args[0]);
mpwObject * y = mpw_j2mpw(cx, args[1]);
@@ -1937,7 +1937,7 @@
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, nullptr);
bool ok = true;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (argc == 2) {
mpwObject * x = mpw_j2mpw(cx, args[0]);
mpwObject * y = mpw_j2mpw(cx, args[1]);
@@ -1981,7 +1981,7 @@
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, nullptr);
bool ok = true;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (argc == 2) {
mpwObject * x = mpw_j2mpw(cx, args[0]);
mpwObject * y = mpw_j2mpw(cx, args[1]);
@@ -2025,7 +2025,7 @@
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, nullptr);
bool ok = true;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
/* XXX generalize to N values? */
if (argc == 2) {
mpwObject * x = mpw_j2mpw(cx, args[0]);
@@ -2061,7 +2061,7 @@
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, nullptr);
bool ok = true;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
/* XXX generalize to N values? */
if (argc == 2) {
mpwObject * x = mpw_j2mpw(cx, args[0]);
@@ -2098,7 +2098,7 @@
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, nullptr);
bool ok;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
assert(argc == 2);
ok = mpw_wrap(cx, vp,
mpw_ops2('R', mpw_j2mpw(cx, args[0]), mpw_j2mpw(cx, args[1])));
@@ -2188,7 +2188,7 @@
{
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmmpwClass, nullptr);
-_RESOLVE_DEBUG_ENTRY(_debug < 0);
+//_RESOLVE_DEBUG_ENTRY(_debug < 0);
if ((flags & JSRESOLVE_ASSIGNING)
|| (ptr == NULL)) { /* don't resolve to parent prototypes objects. */
@@ -2207,7 +2207,7 @@
jsval *statep, jsid *idp)
{
-_ENUMERATE_DEBUG_ENTRY(_debug < 0);
+//_ENUMERATE_DEBUG_ENTRY(_debug < 0);
switch (op) {
case JSENUMERATE_INIT:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmps-js.c
============================================================================
$ cvs diff -u -r1.18.4.9 -r1.18.4.10 rpmps-js.c
--- rpm/js/rpmps-js.c 11 Jul 2017 11:13:12 -0000 1.18.4.9
+++ rpm/js/rpmps-js.c 12 Jul 2017 22:06:15 -0000 1.18.4.10
@@ -38,7 +38,7 @@
uint32 ui;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (!(ok = JS_ConvertArguments(cx, args, "ssoissu",
&pkgNEVR, &altNEVR, &o, &type, &dn, &bn, &ui)))
@@ -59,7 +59,7 @@
rpmps ps = (rpmps) ptr;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
rpmpsPrint(NULL, ps);
@@ -139,7 +139,7 @@
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmpsClass, nullptr);
rpmps ps = (rpmps) ptr;
-_RESOLVE_DEBUG_ENTRY(_debug);
+//_RESOLVE_DEBUG_ENTRY(_debug);
if ((flags & JSRESOLVE_ASSIGNING)
|| (ps == NULL)) { /* don't resolve to parent prototypes objects.
*/
@@ -158,7 +158,7 @@
jsval *statep, jsid *idp)
{
-_ENUMERATE_DEBUG_ENTRY(_debug);
+//_ENUMERATE_DEBUG_ENTRY(_debug);
#ifdef DYING
switch (op) {
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmseq-js.c
============================================================================
$ cvs diff -u -r1.7.4.10 -r1.7.4.11 rpmseq-js.c
--- rpm/js/rpmseq-js.c 11 Jul 2017 11:55:37 -0000 1.7.4.10
+++ rpm/js/rpmseq-js.c 12 Jul 2017 22:06:15 -0000 1.7.4.11
@@ -53,7 +53,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (seq == NULL) goto exit;
args.rval().setBoolean(false);
@@ -88,7 +88,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (seq == NULL) goto exit;
args.rval().setBoolean(false);
@@ -137,7 +137,7 @@
uint32_t _flags = DB_CREATE;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (seq == NULL) goto exit;
args.rval().setBoolean(false);
@@ -181,7 +181,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (seq == NULL) goto exit;
args.rval().setBoolean(false);
@@ -222,7 +222,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (seq == NULL) goto exit;
args.rval().setBoolean(false);
@@ -255,7 +255,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (seq == NULL) goto exit;
args.rval().setBoolean(false);
@@ -522,7 +522,7 @@
{
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmseqClass, nullptr);
-_RESOLVE_DEBUG_ENTRY(_debug < 0);
+//_RESOLVE_DEBUG_ENTRY(_debug < 0);
if ((flags & JSRESOLVE_ASSIGNING)
|| (ptr == NULL)) { /* don't resolve to parent prototypes objects. */
@@ -541,7 +541,7 @@
jsval *statep, jsid *idp)
{
-_ENUMERATE_DEBUG_ENTRY(_debug < 0);
+//_ENUMERATE_DEBUG_ENTRY(_debug < 0);
switch (op) {
case JSENUMERATE_INIT:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmsm-js.c
============================================================================
$ cvs diff -u -r1.8.4.9 -r1.8.4.10 rpmsm-js.c
--- rpm/js/rpmsm-js.c 11 Jul 2017 11:50:41 -0000 1.8.4.9
+++ rpm/js/rpmsm-js.c 12 Jul 2017 22:06:15 -0000 1.8.4.10
@@ -128,7 +128,7 @@
{
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsmClass, nullptr);
-_RESOLVE_DEBUG_ENTRY(_debug < 0);
+//_RESOLVE_DEBUG_ENTRY(_debug < 0);
if ((flags & JSRESOLVE_ASSIGNING)
|| (ptr == NULL)) { /* don't resolve to parent prototypes objects. */
@@ -147,7 +147,7 @@
jsval *statep, jsid *idp)
{
-_ENUMERATE_DEBUG_ENTRY(_debug < 0);
+//_ENUMERATE_DEBUG_ENTRY(_debug < 0);
switch (op) {
case JSENUMERATE_INIT:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmsp-js.c
============================================================================
$ cvs diff -u -r1.4.4.8 -r1.4.4.9 rpmsp-js.c
--- rpm/js/rpmsp-js.c 11 Jul 2017 11:13:12 -0000 1.4.4.8
+++ rpm/js/rpmsp-js.c 12 Jul 2017 22:06:15 -0000 1.4.4.9
@@ -116,7 +116,7 @@
{
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmspClass, nullptr);
-_RESOLVE_DEBUG_ENTRY(_debug < 0);
+//_RESOLVE_DEBUG_ENTRY(_debug < 0);
if ((flags & JSRESOLVE_ASSIGNING)
|| (ptr == NULL)) { /* don't resolve to parent prototypes objects. */
@@ -135,7 +135,7 @@
jsval *statep, jsid *idp)
{
-_ENUMERATE_DEBUG_ENTRY(_debug < 0);
+//_ENUMERATE_DEBUG_ENTRY(_debug < 0);
switch (op) {
case JSENUMERATE_INIT:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmst-js.c
============================================================================
$ cvs diff -u -r1.10.4.7 -r1.10.4.8 rpmst-js.c
--- rpm/js/rpmst-js.c 11 Jul 2017 11:13:12 -0000 1.10.4.7
+++ rpm/js/rpmst-js.c 12 Jul 2017 22:06:15 -0000 1.10.4.8
@@ -87,7 +87,7 @@
jsint tiny = JSVAL_TO_INT(id);
time_t mytime = (time_t)0xffffffff;
-_PROP_DEBUG_ENTRY(_debug < 0);
+//_PROP_DEBUG_ENTRY(_debug < 0);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
if (ptr == NULL)
@@ -132,7 +132,7 @@
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmstClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
-_PROP_DEBUG_ENTRY(_debug < 0);
+//_PROP_DEBUG_ENTRY(_debug < 0);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
if (ptr == NULL)
@@ -156,7 +156,7 @@
{
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmstClass, nullptr);
-_RESOLVE_DEBUG_ENTRY(_debug < 0);
+//_RESOLVE_DEBUG_ENTRY(_debug < 0);
if ((flags & JSRESOLVE_ASSIGNING)
|| (ptr == NULL)) { /* don't resolve to parent prototypes objects. */
@@ -177,7 +177,7 @@
JSObject * iter;
bool ok = false;
-_ENUMERATE_DEBUG_ENTRY(_debug < 0);
+//_ENUMERATE_DEBUG_ENTRY(_debug < 0);
switch (op) {
case JSENUMERATE_INIT:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmsw-js.c
============================================================================
$ cvs diff -u -r1.4.4.7 -r1.4.4.8 rpmsw-js.c
--- rpm/js/rpmsw-js.c 11 Jul 2017 11:13:12 -0000 1.4.4.7
+++ rpm/js/rpmsw-js.c 12 Jul 2017 22:06:15 -0000 1.4.4.8
@@ -106,7 +106,7 @@
{
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmswClass, nullptr);
-_RESOLVE_DEBUG_ENTRY(_debug < 0);
+//_RESOLVE_DEBUG_ENTRY(_debug < 0);
if ((flags & JSRESOLVE_ASSIGNING)
|| (ptr == NULL)) { /* don't resolve to parent prototypes objects. */
@@ -125,7 +125,7 @@
jsval *statep, jsid *idp)
{
-_ENUMERATE_DEBUG_ENTRY(_debug < 0);
+//_ENUMERATE_DEBUG_ENTRY(_debug < 0);
switch (op) {
case JSENUMERATE_INIT:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmsx-js.c
============================================================================
$ cvs diff -u -r1.8.4.9 -r1.8.4.10 rpmsx-js.c
--- rpm/js/rpmsx-js.c 11 Jul 2017 11:13:12 -0000 1.8.4.9
+++ rpm/js/rpmsx-js.c 12 Jul 2017 22:06:15 -0000 1.8.4.10
@@ -272,7 +272,7 @@
{
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsxClass, nullptr);
-_RESOLVE_DEBUG_ENTRY(_debug < 0);
+//_RESOLVE_DEBUG_ENTRY(_debug < 0);
if ((flags & JSRESOLVE_ASSIGNING)
|| (ptr == NULL)) { /* don't resolve to parent prototypes objects. */
@@ -291,7 +291,7 @@
jsval *statep, jsid *idp)
{
-_ENUMERATE_DEBUG_ENTRY(_debug < 0);
+//_ENUMERATE_DEBUG_ENTRY(_debug < 0);
switch (op) {
case JSENUMERATE_INIT:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmsys-js.c
============================================================================
$ cvs diff -u -r1.8.4.10 -r1.8.4.11 rpmsys-js.c
--- rpm/js/rpmsys-js.c 11 Jul 2017 11:55:37 -0000 1.8.4.10
+++ rpm/js/rpmsys-js.c 12 Jul 2017 22:06:15 -0000 1.8.4.11
@@ -70,7 +70,7 @@
jsuint _mode = F_OK;
bool ok;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if ((ok = JS_ConvertArguments(cx, args, "s/u", &_path, &_mode))) {
mode_t mode = _mode;
*vp = (sys && !Access(_path, mode)
@@ -90,7 +90,7 @@
jsuint _mode = F_OK;
bool ok;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if ((ok = JS_ConvertArguments(cx, args, "su", &_path, &_mode))) {
mode_t mode = _mode;
*vp = (sys && !Chmod(_path, mode)
@@ -111,7 +111,7 @@
jsint _gid = -1;
bool ok;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if ((ok = JS_ConvertArguments(cx, args, "s/ii", &_path, &_uid, &_gid))) {
uid_t uid = _uid;
gid_t gid = _gid;
@@ -135,7 +135,7 @@
jsuint _mode = 0644;
bool ok;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if ((ok = JS_ConvertArguments(cx, args, "s/u", &_path, &_mode))) {
mode_t mode = _mode;
int flags = O_CREAT|O_WRONLY|O_TRUNC;
@@ -164,7 +164,7 @@
jsint _gid = -1;
bool ok;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if ((ok = JS_ConvertArguments(cx, args, "s/ii", &_path, &_uid, &_gid))) {
uid_t uid = _uid;
uid_t gid = _gid;
@@ -185,7 +185,7 @@
const char * _npath = NULL;
bool ok;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if ((ok = JS_ConvertArguments(cx, args, "ss", &_opath, &_npath))) {
*vp = (sys && !Link(_opath, _npath)
? JSVAL_ZERO : INT_TO_JSVAL(errno));
@@ -203,7 +203,7 @@
const char * _path = NULL;
bool ok;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if ((ok = JS_ConvertArguments(cx, args, "s", &_path))) {
struct stat sb;
if (sys && !Lstat(_path, &sb)) {
@@ -235,7 +235,7 @@
jsuint _mode = 0755;
bool ok;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if ((ok = JS_ConvertArguments(cx, args, "s/u", &_path, &_mode))) {
mode_t mode = _mode;
*vp = (sys && !Mkdir(_path, mode)
@@ -255,7 +255,7 @@
jsuint _mode = 0755;
bool ok;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if ((ok = JS_ConvertArguments(cx, args, "su", &_path, &_mode))) {
mode_t mode = _mode;
*vp = (sys && !Mkfifo(_path, mode)
@@ -276,7 +276,7 @@
jsuint _dev = 0;
bool ok;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if ((ok = JS_ConvertArguments(cx, args, "suu", &_path, &_mode, &_dev))) {
mode_t mode = _mode;
dev_t dev = _dev;
@@ -296,7 +296,7 @@
const char * _path = NULL;
bool ok;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if ((ok = JS_ConvertArguments(cx, args, "s", &_path))) {
char b[BUFSIZ];
size_t nb = sizeof(b);
@@ -324,7 +324,7 @@
const char * _npath = NULL;
bool ok;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if ((ok = JS_ConvertArguments(cx, args, "ss", &_opath, &_npath))) {
*vp = (sys && !Rename(_opath, _npath)
? JSVAL_ZERO : INT_TO_JSVAL(errno));
@@ -342,7 +342,7 @@
const char * _path = NULL;
bool ok;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if ((ok = JS_ConvertArguments(cx, args, "s", &_path))) {
*vp = (sys && !Rmdir(_path)
? JSVAL_ZERO : INT_TO_JSVAL(errno));
@@ -360,7 +360,7 @@
const char * _path = NULL;
bool ok;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if ((ok = JS_ConvertArguments(cx, args, "s", &_path))) {
struct stat sb;
if (sys && !Stat(_path, &sb)) {
@@ -392,7 +392,7 @@
const char * _npath = NULL;
bool ok;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if ((ok = JS_ConvertArguments(cx, args, "ss", &_opath, &_npath))) {
*vp = (sys && !Symlink(_opath, _npath)
? JSVAL_ZERO : INT_TO_JSVAL(errno));
@@ -410,7 +410,7 @@
const char * _path = NULL;
bool ok;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if ((ok = JS_ConvertArguments(cx, args, "s", &_path))) {
*vp = (sys && !Unlink(_path)
? JSVAL_ZERO : INT_TO_JSVAL(errno));
@@ -500,7 +500,7 @@
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
-_PROP_DEBUG_ENTRY(_debug < 0);
+//_PROP_DEBUG_ENTRY(_debug < 0);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
if (ptr == NULL)
@@ -604,7 +604,7 @@
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, nullptr);
jsint tiny = JSVAL_TO_INT(id);
-_PROP_DEBUG_ENTRY(_debug < 0);
+//_PROP_DEBUG_ENTRY(_debug < 0);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
if (ptr == NULL)
@@ -628,7 +628,7 @@
{
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmsysClass, nullptr);
-_RESOLVE_DEBUG_ENTRY(_debug < 0);
+//_RESOLVE_DEBUG_ENTRY(_debug < 0);
if ((flags & JSRESOLVE_ASSIGNING)
|| (ptr == NULL)) { /* don't resolve to parent prototypes objects. */
@@ -652,7 +652,7 @@
#endif
/* XXX VG: JS_Enumerate (jsobj.c:4211) doesn't initialize some fields. */
-_ENUMERATE_DEBUG_ENTRY(_debug < 0);
+//_ENUMERATE_DEBUG_ENTRY(_debug < 0);
#ifdef NOTYET
switch (op) {
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmte-js.c
============================================================================
$ cvs diff -u -r1.19.4.10 -r1.19.4.11 rpmte-js.c
--- rpm/js/rpmte-js.c 11 Jul 2017 11:55:37 -0000 1.19.4.10
+++ rpm/js/rpmte-js.c 12 Jul 2017 22:06:15 -0000 1.19.4.11
@@ -45,7 +45,7 @@
rpmTag tagN = RPMTAG_NAME;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (!(ok = JS_ConvertArguments(cx, args, "/i", &tagN)))
goto exit;
@@ -77,7 +77,7 @@
rpmTag tagN = RPMTAG_BASENAMES;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (!(ok = JS_ConvertArguments(cx, args, "/i", &tagN)))
goto exit;
@@ -289,7 +289,7 @@
{
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmteClass, nullptr);
-_RESOLVE_DEBUG_ENTRY(_debug);
+//_RESOLVE_DEBUG_ENTRY(_debug);
if (flags & JSRESOLVE_ASSIGNING) {
*objp = NULL;
@@ -307,7 +307,7 @@
jsval *statep, jsid *idp)
{
-_ENUMERATE_DEBUG_ENTRY(_debug);
+//_ENUMERATE_DEBUG_ENTRY(_debug);
switch (op) {
case JSENUMERATE_INIT:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmts-js.c
============================================================================
$ cvs diff -u -r1.33.4.11 -r1.33.4.12 rpmts-js.c
--- rpm/js/rpmts-js.c 11 Jul 2017 11:55:37 -0000 1.33.4.11
+++ rpm/js/rpmts-js.c 12 Jul 2017 22:06:15 -0000 1.33.4.12
@@ -91,7 +91,7 @@
char * pkgN = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (!(ok = JS_ConvertArguments(cx, args, "s", &pkgN)))
goto exit;
@@ -132,7 +132,7 @@
rpmts ts = (rpmts) ptr;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (rpmtsNElements(ts) > 0)
(void) rpmcliInstallCheck(ts); /* XXX print ps for now */
@@ -151,7 +151,7 @@
rpmts ts = (rpmts) ptr;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (rpmtsNElements(ts) > 0)
(void) rpmcliInstallOrder(ts); /* XXX print ps for now */
@@ -170,7 +170,7 @@
rpmts ts = (rpmts) ptr;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
#ifdef NOTYET
/* XXX force --test instead. */
@@ -198,7 +198,7 @@
JSObject *mio;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (!(ok = JS_ConvertArguments(cx, args, "/vv", &tagid, &kv)))
goto exit;
@@ -231,7 +231,7 @@
rpmts ts = (rpmts) ptr;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
/* XXX rebuild requires root. */
if (ts && !getuid())
@@ -259,7 +259,7 @@
bool ok = false;
int xx;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (!(ok = JS_ConvertArguments(cx, args, "/vvu", &v, &tagid, &v,
&_mode)))
goto exit;
@@ -392,7 +392,7 @@
rpmts ts = (rpmts) ptr;
jsint tiny = JSVAL_TO_INT(id);
-_PROP_DEBUG_ENTRY(_debug < 0);
+//_PROP_DEBUG_ENTRY(_debug < 0);
/* XXX the class has ptr == NULL, instances have ptr != NULL. */
if (ptr == NULL)
@@ -578,7 +578,7 @@
bool ok = false;
int oc;
-_RESOLVE_DEBUG_ENTRY(_debug);
+//_RESOLVE_DEBUG_ENTRY(_debug);
if (flags & JSRESOLVE_ASSIGNING) {
ok = true;
@@ -638,7 +638,7 @@
JSObject *tsio = NULL;
bool ok = false;
-_ENUMERATE_DEBUG_ENTRY(_debug);
+//_ENUMERATE_DEBUG_ENTRY(_debug);
switch (op) {
case JSENUMERATE_INIT:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmtxn-js.c
============================================================================
$ cvs diff -u -r1.11.4.10 -r1.11.4.11 rpmtxn-js.c
--- rpm/js/rpmtxn-js.c 11 Jul 2017 11:55:37 -0000 1.11.4.10
+++ rpm/js/rpmtxn-js.c 12 Jul 2017 22:06:15 -0000 1.11.4.11
@@ -51,7 +51,7 @@
DB_TXN * txn = ptr;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (txn == NULL) goto exit;
args.rval().setBoolean(false);
@@ -81,7 +81,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (txn == NULL) goto exit;
args.rval().setBoolean(false);
@@ -114,7 +114,7 @@
uint32_t _flags = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (txn == NULL) goto exit;
args.rval().setBoolean(false);
@@ -148,7 +148,7 @@
const char * _s = NULL;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
if (txn == NULL) goto exit;
args.rval().setBoolean(false);
@@ -282,7 +282,7 @@
{
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmtxnClass, nullptr);
-_RESOLVE_DEBUG_ENTRY(_debug < 0);
+//_RESOLVE_DEBUG_ENTRY(_debug < 0);
if ((flags & JSRESOLVE_ASSIGNING)
|| (ptr == NULL)) { /* don't resolve to parent prototypes objects. */
@@ -301,7 +301,7 @@
jsval *statep, jsid *idp)
{
-_ENUMERATE_DEBUG_ENTRY(_debug < 0);
+//_ENUMERATE_DEBUG_ENTRY(_debug < 0);
switch (op) {
case JSENUMERATE_INIT:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmxar-js.c
============================================================================
$ cvs diff -u -r1.5.4.8 -r1.5.4.9 rpmxar-js.c
--- rpm/js/rpmxar-js.c 11 Jul 2017 11:13:12 -0000 1.5.4.8
+++ rpm/js/rpmxar-js.c 12 Jul 2017 22:06:15 -0000 1.5.4.9
@@ -105,7 +105,7 @@
{
void * ptr = JS_GetInstancePrivate(cx, obj, &rpmxarClass, nullptr);
-_RESOLVE_DEBUG_ENTRY(_debug < 0);
+//_RESOLVE_DEBUG_ENTRY(_debug < 0);
if ((flags & JSRESOLVE_ASSIGNING)
|| (ptr == NULL)) { /* don't resolve to parent prototypes objects. */
@@ -127,7 +127,7 @@
rpmxar xar = (rpmxar) ptr;
int ix = 0;
-_ENUMERATE_DEBUG_ENTRY(_debug < 0);
+//_ENUMERATE_DEBUG_ENTRY(_debug < 0);
switch (op) {
case JSENUMERATE_INIT:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/syck-js.c
============================================================================
$ cvs diff -u -r1.9.4.8 -r1.9.4.9 syck-js.c
--- rpm/js/syck-js.c 11 Jul 2017 11:13:12 -0000 1.9.4.8
+++ rpm/js/syck-js.c 12 Jul 2017 22:06:15 -0000 1.9.4.9
@@ -398,7 +398,7 @@
{
void * ptr = JS_GetInstancePrivate(cx, obj, &syckClass, nullptr);
-_RESOLVE_DEBUG_ENTRY(_debug);
+//_RESOLVE_DEBUG_ENTRY(_debug);
return true;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/uuid-js.c
============================================================================
$ cvs diff -u -r1.18.4.8 -r1.18.4.9 uuid-js.c
--- rpm/js/uuid-js.c 11 Jul 2017 11:13:12 -0000 1.18.4.8
+++ rpm/js/uuid-js.c 12 Jul 2017 22:06:15 -0000 1.18.4.9
@@ -54,7 +54,7 @@
size_t blen = sizeof(buf);
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
ok = JS_ConvertArguments(cx, args, "i/ss",
&version, &uuid_ns_str, &data);
@@ -119,7 +119,7 @@
size_t blen = 0;
bool ok = false;
-_METHOD_DEBUG_ENTRY(_debug);
+//_METHOD_DEBUG_ENTRY(_debug);
ok = JS_ConvertArguments(cx, args, "s", &uuid_str);
if (!ok)
@@ -219,7 +219,7 @@
{
void * ptr = JS_GetInstancePrivate(cx, obj, &uuidClass, nullptr);
-_RESOLVE_DEBUG_ENTRY(_debug);
+//_RESOLVE_DEBUG_ENTRY(_debug);
if ((flags & JSRESOLVE_ASSIGNING)
|| (ptr == NULL)) { /* don't resolve to parent prototypes objects. */
@@ -240,7 +240,7 @@
JSObject *iterator;
bool ok = false;
-_ENUMERATE_DEBUG_ENTRY(_debug);
+//_ENUMERATE_DEBUG_ENTRY(_debug);
switch (op) {
case JSENUMERATE_INIT:
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
