RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 12-Dec-2007 22:55:26
Branch: HEAD Handle: 2007121221552500
Modified files:
rpm CHANGES
rpm/rpmdb header.c
Log:
- another attempt to identify the RPM_I18NSTRING_TYPE flaw.
Summary:
Revision Changes Path
1.1979 +1 -0 rpm/CHANGES
1.144 +1 -11 rpm/rpmdb/header.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1978 -r1.1979 CHANGES
--- rpm/CHANGES 12 Dec 2007 20:01:24 -0000 1.1978
+++ rpm/CHANGES 12 Dec 2007 21:55:25 -0000 1.1979
@@ -1,4 +1,5 @@
5.0b1 -> 5.0b2:
+ - jbj: another attempt to identify the RPM_I18NSTRING_TYPE flaw.
- jbj: attempt to measure performance improvement using binary tag
search.
- jbj: trade an I18NSTRING assert failure for a memory leak for the
moment.
- jbj: push rpm2cpio w-i-p into cvs, try to measure linear <-> bsearch
win.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/header.c
============================================================================
$ cvs diff -u -r1.143 -r1.144 header.c
--- rpm/rpmdb/header.c 12 Dec 2007 20:01:24 -0000 1.143
+++ rpm/rpmdb/header.c 12 Dec 2007 21:55:25 -0000 1.144
@@ -1893,23 +1893,13 @@
case RPM_UINT64_TYPE:
nb = he->c * sizeof(*he->p.ui64p);
break;
- case RPM_I18NSTRING_TYPE:
-#if HACK_AROUND
-assert(he->c == 1); /* XXX stop unimplemented oversights. */
-#else
- if (he->c > 1) {
- he->t = RPM_STRING_TYPE;
- he->p.str = he->p.argv[0];
- he->c = 1;
- }
-#endif
- /[EMAIL PROTECTED]@*/
case RPM_STRING_TYPE:
if (he->p.str)
nb = strlen(he->p.str) + 1;
else
rc = 0;
break;
+ case RPM_I18NSTRING_TYPE:
case RPM_STRING_ARRAY_TYPE:
break;
}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
