RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/ CHANGES rpm/rpmdb/ hdrfmt.c

From: Jeff Johnson <jbj@rpm5.org>
Date: Mon 03 Dec 2007 - 13:59:08 CET
Message-Id: <20071203125908.4F89034845C@rpm5.org>
  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:   03-Dec-2007 13:59:08
  Branch: HEAD                             Handle: 2007120312590701

  Modified files:
    rpm                     CHANGES
    rpm/rpmdb               hdrfmt.c

  Log:
    - jbj: revert binary search, todo++.

  Summary:
    Revision    Changes     Path
    1.1910      +1  -0      rpm/CHANGES
    1.49        +4  -0      rpm/rpmdb/hdrfmt.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1909 -r1.1910 CHANGES
  --- rpm/CHANGES	3 Dec 2007 06:27:54 -0000	1.1909
  +++ rpm/CHANGES	3 Dec 2007 12:59:07 -0000	1.1910
  @@ -1,4 +1,5 @@
   5.0a4 -> 5.0b1:
  +    - jbj: revert binary search, todo++.
       - jbj: using tagValue instead permits queries of arbitrary tags.
       - jbj: do binary, not linear, search for tag name/type/value.
       - jbj: lazy arbitrary tag array initialization in rpmTags methods instead.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/hdrfmt.c
  ============================================================================
  $ cvs diff -u -r1.48 -r1.49 hdrfmt.c
  --- rpm/rpmdb/hdrfmt.c	2 Dec 2007 23:06:02 -0000	1.48
  +++ rpm/rpmdb/hdrfmt.c	3 Dec 2007 12:59:08 -0000	1.49
  @@ -2061,6 +2061,7 @@
       const char * s;
       char *t;
   
  +#ifdef	NOTYET
       /* XXX Use bsearch on the "normal" rpmTagTable lookup. */
       if (tbl == NULL || tbl == rpmTagTable) {
   	s = tagName(val);
  @@ -2068,6 +2069,7 @@
   	    *typep = tagType(val);
   	return s;
       }
  +#endif
   
       for (; tbl->name != NULL; tbl++) {
   	if (tbl->val == val)
  @@ -2095,9 +2097,11 @@
   static uint32_t myTagValue(headerTagTableEntry tbl, const char * name)
   	/*@*/
   {
  +#ifdef	NOTYET
       /* XXX Use bsearch on the "normal" rpmTagTable lookup. */
       if (tbl == NULL || tbl == rpmTagTable)
   	return tagValue(name);
  +#endif
   
       for (; tbl->name != NULL; tbl++) {
   	if (!xstrcasecmp(tbl->name, name))
  @@ .
Received on Mon Dec 3 13:59:08 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.