[CVS] RPM: rpm-5_4: rpm/rpmdb/ hdrNVR.c
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: 03-Apr-2016 22:44:37
Branch: rpm-5_4 Handle: 2016040320443700
Modified files: (Branch: rpm-5_4)
rpm/rpmdb hdrNVR.c
Log:
- headerNext: check headerfPut return code.
Summary:
RevisionChanges Path
1.46.6.5+6 -1 rpm/rpmdb/hdrNVR.c
patch -p0 <<'@@ .'
Index: rpm/rpmdb/hdrNVR.c
$ cvs diff -u -r1.46.6.4 -r1.46.6.5 hdrNVR.c
--- rpm/rpmdb/hdrNVR.c2 Apr 2016 23:01:12 - 1.46.6.4
+++ rpm/rpmdb/hdrNVR.c3 Apr 2016 20:44:37 - 1.46.6.5
@@ -304,7 +304,12 @@
/*@notreached@*/ /*@switchbreak@*/ break;
}
xx = headerPut(h, he, 0);
-assert(xx == 1);
+ if (xx != 1) {
+ rpmlog(RPMLOG_ERROR,
+ _("%s: headerPut failed(%d): tag(%u) t(%u) data %p[%u]\n"),
+ __FUNCTION__, xx, he->tag, he->t, he->p.ptr, he->c);
+
+ }
}
}
hi = headerFini(hi);
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/rpmdb/ hdrNVR.c
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: 04-Apr-2016 06:14:40
Branch: rpm-5_4 Handle: 2016040404143900
Modified files: (Branch: rpm-5_4)
rpm/rpmdb hdrNVR.c
Log:
- typoes.
Summary:
RevisionChanges Path
1.46.6.6+2 -1 rpm/rpmdb/hdrNVR.c
patch -p0 <<'@@ .'
Index: rpm/rpmdb/hdrNVR.c
$ cvs diff -u -r1.46.6.5 -r1.46.6.6 hdrNVR.c
--- rpm/rpmdb/hdrNVR.c3 Apr 2016 20:44:37 - 1.46.6.5
+++ rpm/rpmdb/hdrNVR.c4 Apr 2016 04:14:39 - 1.46.6.6
@@ -6,6 +6,7 @@
#include
#include
+#include
#define _RPMTAG_INTERNAL
#include "header_internal.h" /* XXX hdrchkType(), hdrchkData() */
@@ -305,7 +306,7 @@
}
xx = headerPut(h, he, 0);
if (xx != 1) {
- rpmlog(RPMLOG_ERROR,
+ rpmlog(RPMLOG_ERR,
_("%s: headerPut failed(%d): tag(%u) t(%u) data %p[%u]\n"),
__FUNCTION__, xx, he->tag, he->t, he->p.ptr, he->c);
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/rpmdb/ hdrNVR.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 11-Apr-2016 23:57:37
Branch: rpm-5_4 Handle: 2016041121573700
Modified files: (Branch: rpm-5_4)
rpm/rpmdb hdrNVR.c
Log:
- headerMergeLegacySigs: back out too strict assertions, rely on
filtering.
Summary:
RevisionChanges Path
1.46.6.8+0 -7 rpm/rpmdb/hdrNVR.c
patch -p0 <<'@@ .'
Index: rpm/rpmdb/hdrNVR.c
$ cvs diff -u -r1.46.6.7 -r1.46.6.8 hdrNVR.c
--- rpm/rpmdb/hdrNVR.c10 Apr 2016 22:03:54 - 1.46.6.7
+++ rpm/rpmdb/hdrNVR.c11 Apr 2016 21:57:37 - 1.46.6.8
@@ -261,15 +261,12 @@
break;
}
if (!headerIsEntry(h, he->tag)) {
-#ifdef DYING
if (hdrchkType(he->t))
continue;
if (hdrchkData(he->c))
continue;
-#endif
switch(he->t) {
default:
-assert(0);
rpmlog(RPMLOG_ERR,
_("%s: skipping tag: tag(%u) t(%u) data %p[%u]\n"),
__FUNCTION__, xx, he->tag, he->t, he->p.ptr, he->c);
@@ -279,23 +276,19 @@
case RPM_UINT16_TYPE:
case RPM_UINT32_TYPE:
case RPM_UINT64_TYPE:
-assert(he->c == 1);
if (he->c != 1)
continue;
break;
case RPM_STRING_TYPE:
-assert(he->c == 1);
if (he->c != 1)
continue;
break;
case RPM_BIN_TYPE:
-assert(he->c < 16*1024);
if (he->c >= 16*1024)
continue;
break;
case RPM_I18NSTRING_TYPE:
case RPM_STRING_ARRAY_TYPE:
-assert(0);
continue;
break;
}
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/rpmdb/ hdrNVR.c
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: 17-Apr-2016 17:29:24
Branch: rpm-5_4 Handle: 2016041715292400
Modified files: (Branch: rpm-5_4)
rpm/rpmdb hdrNVR.c
Log:
- fix: one too many arguments.
Summary:
RevisionChanges Path
1.46.6.9+1 -1 rpm/rpmdb/hdrNVR.c
patch -p0 <<'@@ .'
Index: rpm/rpmdb/hdrNVR.c
$ cvs diff -u -r1.46.6.8 -r1.46.6.9 hdrNVR.c
--- rpm/rpmdb/hdrNVR.c11 Apr 2016 21:57:37 - 1.46.6.8
+++ rpm/rpmdb/hdrNVR.c17 Apr 2016 15:29:24 - 1.46.6.9
@@ -269,7 +269,7 @@
default:
rpmlog(RPMLOG_ERR,
_("%s: skipping tag: tag(%u) t(%u) data %p[%u]\n"),
- __FUNCTION__, xx, he->tag, he->t, he->p.ptr, he->c);
+ __FUNCTION__, he->tag, he->t, he->p.ptr, he->c);
continue;
break;
case RPM_UINT8_TYPE:
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
