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:   24-Oct-2007 07:37:28
  Branch: rpm-4_5                          Handle: 2007102406372700

  Modified files:           (Branch: rpm-4_5)
    rpm/rpmdb               header.c

  Log:
    - jbj: minimize diff against HEAD.

  Summary:
    Revision    Changes     Path
    1.48.2.14   +111 -56    rpm/rpmdb/header.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/header.c
  ============================================================================
  $ cvs diff -u -r1.48.2.13 -r1.48.2.14 header.c
  --- rpm/rpmdb/header.c        23 Oct 2007 20:36:15 -0000      1.48.2.13
  +++ rpm/rpmdb/header.c        24 Oct 2007 05:37:27 -0000      1.48.2.14
  @@ -124,6 +124,20 @@
   HV_t hdrVec; /* forward reference */
   
   /** \ingroup header
  + * Return header stats accumulator structure.
  + * @param h          header
  + * @param opx                per-header accumulator index (aka rpmtsOpX)
  + * @return           per-header accumulator pointer
  + */
  +static /[EMAIL PROTECTED]@*/
  +void * headerGetStats(/[EMAIL PROTECTED]@*/ Header h, /[EMAIL PROTECTED]@*/ 
int opx)
  +        /[EMAIL PROTECTED]/
  +{
  +    rpmop op = NULL;
  +    return op;
  +}
  +
  +/** \ingroup header
    * Reference a header instance.
    * @param h          header
    * @return           referenced header instance
  @@ -588,21 +602,22 @@
   
   /** \ingroup header
    * @param h          header
  - * @retval *lengthPtr        no. bytes in unloaded header blob
  + * @retval *lenp     no. bytes in unloaded header blob
    * @return           unloaded header blob (NULL on error)
    */
   static /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ void * 
