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-2009 18:48:51
Branch: rpm-5_1 Handle: 2009041116485001
Modified files: (Branch: rpm-5_1)
rpm CHANGES
rpm/rpmdb hdrfmt.c rpmevr.c
Log:
- jbj: EVRtuple: eliminate the old EVR parser.
Summary:
Revision Changes Path
1.2288.2.293+1 -0 rpm/CHANGES
1.77.2.17 +0 -17 rpm/rpmdb/hdrfmt.c
1.29.2.7 +0 -66 rpm/rpmdb/rpmevr.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2288.2.292 -r1.2288.2.293 CHANGES
--- rpm/CHANGES 11 Apr 2009 16:34:40 -0000 1.2288.2.292
+++ rpm/CHANGES 11 Apr 2009 16:48:50 -0000 1.2288.2.293
@@ -1,4 +1,5 @@
5.1.7 -> 5.1.8:
+ - jbj: EVRtuple: eliminate the old EVR parser.
- jbj: yarn: convert rpmluav to usage mutex with refcounts
- jbj: yarn: convert rpmlua to usage mutex with refcounts
- jbj: popt: remove retrofits for popt < 1.14. use popt internal if
needed.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/hdrfmt.c
============================================================================
$ cvs diff -u -r1.77.2.16 -r1.77.2.17 hdrfmt.c
--- rpm/rpmdb/hdrfmt.c 4 Apr 2009 20:31:41 -0000 1.77.2.16
+++ rpm/rpmdb/hdrfmt.c 11 Apr 2009 16:48:50 -0000 1.77.2.17
@@ -6010,9 +6010,6 @@
/*...@globals rpmGlobalMacroContext, h_errno, internalState @*/
/*...@modifies hsa, token, rpmGlobalMacroContext, internalState @*/
{
-#ifdef DYING
- char numbuf[64]; /* XXX big enuf for "Tag_0x01234567" */
-#endif
char * t, * te;
size_t i, j;
size_t numElements;
@@ -6142,14 +6139,7 @@
const char * tagN;
/* XXX display "Tag_0x01234567" for arbitrary tags. */
if (tag->tagno != NULL && tag->tagno[0] & 0x40000000) {
-#ifdef DYING /* XXX tagName() does this now */
- (void) snprintf(numbuf, sizeof(numbuf), "Tag_0x%08x",
- (unsigned) tag->tagno[0]);
- numbuf[sizeof(numbuf)-1] = '\0';
- tagN = numbuf;
-#else
tagN = myTagName(hsa->tags, tag->tagno[0], NULL);
-#endif
} else
tagN = myTagName(hsa->tags, tag->tagno[0], NULL);
assert(tagN != NULL); /* XXX can't happen */
@@ -6163,14 +6153,7 @@
const char * tagN;
/* XXX display "Tag_0x01234567" for arbitrary tags. */
if (tag->tagno != NULL && tag->tagno[0] & 0x40000000) {
-#ifdef DYING /* XXX tagName() does this now */
- (void) snprintf(numbuf, sizeof(numbuf), "Tag_0x%08x",
- (unsigned) tag->tagno[0]);
- numbuf[sizeof(numbuf)-1] = '\0';
- tagN = numbuf;
-#else
tagN = myTagName(hsa->tags, tag->tagno[0], NULL);
-#endif
tagT = numElements > 1
? RPM_ARRAY_RETURN_TYPE : RPM_SCALAR_RETURN_TYPE;
} else
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmevr.c
============================================================================
$ cvs diff -u -r1.29.2.6 -r1.29.2.7 rpmevr.c
--- rpm/rpmdb/rpmevr.c 4 Apr 2009 18:57:12 -0000 1.29.2.6
+++ rpm/rpmdb/rpmevr.c 11 Apr 2009 16:48:51 -0000 1.29.2.7
@@ -158,14 +158,9 @@
if (evr_tuple_match == NULL || evr_tuple_match[0] == '\0')
evr_tuple_match = xstrdup(_evr_tuple_match);
-#ifdef NOTYET /* XXX avoid need for evr_tuple_nmire */
evr_tuple_mire = mireNew(RPMMIRE_REGEX, 0);
xx = mireSetCOptions(evr_tuple_mire, RPMMIRE_REGEX, 0, 0, NULL);
xx = mireRegcomp(evr_tuple_mire, evr_tuple_match);
-#else
- xx = mireAppend(RPMMIRE_REGEX, 0, evr_tuple_match, NULL,
- &evr_tuple_mire, &evr_tuple_nmire);
-#endif
}
/*...@=globs =internalglobs =mods @*/
@@ -175,49 +170,6 @@
/*...@=globstate =retal...@*/
}
-#ifndef DYING
-static int oldrpmEVRparse(const char * evrstr, EVR_t evr)
- /*...@modifies evrstr, evr @*/
-{
- char *s = xstrdup(evrstr);
- char *se;
- char *se2;
-
- evr->str = se = s;
- se2 = se;
- while (*se && xisdigit((int)*se)) se++; /* se points to epoch terminator
*/
-
- if (*se == ':') {
- evr->F[RPMEVR_E] = s;
- *se++ = '\0';
- evr->F[RPMEVR_V] = se;
- se2 = se;
- if (*evr->F[RPMEVR_E] == '\0') evr->F[RPMEVR_E] = "0";
- evr->Elong = strtoul(evr->F[RPMEVR_E], NULL, 10);
- } else {
- evr->F[RPMEVR_E] = NULL; /* XXX disable epoch compare if missing */
- evr->F[RPMEVR_V] = s;
- evr->Elong = 0;
- }
- se = strrchr(se, ':'); /* se points to release terminator */
- if (se) {
- *se++ = '\0';
- evr->F[RPMEVR_D] = se;
- } else {
- evr->F[RPMEVR_D] = NULL;
- }
- se = strrchr(se2, '-'); /* se points to version terminator */
- if (se) {
- *se++ = '\0';
- evr->F[RPMEVR_R] = se;
- } else {
- evr->F[RPMEVR_R] = NULL;
- }
-
- return 0;
-}
-#endif
-
int rpmEVRparse(const char * evrstr, EVR_t evr)
/*...@modifies evrstr, evr @*/
{
@@ -266,24 +218,6 @@
xx = mireSetEOptions(mire, NULL, 0);
-#ifndef DYING
- { EVR_t Oevr = memset(alloca(sizeof(*Oevr)), 0, sizeof(*Oevr));
-
- xx = oldrpmEVRparse(evrstr, Oevr);
-assert(Oevr->Elong == evr->Elong);
-
- for (i = 0; i < 5; i++) {
- if (Oevr->F[i] == NULL && evr->F[i] == NULL)
- continue;
- if (Oevr->F[i] == NULL || evr->F[i] == NULL
- || strcmp(Oevr->F[i], evr->F[i]))
- fprintf(stderr, "==> \"%s\" %d strcmp(%s,%s)\n",
- evrstr, i, Oevr->F[i], evr->F[i]);
- }
- Oevr->str = _free(Oevr->str);
- }
-#endif /* DYING */
-
return 0;
}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
