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: 31-Mar-2012 20:23:52
Branch: rpm-5_4 Handle: 2012033118234902
Modified files: (Branch: rpm-5_4)
rpm CHANGES system.h
rpm/lib libsql.c
rpm/python header-py.c rpmtd-py.c
rpm/rpmdb hdrNVR.c hdrfmt.c header.c rpmdb.c
Log:
- mark RPM_I18NSTRING_TYPE for elimination. todo++.
Summary:
Revision Changes Path
1.3501.2.236+1 -0 rpm/CHANGES
2.4.2.1 +3 -0 rpm/lib/libsql.c
1.110.4.7 +3 -0 rpm/python/header-py.c
1.3.6.2 +4 -1 rpm/python/rpmtd-py.c
1.46.6.1 +12 -3 rpm/rpmdb/hdrNVR.c
1.151.2.9 +8 -1 rpm/rpmdb/hdrfmt.c
1.198.2.3 +19 -1 rpm/rpmdb/header.c
1.392.2.10 +7 -1 rpm/rpmdb/rpmdb.c
2.129.2.1 +5 -0 rpm/system.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.235 -r1.3501.2.236 CHANGES
--- rpm/CHANGES 25 Mar 2012 18:54:29 -0000 1.3501.2.235
+++ rpm/CHANGES 31 Mar 2012 18:23:49 -0000 1.3501.2.236
@@ -1,4 +1,5 @@
5.4.7 -> 5.4.8:
+ - jbj: mark RPM_I18NSTRING_TYPE for elimination. todo++.
- jbj: set: stub-in a 1st attempt to do Alt version-set comparisons.
- jbj: set: make the version-set into an "rpmset" object.
- jbj: set: swipe the dependency set encoding from Alt.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/libsql.c
============================================================================
$ cvs diff -u -r2.4 -r2.4.2.1 libsql.c
--- rpm/lib/libsql.c 23 Jun 2010 16:14:53 -0000 2.4
+++ rpm/lib/libsql.c 31 Mar 2012 18:23:50 -0000 2.4.2.1
@@ -517,6 +517,9 @@
sqlite3_result_blob(pContext, he->p.ptr, he->c,
SQLITE_TRANSIENT);
break;
case RPM_I18NSTRING_TYPE:
+#if !defined(SUPPORT_I18NSTRING_TYPE)
+assert(0);
+#endif
case RPM_STRING_TYPE:
sqlite3_result_text(pContext, he->p.str, -1, SQLITE_TRANSIENT);
break;
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/header-py.c
============================================================================
$ cvs diff -u -r1.110.4.6 -r1.110.4.7 header-py.c
--- rpm/python/header-py.c 20 Feb 2012 13:42:01 -0000 1.110.4.6
+++ rpm/python/header-py.c 31 Mar 2012 18:23:51 -0000 1.110.4.7
@@ -180,6 +180,9 @@
if (he->tag == HEADER_I18NTABLE) continue;
switch (he->t) {
case RPM_I18NSTRING_TYPE:
+#if !defined(SUPPORT_I18NSTRING_TYPE)
+assert(0);
+#endif
break;
case RPM_BIN_TYPE:
case RPM_UINT64_TYPE:
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/rpmtd-py.c
============================================================================
$ cvs diff -u -r1.3.6.1 -r1.3.6.2 rpmtd-py.c
--- rpm/python/rpmtd-py.c 1 Feb 2012 13:06:25 -0000 1.3.6.1
+++ rpm/python/rpmtd-py.c 31 Mar 2012 18:23:51 -0000 1.3.6.2
@@ -67,8 +67,11 @@
char *str = NULL;
switch (rpmtdType(td)) {
- case RPM_STRING_TYPE:
case RPM_I18NSTRING_TYPE:
+#if !defined(SUPPORT_I18NSTRING_TYPE)
+assert(0);
+#endif
+ case RPM_STRING_TYPE:
case RPM_STRING_ARRAY_TYPE:
res = PyString_FromString(rpmtdGetString(td));
break;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/hdrNVR.c
============================================================================
$ cvs diff -u -r1.46 -r1.46.6.1 hdrNVR.c
--- rpm/rpmdb/hdrNVR.c 22 Dec 2008 15:46:45 -0000 1.46
+++ rpm/rpmdb/hdrNVR.c 31 Mar 2012 18:23:51 -0000 1.46.6.1
@@ -84,8 +84,11 @@
case RPM_STRING_TYPE:
val = he->p.str;
/*@switchbreak@*/ break;
- case RPM_STRING_ARRAY_TYPE:
case RPM_I18NSTRING_TYPE:
+#if !defined(SUPPORT_I18NSTRING_TYPE)
+assert(0);
+#endif
+ case RPM_STRING_ARRAY_TYPE:
case RPM_BIN_TYPE:
default:
/*@switchbreak@*/ break;
@@ -125,8 +128,11 @@
case RPM_STRING_TYPE:
delMacro(NULL, tagm->macroname);
/*@switchbreak@*/ break;
- case RPM_STRING_ARRAY_TYPE:
case RPM_I18NSTRING_TYPE:
+#if !defined(SUPPORT_I18NSTRING_TYPE)
+assert(0);
+#endif
+ case RPM_STRING_ARRAY_TYPE:
case RPM_BIN_TYPE:
case RPM_UINT8_TYPE:
case RPM_UINT16_TYPE:
@@ -288,8 +294,11 @@
if (he->c >= 16*1024)
continue;
/*@switchbreak@*/ break;
- case RPM_STRING_ARRAY_TYPE:
case RPM_I18NSTRING_TYPE:
+#if !defined(SUPPORT_I18NSTRING_TYPE)
+assert(0);
+#endif
+ case RPM_STRING_ARRAY_TYPE:
continue;
/*@notreached@*/ /*@switchbreak@*/ break;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/hdrfmt.c
============================================================================
$ cvs diff -u -r1.151.2.8 -r1.151.2.9 hdrfmt.c
--- rpm/rpmdb/hdrfmt.c 25 Mar 2012 18:54:30 -0000 1.151.2.8
+++ rpm/rpmdb/hdrfmt.c 31 Mar 2012 18:23:51 -0000 1.151.2.9
@@ -771,11 +771,14 @@
/*@=moduncon@*/
atype = (rpmuint8_t)PGPARMOR_PUBKEY; /* XXX check pkt for pubkey */
break;
+ case RPM_I18NSTRING_TYPE:
+#if !defined(SUPPORT_I18NSTRING_TYPE)
+assert(0);
+#endif
case RPM_UINT8_TYPE:
case RPM_UINT16_TYPE:
case RPM_UINT32_TYPE:
case RPM_UINT64_TYPE:
- case RPM_I18NSTRING_TYPE:
default:
return xstrdup(_("(invalid type)"));
/*@notreached@*/ break;
@@ -1122,6 +1125,7 @@
switch (he->t) {
case RPM_STRING_ARRAY_TYPE: /* XXX currently never happens */
case RPM_I18NSTRING_TYPE: /* XXX currently never happens */
+assert(0);
case RPM_STRING_TYPE:
s = (he->t == RPM_STRING_ARRAY_TYPE ? he->p.argv[ix] : he->p.str);
if (strchr("[", s[0])) /* leading [ */
@@ -6258,6 +6262,9 @@
goto exit;
/*@notreached@*/ break;
case RPM_I18NSTRING_TYPE:
+#if !defined(SUPPORT_I18NSTRING_TYPE)
+assert(0);
+#endif
case RPM_STRING_ARRAY_TYPE:
vhe->t = RPM_STRING_TYPE;
vhe->p.str = he->p.argv[element];
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/header.c
============================================================================
$ cvs diff -u -r1.198.2.2 -r1.198.2.3 header.c
--- rpm/rpmdb/header.c 2 Jan 2011 19:31:19 -0000 1.198.2.2
+++ rpm/rpmdb/header.c 31 Mar 2012 18:23:51 -0000 1.198.2.3
@@ -338,6 +338,9 @@
/* These are like RPM_STRING_TYPE, except they're *always* an array */
/* Compute sum of length of all strings, including nul terminators */
case RPM_I18NSTRING_TYPE:
+#if !defined(SUPPORT_I18NSTRING_TYPE)
+assert(0);
+#endif
case RPM_STRING_ARRAY_TYPE:
if (onDisk) {
while (count--) {
@@ -451,6 +454,9 @@
rc = 0;
break;
case RPM_I18NSTRING_TYPE:
+#if !defined(SUPPORT_I18NSTRING_TYPE)
+assert(0);
+#endif
case RPM_STRING_ARRAY_TYPE:
break;
}
@@ -1475,6 +1481,9 @@
}
/*@fallthrough@*/
case RPM_I18NSTRING_TYPE:
+#if !defined(SUPPORT_I18NSTRING_TYPE)
+assert(0);
+#endif
case RPM_STRING_ARRAY_TYPE:
{ const char ** argv;
size_t nb = count * sizeof(*argv);
@@ -1669,6 +1678,7 @@
}
switch (entry->info.type) {
+#if defined(SUPPORT_I18NSTRING_TYPE)
case RPM_I18NSTRING_TYPE:
if (!(flags & HEADERGET_NOI18NSTRING)) {
rc = 1;
@@ -1680,6 +1690,7 @@
break;
}
/*@fallthrough@*/
+#endif
default:
rc = copyEntry(entry, he, minMem);
break;
@@ -1703,6 +1714,9 @@
switch (he->t) {
case RPM_I18NSTRING_TYPE:
+#if !defined(SUPPORT_I18NSTRING_TYPE)
+assert(0);
+#endif
case RPM_STRING_ARRAY_TYPE:
{ const char ** av = he->p.argv;
rpmTagCount cnt = he->c;
@@ -1824,7 +1838,11 @@
size_t length;
int rc = 0; /* assume failure */
- if (he->t == RPM_STRING_TYPE || he->t == RPM_I18NSTRING_TYPE) {
+ if (he->t == RPM_STRING_TYPE
+#if defined(SUPPORT_I18NSTRING_TYPE)
+ || he->t == RPM_I18NSTRING_TYPE
+#endif
+ ) {
/* we can't do this */
return rc;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmdb.c
============================================================================
$ cvs diff -u -r1.392.2.9 -r1.392.2.10 rpmdb.c
--- rpm/rpmdb/rpmdb.c 7 Nov 2011 15:33:01 -0000 1.392.2.9
+++ rpm/rpmdb/rpmdb.c 31 Mar 2012 18:23:51 -0000 1.392.2.10
@@ -2010,6 +2010,9 @@
s = _free(s);
} /*@switchbreak@*/ break;
case RPM_I18NSTRING_TYPE:
+#if !defined(SUPPORT_I18NSTRING_TYPE)
+assert(0);
+#endif
default:
/*@switchbreak@*/ break;
}
@@ -2603,8 +2606,11 @@
}
break;
#endif /* !defined(__LCLINT__) */
- case RPM_BIN_TYPE:
case RPM_I18NSTRING_TYPE: /* XXX never occurs */
+#if !defined(SUPPORT_I18NSTRING_TYPE)
+assert(0);
+#endif
+ case RPM_BIN_TYPE:
case RPM_STRING_TYPE:
case RPM_STRING_ARRAY_TYPE:
default:
@@ .
patch -p0 <<'@@ .'
Index: rpm/system.h
============================================================================
$ cvs diff -u -r2.129 -r2.129.2.1 system.h
--- rpm/system.h 27 Sep 2010 21:24:39 -0000 2.129
+++ rpm/system.h 31 Mar 2012 18:23:50 -0000 2.129.2.1
@@ -731,6 +731,11 @@
#undef SUPPORT_IMPLICIT_TAG_DATA_TYPES /* XXX postpone */
/**
+ * Eliminate RPM_I18NSTRING_TYPE.
+ */
+#define SUPPORT_I18NSTRING_TYPE 1
+
+/**
* Permit ar(1) payloads. Disabled while rpmio/iosm.c is under development.
*/
#undef SUPPORT_AR_PAYLOADS
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