doHeaderUnload(Header h,
  -             /[EMAIL PROTECTED]@*/ size_t * lengthPtr)
  -     /[EMAIL PROTECTED] h, *lengthPtr @*/
  -     /[EMAIL PROTECTED] maxSet(lengthPtr) >= 0 @*/
  -     /[EMAIL PROTECTED] maxRead(result) == (*lengthPtr) @*/
  +             /[EMAIL PROTECTED]@*/ size_t * lenp)
  +     /[EMAIL PROTECTED] h, *lenp @*/
  +     /[EMAIL PROTECTED] maxSet(lenp) >= 0 @*/
  +     /[EMAIL PROTECTED] maxRead(result) == (*lenp) @*/
   {
  +    void * sw;
       int_32 * ei = NULL;
       entryInfo pe;
       unsigned char * dataStart;
       unsigned char * te;
       unsigned pad;
  -    unsigned len;
  +    unsigned len = 0;
       int_32 il = 0;
       int_32 dl = 0;
       indexEntry entry; 
  @@ -612,6 +627,9 @@
       int driplen, ndrips;
       int legacy = 0;
   
  +    if ((sw = headerGetStats(h, 18)) != NULL)        /* RPMTS_OP_HDRLOAD */
  +     (void) rpmswEnter(sw, 0);
  +
       /* Sort entries by (offset,tag). */
       headerUnsort(h);
   
  @@ -842,15 +860,18 @@
       if ((((unsigned char *)ei)+len) != te)
        goto errxit;
   
  -    if (lengthPtr)
  -     *lengthPtr = len;
  +    if (lenp)
  +     *lenp = len;
   
       h->flags &= ~HEADERFLAG_SORTED;
       headerSort(h);
   
  +    if (sw != NULL)  (void) rpmswExit(sw, len);
  +
       return (void *) ei;
   
   errxit:
  +    if (sw != NULL)  (void) rpmswExit(sw, len);
       /[EMAIL PROTECTED]@*/
       ei = _free(ei);
       /[EMAIL PROTECTED]@*/
  @@ -974,6 +995,7 @@
   Header headerLoad(/[EMAIL PROTECTED]@*/ void * uh)
        /[EMAIL PROTECTED] uh @*/
   {
  +    void * sw = NULL;
       int_32 * ei = (int_32 *) uh;
       int_32 il = ntohl(ei[0]);                /* index length */
       int_32 dl = ntohl(ei[1]);                /* data length */
  @@ -1002,6 +1024,8 @@
       dataEnd = dataStart + dl;
   
       h = xcalloc(1, sizeof(*h));
  +    if ((sw = headerGetStats(h, 18)) != NULL)        /* RPMTS_OP_HDRLOAD */
  +     (void) rpmswEnter(sw, 0);
       /[EMAIL PROTECTED]@*/
       h->hv = *hdrVec;         /* structure assignment */
       /[EMAIL PROTECTED]@*/
  @@ -1122,11 +1146,14 @@
       h->flags &= ~HEADERFLAG_SORTED;
       headerSort(h);
   
  +    if (sw != NULL)  (void) rpmswExit(sw, pvlen);
  +
       /[EMAIL PROTECTED] -observertrans @*/
       return h;
       /[EMAIL PROTECTED] =observertrans @*/
   
   errxit:
  +    if (sw != NULL)  (void) rpmswExit(sw, pvlen);
       /[EMAIL PROTECTED]@*/
       if (h) {
        h->index = _free(h->index);
  @@ -1209,15 +1236,15 @@
   {
       Header nh;
       size_t length;
  -    /[EMAIL PROTECTED]@*/
  -    void * uh = doHeaderUnload(h, &length);
  -    const char * origin;
  +    void * uh;
  +    const char * origin = (h->origin != NULL ? xstrdup(h->origin) : NULL);
       int_32 instance = h->instance;
       int xx;
   
  -    origin = (h->origin != NULL ? xstrdup(h->origin) : NULL);
  +/[EMAIL PROTECTED]@*/
  +    uh = doHeaderUnload(h, &length);
       h = headerFree(h);
  -    /[EMAIL PROTECTED]@*/
  +/[EMAIL PROTECTED]@*/
       if (uh == NULL)
        return NULL;
       nh = headerLoad(uh);
  @@ -1458,7 +1485,7 @@
                rdl += REGION_TAG_COUNT;
            }
   
  -         (*p).ptr = ei = xmalloc(count);
  +         (*p).i32p = ei = xmalloc(count);
            ei[0] = htonl(ril);
            ei[1] = htonl(rdl);
   
  @@ -1494,10 +1521,10 @@
   
        /[EMAIL PROTECTED]@*/
        if (minMem) {
  -         argv = (*p).argv = xmalloc(nb);
  +         (*p).argv = argv = xmalloc(nb);
            t = entry->data;
        } else {
  -         argv = (*p).argv = xmalloc(nb + entry->length);
  +         (*p).argv = argv = xmalloc(nb + entry->length);
            t = (char *) &argv[count];
            memcpy(t, entry->data, entry->length);
        }
  @@ -1677,9 +1704,9 @@
       int rc;
   
       /* First find the tag */
  -    /[EMAIL PROTECTED]@*/            /*@ FIX: h modified by sort. */
  +/[EMAIL PROTECTED]@*/                /*@ FIX: h modified by sort. */
       entry = findEntry(h, tag, RPM_NULL_TYPE);
  -    /[EMAIL PROTECTED]@*/
  +/[EMAIL PROTECTED]@*/
       if (entry == NULL) {
        if (type) type = 0;
        if (p) (*p).ptr = NULL;
  @@ -1749,7 +1776,14 @@
        /[EMAIL PROTECTED] *type, *p, *c @*/
        /[EMAIL PROTECTED] maxSet(type) >= 0 /\ maxSet(p) >= 0 /\ maxSet(c) >= 
0 @*/
   {
  -    return intGetEntry(h, tag, (rpmTagType *)type, (rpmTagData *)p, 
(rpmTagCount *)c, 0);
  +    void * sw;
  +    int rc;
  +
  +    if ((sw = headerGetStats(h, 19)) != NULL)        /* RPMTS_OP_HDRGET */
  +     (void) rpmswEnter(sw, 0);
  +    rc = intGetEntry(h, tag, (rpmTagType *)type, (rpmTagData *)p, 
(rpmTagCount *)c, 0);
  +    if (sw != NULL)  (void) rpmswExit(sw, 0);
  +    return rc;
   }
   
   /** \ingroup header
  @@ -1772,7 +1806,14 @@
        /[EMAIL PROTECTED] *type, *p, *c @*/
        /[EMAIL PROTECTED] maxSet(type) >= 0 /\ maxSet(p) >= 0 /\ maxSet(c) >= 
0 @*/
   {
  -    return intGetEntry(h, tag, (rpmTagType *)type, (rpmTagData *)p, 
(rpmTagCount *)c, 1);
  +    void * sw;
  +    int rc;
  +
  +    if ((sw = headerGetStats(h, 19)) != NULL)        /* RPMTS_OP_HDRGET */
  +     (void) rpmswEnter(sw, 0);
  +    rc = intGetEntry(h, tag, (rpmTagType *)type, (rpmTagData *)p, 
(rpmTagCount *)c, 1);
  +    if (sw != NULL)  (void) rpmswExit(sw, 0);
  +    return rc;
   }
   
   int headerGetRawEntry(Header h, int_32 tag, rpmTagType * type, void * p, 
rpmTagCount * c)
  @@ -1831,12 +1872,12 @@
    * @param type               entry data type
    * @param p          entry data
    * @param c          entry item count
  - * @retval lengthPtr no. bytes in returned data
  + * @retval *lenp     no. bytes in returned data
    * @return           (malloc'ed) copy of entry data, NULL on error
    */
   /[EMAIL PROTECTED]@*/
   static void *
  -grabData(rpmTagType type, rpmTagData p, rpmTagCount c, /[EMAIL PROTECTED]@*/ 
int * lengthPtr)
  +grabData(rpmTagType type, rpmTagData p, rpmTagCount c, /[EMAIL PROTECTED]@*/ 
int * lenp)
        /[EMAIL PROTECTED] *lengthPtr @*/
        /[EMAIL PROTECTED] maxSet(lengthPtr) >= 0 @*/
   {
  @@ -1849,8 +1890,8 @@
        copyData(type, data, p, c, length);
       }
   
  -    if (lengthPtr)
  -     *lengthPtr = length;
  +    if (lenp)
  +     *lenp = length;
       return data.ptr;
   }
   
  @@ -2415,7 +2456,8 @@
       headerSprintfExtension exts;
   /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
       const char * errmsg;
  -    HE_t ec;
  +    HE_t ec;                 /*!< Extension data cache. */
  +    int nec;                 /*!< No. of extension cache items. */
       sprintfToken format;
   /[EMAIL PROTECTED]@*/
       HeaderIterator hi;
  @@ -2535,7 +2577,7 @@
   /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
   static const char * myTagName(headerTagTableEntry tbl, int val,
                /[EMAIL PROTECTED]@*/ int *typep)
  -     /[EMAIL PROTECTED]/
  +     /[EMAIL PROTECTED] *typep @*/
   {
       static char name[128];
       const char * s;
  @@ -2585,9 +2627,11 @@
   static int findTag(headerSprintfArgs hsa, sprintfToken token, const char * 
name)
        /[EMAIL PROTECTED] token @*/
   {
  +    headerSprintfExtension exts = hsa->exts;
       headerSprintfExtension ext;
       sprintfTag stag = (token->type == PTOK_COND
        ? &token->u.cond.tag : &token->u.tag);
  +    int extNum;
   
       stag->fmt = NULL;
       stag->ext = NULL;
  @@ -2606,14 +2650,14 @@
       }
   
       /* Search extensions for specific tag override. */
  -    for (ext = hsa->exts; ext != NULL && ext->type != HEADER_EXT_LAST;
  -     ext = (ext->type == HEADER_EXT_MORE ? ext->u.more : ext+1))
  +    for (ext = exts, extNum = 0; ext != NULL && ext->type != HEADER_EXT_LAST;
  +     ext = (ext->type == HEADER_EXT_MORE ? ext->u.more : ext+1), extNum++)
       {
        if (ext->name == NULL || ext->type != HEADER_EXT_TAG)
            continue;
        if (!xstrcasecmp(ext->name, name)) {
            stag->ext = ext->u.tagFunction;
  -         stag->extNum = ext - hsa->exts;
  +         stag->extNum = extNum;
            goto bingo;
        }
       }
  @@ -2628,7 +2672,7 @@
   bingo:
       /* Search extensions for specific format. */
       if (stag->type != NULL)
  -    for (ext = hsa->exts; ext != NULL && ext->type != HEADER_EXT_LAST;
  +    for (ext = exts; ext != NULL && ext->type != HEADER_EXT_LAST;
            ext = (ext->type == HEADER_EXT_MORE ? ext->u.more : ext+1))
       {
        if (ext->name == NULL || ext->type != HEADER_EXT_FORMAT)
  @@ -3089,8 +3133,13 @@
   
       for (i = 0; i < numTokens; i++) {
        token = format + i;
  -     if (token->type == PTOK_STRING)
  +     switch(token->type) {
  +     default:
  +         break;
  +     case PTOK_STRING:
            token->u.string.len = strlen(token->u.string.string);
  +         break;
  +     }
       }
   
       *numTokensPtr = numTokens;
  @@ -3201,7 +3250,7 @@
    * Call a header extension only once, saving results.
    * @param hsa                headerSprintf args
    * @param fn         function
  - @ @retval he                tag container
  + * @retval he                tag container
    * @retval ec                extension cache
    * @return           0 on success, 1 on failure
    */
  @@ -3267,7 +3316,7 @@
        switch (he->t) {
        default:
            if (element >= he->c) {
  -             (void) rpmheClean(he);
  +             he = rpmheClean(he);
                hsa->errmsg = _("(index out of range)");
                return NULL;
            }
  @@ -3283,10 +3332,11 @@
   
       if (tag->arrayCount) {
        countBuf = he->c;
  -     (void) rpmheClean(he);
  +     he = rpmheClean(he);
        he->t = RPM_INT32_TYPE;
        he->p.i32p = &countBuf;
        he->c = 1;
  +     he->freeData = 0;
       }
       he->avail = 1;
   
  @@ -3294,6 +3344,11 @@
   
       if (he->p.ptr)
       switch (he->t) {
  +    default:
  +     val = xstrdup("(unknown type)");
  +     need = strlen(val) + 1;
  +     goto exit;
  +     /[EMAIL PROTECTED]@*/ break;
       case RPM_STRING_ARRAY_TYPE:
        strarray = he->p.argv;
   
  @@ -3408,15 +3463,11 @@
   #endif
        }
        break;
  -
  -    default:
  -     need = sizeof("(unknown type)") - 1;
  -     val = xstrdup("(unknown type)");
  -     break;
       }
   
  +exit:
       if (!_tagcache)
  -     (void) rpmheClean(he);
  +     he = rpmheClean(he);
   
       if (val && need > 0) {
        t = hsaReserve(hsa, need);
  @@ -3554,8 +3605,8 @@
            need = numElements * token->u.array.numTokens;
            if (need == 0) break;
   
  -         spft = token->u.array.format;
            tag = &spft->u.tag;
  +
            isxml = (spft->type == PTOK_TAG && tag->type != NULL &&
                !strcmp(tag->type, "xml"));
            isyaml = (spft->type == PTOK_TAG && tag->type != NULL &&
  @@ -3642,23 +3693,26 @@
   /**
    * Create an extension cache.
    * @param exts               headerSprintf extensions
  + * @retval *necp     no. of elements (or NULL)
    * @return           new extension cache
    */
   static /[EMAIL PROTECTED]@*/ HE_t
  -rpmecNew(const headerSprintfExtension exts)
  +rpmecNew(const headerSprintfExtension exts, /[EMAIL PROTECTED]@*/ int * necp)
        /[EMAIL PROTECTED]/
   {
       headerSprintfExtension ext;
       HE_t ec;
  -    int i = 0;
  +    int extNum = 0;
   
  -    for (ext = exts; ext != NULL && ext->type != HEADER_EXT_LAST;
  -     ext = (ext->type == HEADER_EXT_MORE ? ext->u.more : ext+1))
  +    if (exts != NULL)
  +    for (ext = exts, extNum = 0; ext != NULL && ext->type != HEADER_EXT_LAST;
  +     ext = (ext->type == HEADER_EXT_MORE ? ext->u.more : ext+1), extNum++)
       {
  -     i++;
  +     ;
       }
  -
  -    ec = xcalloc(i, sizeof(*ec));
  +    if (necp)
  +     *necp = extNum;
  +    ec = xcalloc(extNum+1, sizeof(*ec));     /* XXX +1 unnecessary */
       return ec;
   }
   
  @@ -3673,13 +3727,12 @@
        /[EMAIL PROTECTED] ec @*/
   {
       headerSprintfExtension ext;
  -    int i = 0;
  +    int extNum;
   
  -    for (ext = exts; ext != NULL && ext->type != HEADER_EXT_LAST;
  -     ext = (ext->type == HEADER_EXT_MORE ? ext->u.more : ext+1))
  +    for (ext = exts, extNum = 0; ext != NULL && ext->type != HEADER_EXT_LAST;
  +     ext = (ext->type == HEADER_EXT_MORE ? ext->u.more : ext+1), extNum++)
       {
  -     rpmheClean(&ec[i]);
  -     i++;
  +     (void) rpmheClean(&ec[extNum]);
       }
   
       ec = _free(ec);
  @@ -3692,8 +3745,8 @@
    *
    * @param h          header
    * @param fmt                format to use
  - * @param tags               array of tag name/value pairs
  - * @param exts               chained table of formatting extensions.
  + * @param tags               array of tag name/value/type triples
  + * @param exts               formatting extensions chained table
    * @retval *errmsg   error message (if any)
    * @return           formatted output string (malloc'ed)
    */
  @@ -3724,7 +3777,8 @@
       if (parseFormat(hsa, hsa->fmt, &hsa->format, &hsa->numTokens, NULL, 
PARSER_BEGIN))
        goto exit;
   
  -    hsa->ec = rpmecNew(hsa->exts);
  +    hsa->nec = 0;
  +    hsa->ec = rpmecNew(hsa->exts, &hsa->nec);
       hsa->val = xstrdup("");
   
       tag =
  @@ -3776,6 +3830,7 @@
        hsa->val = xrealloc(hsa->val, hsa->vallen+1);   
   
       hsa->ec = rpmecFree(hsa->exts, hsa->ec);
  +    hsa->nec = 0;
       hsa->format = freeFormat(hsa->format, hsa->numTokens);
   
   exit:
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                [email protected]

Reply via email to