[prev in list] [next in list] [prev in thread] [next in thread]
List: rpm-cvs
Subject: [CVS] RPM: rpm/js/ Makefile.am rpmfi-js.c rpmhdr-js.c rpmmi-js.c rpmps...
From: "Jeff Johnson" <jbj () rpm5 ! org>
Date: 2009-04-27 1:01:15
Message-ID: 20090427010115.B701053E4 () rpm5 ! org
[Download RAW message or body]
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: jbj@rpm5.org
Module: rpm Date: 27-Apr-2009 03:01:15
Branch: HEAD Handle: 2009042701011401
Modified files:
rpm/js Makefile.am rpmfi-js.c rpmhdr-js.c rpmmi-js.c
rpmps-js.c rpmte-js.c rpmts-js.c tjs.c uuid-js.c
rpm/js/tscripts Ds.js Fi.js File.js Hdr.js Mi.js Ps.js Te.js Ts.js
Uuid.js
Log:
- js: reduce tjs spewage to minimum by setting _debug = 0 everywhere.
Summary:
Revision Changes Path
1.11 +2 -2 rpm/js/Makefile.am
1.6 +1 -1 rpm/js/rpmfi-js.c
1.6 +1 -1 rpm/js/rpmhdr-js.c
1.8 +1 -3 rpm/js/rpmmi-js.c
1.5 +1 -1 rpm/js/rpmps-js.c
1.5 +1 -1 rpm/js/rpmte-js.c
1.12 +1 -1 rpm/js/rpmts-js.c
1.16 +6 -11 rpm/js/tjs.c
1.3 +1 -1 rpm/js/tscripts/Ds.js
1.2 +2 -2 rpm/js/tscripts/Fi.js
1.2 +3 -2 rpm/js/tscripts/File.js
1.2 +1 -1 rpm/js/tscripts/Hdr.js
1.2 +1 -1 rpm/js/tscripts/Mi.js
1.2 +1 -1 rpm/js/tscripts/Ps.js
1.2 +1 -1 rpm/js/tscripts/Te.js
1.3 +2 -2 rpm/js/tscripts/Ts.js
1.2 +1 -1 rpm/js/tscripts/Uuid.js
1.7 +1 -1 rpm/js/uuid-js.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/js/Makefile.am
============================================================================
$ cvs diff -u -r1.10 -r1.11 Makefile.am
--- rpm/js/Makefile.am 24 Apr 2009 13:51:48 -0000 1.10
+++ rpm/js/Makefile.am 27 Apr 2009 01:01:14 -0000 1.11
@@ -60,13 +60,13 @@
rpmjsfile.h \
rpmds-js.h rpmfi-js.h rpmhdr-js.h rpmmi-js.h rpmps-js.h \
rpmte-js.h rpmts-js.h \
- uuid-js.h # syck-js.h
+ syck-js.h uuid-js.h
rpmjsm_la_SOURCES = \
rpmjsfile.c \
rpmds-js.c rpmfi-js.c rpmhdr-js.c rpmmi-js.c rpmps-js.c \
rpmte-js.c rpmts-js.c \
- uuid-js.c # syck-js.c
+ syck-js.c uuid-js.c
.PHONY: lint
lint:
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmfi-js.c
============================================================================
$ cvs diff -u -r1.5 -r1.6 rpmfi-js.c
--- rpm/js/rpmfi-js.c 26 Apr 2009 16:11:32 -0000 1.5
+++ rpm/js/rpmfi-js.c 27 Apr 2009 01:01:14 -0000 1.6
@@ -18,7 +18,7 @@
#include "debug.h"
/*@unchecked@*/
-static int _debug = 1;
+static int _debug = 0;
/* --- helpers */
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmhdr-js.c
============================================================================
$ cvs diff -u -r1.5 -r1.6 rpmhdr-js.c
--- rpm/js/rpmhdr-js.c 26 Apr 2009 16:11:32 -0000 1.5
+++ rpm/js/rpmhdr-js.c 27 Apr 2009 01:01:14 -0000 1.6
@@ -10,7 +10,7 @@
#include "debug.h"
/*@unchecked@*/
-static int _debug = 1;
+static int _debug = 0;
/* --- helpers */
static JSObject *
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmmi-js.c
============================================================================
$ cvs diff -u -r1.7 -r1.8 rpmmi-js.c
--- rpm/js/rpmmi-js.c 26 Apr 2009 16:11:32 -0000 1.7
+++ rpm/js/rpmmi-js.c 27 Apr 2009 01:01:14 -0000 1.8
@@ -15,7 +15,7 @@
#include "debug.h"
/*@unchecked@*/
-static int _debug = 1;
+static int _debug = 0;
/* --- helpers */
@@ -214,8 +214,6 @@
if (!(ok = JS_ConvertArguments(cx, argc, argv, "o", &tso)))
goto exit;
-fprintf(stderr, "\ttso %p ptr %p\n", tso, JS_GetPrivate(cx, tso));
-
if (cx->fp->flags & JSFRAME_CONSTRUCTING) {
rpmts ts = JS_GetInstancePrivate(cx, tso, &rpmtsClass, NULL);
rpmTag tag = RPMDBI_PACKAGES;
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmps-js.c
============================================================================
$ cvs diff -u -r1.4 -r1.5 rpmps-js.c
--- rpm/js/rpmps-js.c 26 Apr 2009 16:11:32 -0000 1.4
+++ rpm/js/rpmps-js.c 27 Apr 2009 01:01:14 -0000 1.5
@@ -13,7 +13,7 @@
#include "debug.h"
/*@unchecked@*/
-static int _debug = 1;
+static int _debug = 0;
/* --- helpers */
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmte-js.c
============================================================================
$ cvs diff -u -r1.4 -r1.5 rpmte-js.c
--- rpm/js/rpmte-js.c 26 Apr 2009 16:11:32 -0000 1.4
+++ rpm/js/rpmte-js.c 27 Apr 2009 01:01:14 -0000 1.5
@@ -22,7 +22,7 @@
#include "debug.h"
/*@unchecked@*/
-static int _debug = 1;
+static int _debug = 0;
/* --- helpers */
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmts-js.c
============================================================================
$ cvs diff -u -r1.11 -r1.12 rpmts-js.c
--- rpm/js/rpmts-js.c 26 Apr 2009 20:21:41 -0000 1.11
+++ rpm/js/rpmts-js.c 27 Apr 2009 01:01:14 -0000 1.12
@@ -19,7 +19,7 @@
#include "debug.h"
/*@unchecked@*/
-static int _debug = 1;
+static int _debug = 0;
/* --- helpers */
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/tjs.c
============================================================================
$ cvs diff -u -r1.15 -r1.16 tjs.c
--- rpm/js/tjs.c 26 Apr 2009 23:48:56 -0000 1.15
+++ rpm/js/tjs.c 27 Apr 2009 01:01:14 -0000 1.16
@@ -22,7 +22,7 @@
#include "debug.h"
/*@unchecked@*/
-static int _debug = 1;
+static int _debug = 0;
/*@unchecked@*/
static int _test = 1;
@@ -42,10 +42,8 @@
{ "Hdr", rpmjs_InitHdrClass, 12 },
{ "Mi", rpmjs_InitMiClass, 11 },
{ "Ps", rpmjs_InitPsClass, 16 },
-#ifdef NOTYET
- { "Syck", rpmjs_InitSyckClass, 0 },
-#endif
- { "Te", rpmjs_InitTeClass, 15 },
+ { "Syck", rpmjs_InitSyckClass, 3 },
+ { "Te", rpmjs_InitTeClass, -15 },
{ "Ts", rpmjs_InitTsClass, 10 },
{ "Uuid", rpmjs_InitUuidClass, 2 },
};
@@ -60,7 +58,7 @@
static const char * _acknack = "\
function ack(cmd, expected) {\n\
actual = eval(cmd);\n\
- if (actual != expected)\n\
+ if (actual != expected && expected != undefined)\n\
print(\"NACK: eval(\"+cmd+\") got '\"+actual+\"' not '\"+expected+\"'\");\n\
}\n\
function nack(cmd, expected) {\n\
@@ -81,7 +79,7 @@
pre = "";
str = rpmExpand(pre, "load(\"", fn, "\");", NULL);
if (_debug)
-fprintf(stderr, "\trunning:\n%s\n", str);
+fprintf(stderr, "\trunning:%s%s\n", (*pre ? "\n" : " "), str);
result = NULL;
ret = rpmjsRun(NULL, str, &result);
if (result != NULL && *result != '\0')
@@ -111,8 +109,6 @@
for (i = 0, tbl = classTable; i < nclassTable; i++, tbl++) {
if (tbl->ix <= 0)
continue;
-if (_debug < 0)
-fprintf(stderr, "==> order[%2d] = %2d %s\n", (tbl->ix & (norder -1)), i, tbl->name);
order[tbl->ix & (norder - 1)] = i + 1;
}
@@ -124,8 +120,6 @@
continue;
ix = order[i] - 1;
tbl = &classTable[ix];
-if (_debug < 0)
-fprintf(stderr, "<== order[%2d] = %2d %s\n", i, ix, tbl->name);
if (tbl->init != NULL)
(void) (*tbl->init) (js->cx, js->glob);
fn = rpmGetPath(tscripts, "/", tbl->name, ".js", NULL);
@@ -180,6 +174,7 @@
rc = 0;
exit:
+_rpmjs_debug = 0;
optCon = rpmcliFini(optCon);
return rc;
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/tscripts/Ds.js
============================================================================
$ cvs diff -u -r1.2 -r1.3 Ds.js
--- rpm/js/tscripts/Ds.js 26 Apr 2009 23:48:56 -0000 1.2
+++ rpm/js/tscripts/Ds.js 27 Apr 2009 01:01:15 -0000 1.3
@@ -1,8 +1,8 @@
var ds = new Ds('rpmlib');
ack("typeof ds;", "object");
ack("ds instanceof Ds;", true);
-ack("ds.debug = 0;", 0);
ack("ds.debug = 1;", 1);
+ack("ds.debug = 0;", 0);
ack("ds.length", 22);
ack("ds.type", "Provides");
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/tscripts/Fi.js
============================================================================
$ cvs diff -u -r1.1 -r1.2 Fi.js
--- rpm/js/tscripts/Fi.js 26 Apr 2009 23:48:56 -0000 1.1
+++ rpm/js/tscripts/Fi.js 27 Apr 2009 01:01:15 -0000 1.2
@@ -1,5 +1,5 @@
-var fi = new Fi();
+var fi = new Fi(h);
ack("typeof fi;", "object");
ack("fi instanceof Fi;", true);
-ack("fi.debug = 0;", 0);
ack("fi.debug = 1;", 1);
+ack("fi.debug = 0;", 0);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/tscripts/File.js
============================================================================
$ cvs diff -u -r1.1 -r1.2 File.js
--- rpm/js/tscripts/File.js 26 Apr 2009 23:48:56 -0000 1.1
+++ rpm/js/tscripts/File.js 27 Apr 2009 01:01:15 -0000 1.2
@@ -1,13 +1,14 @@
var dn = "/tmp";
var bn = "xyzzy";
var fn = dn+"/"+bn;
+
var f = new File(fn);
ack("typeof f", "object");
ack("f instanceof File;", true);
ack("f.path", fn);
ack("f.isOpen", false);
-ack("File.currentDir", "unknown");
+ack("File.currentDir", undefined);
ack("File.input", "Standard input stream");
ack("File.output", "Standard output stream");
ack("File.error", "Standard error stream");
@@ -29,7 +30,7 @@
ack("f.isFile", true);
ack("f.isNative", false);
ack("f.isOpen", true);
-ack("f.lastModified", "unknown");
+ack("f.lastModified", undefined);
ack("f.length", 15);
ack("f.mode", "read,write,readWrite,append,create");
ack("f.name", bn);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/tscripts/Hdr.js
============================================================================
$ cvs diff -u -r1.1 -r1.2 Hdr.js
--- rpm/js/tscripts/Hdr.js 26 Apr 2009 23:48:56 -0000 1.1
+++ rpm/js/tscripts/Hdr.js 27 Apr 2009 01:01:15 -0000 1.2
@@ -1,5 +1,5 @@
var h = mi.next()
ack("typeof h;", "object");
ack("h instanceof Hdr;", true);
-ack("h.debug = 0;", 0);
ack("h.debug = 1;", 1);
+ack("h.debug = 0;", 0);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/tscripts/Mi.js
============================================================================
$ cvs diff -u -r1.1 -r1.2 Mi.js
--- rpm/js/tscripts/Mi.js 26 Apr 2009 23:48:56 -0000 1.1
+++ rpm/js/tscripts/Mi.js 27 Apr 2009 01:01:15 -0000 1.2
@@ -1,5 +1,5 @@
var mi = new Mi(ts);
ack("typeof mi;", "object");
ack("mi instanceof Mi;", true);
-ack("mi.debug = 0;", 0);
ack("mi.debug = 1;", 1);
+ack("mi.debug = 0;", 0);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/tscripts/Ps.js
============================================================================
$ cvs diff -u -r1.1 -r1.2 Ps.js
--- rpm/js/tscripts/Ps.js 26 Apr 2009 23:48:56 -0000 1.1
+++ rpm/js/tscripts/Ps.js 27 Apr 2009 01:01:15 -0000 1.2
@@ -1,5 +1,5 @@
var ps = new Ps();
ack("typeof ps;", "object");
ack("ps instanceof Ps;", true);
-ack("ps.debug = 0;", 0);
ack("ps.debug = 1;", 1);
+ack("ps.debug = 0;", 0);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/tscripts/Te.js
============================================================================
$ cvs diff -u -r1.1 -r1.2 Te.js
--- rpm/js/tscripts/Te.js 26 Apr 2009 23:48:56 -0000 1.1
+++ rpm/js/tscripts/Te.js 27 Apr 2009 01:01:15 -0000 1.2
@@ -1,5 +1,5 @@
var te = new Te(ts,h)
ack("typeof te;", "object");
ack("te instanceof Te;", true);
-ack("te.debug = 0;", 0);
ack("te.debug = 1;", 1);
+ack("te.debug = 0;", 0);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/tscripts/Ts.js
============================================================================
$ cvs diff -u -r1.2 -r1.3 Ts.js
--- rpm/js/tscripts/Ts.js 26 Apr 2009 23:48:56 -0000 1.2
+++ rpm/js/tscripts/Ts.js 27 Apr 2009 01:01:15 -0000 1.3
@@ -1,8 +1,8 @@
var ts = new Ts();
ack("typeof ts;", "object");
ack("ts instanceof Ts;", true);
-ack("ts.debug = 0;", 0);
ack("ts.debug = 1;", 1);
+ack("ts.debug = 0;", 0);
var rootdir = "/path/to/rootdir";
ack("ts.rootdir = rootdir", rootdir);
@@ -12,4 +12,4 @@
ack("ts.vsflags = vsflags", vsflags);
ack("ts.vsflags = 0", 0);
-ack("ts.NVRA[37]", false);
+ack("ts.NVRA[37]", undefined);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/tscripts/Uuid.js
============================================================================
$ cvs diff -u -r1.1 -r1.2 Uuid.js
--- rpm/js/tscripts/Uuid.js 26 Apr 2009 23:48:56 -0000 1.1
+++ rpm/js/tscripts/Uuid.js 27 Apr 2009 01:01:15 -0000 1.2
@@ -1,5 +1,5 @@
var uuid = new Uuid();
ack("typeof uuid;", "object");
ack("uuid instanceof Uuid;", true);
-ack("uuid.debug = 0;", 0);
ack("uuid.debug = 1;", 1);
+ack("uuid.debug = 0;", 0);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/uuid-js.c
============================================================================
$ cvs diff -u -r1.6 -r1.7 uuid-js.c
--- rpm/js/uuid-js.c 26 Apr 2009 16:11:32 -0000 1.6
+++ rpm/js/uuid-js.c 27 Apr 2009 01:01:14 -0000 1.7
@@ -13,7 +13,7 @@
#include "debug.h"
/*@unchecked@*/
-static int _debug = 1;
+static int _debug = 0;
typedef struct uuid_s {
const char * ns_str;
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic