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:   23-Oct-2007 22:36:15
  Branch: rpm-4_5                          Handle: 2007102321361500

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

  Log:
    - jbj: sanity.

  Summary:
    Revision    Changes     Path
    1.48.2.13   +5  -7      rpm/rpmdb/header.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/header.c
  ============================================================================
  $ cvs diff -u -r1.48.2.12 -r1.48.2.13 header.c
  --- rpm/rpmdb/header.c        23 Oct 2007 20:26:40 -0000      1.48.2.12
  +++ rpm/rpmdb/header.c        23 Oct 2007 20:36:15 -0000      1.48.2.13
  @@ -2076,8 +2076,7 @@
        for (i = 0; i < langNum; i++)
            p.argv[i] = "";
        p.argv[langNum] = string;
  -     return headerAddEntry(h, tag, RPM_I18NSTRING_TYPE, p.ptr, 
  -                             langNum + 1);
  +     return headerAddEntry(h, tag, RPM_I18NSTRING_TYPE, p.ptr, langNum + 1);
       } else if (langNum >= entry->info.count) {
        ghosts = langNum - entry->info.count;
        
  @@ -2956,6 +2955,8 @@
                if (xisdigit(*start)) {
                    i = strtoul(start, &start, 10);
                    token->u.tag.pad += i;
  +                 start = chptr;
  +                 break;
                } else {
                    start++;
                }
  @@ -3011,11 +3012,10 @@
                return 1;
            }
   
  -         start = next;
  +         dst = start = next;
            /[EMAIL PROTECTED]@*/ break;
   
        case '[':
  -         *dst++ = '\0';
            *start++ = '\0';
            token = format + numTokens++;
   
  @@ -3201,9 +3201,7 @@
    * Call a header extension only once, saving results.
    * @param hsa                headerSprintf args
    * @param fn         function
  - * @retval *typeptr  extension type
  - * @retval *data     extension data
  - * @retval *countptr extension size
  + @ @retval he                tag container
    * @retval ec                extension cache
    * @return           0 on success, 1 on failure
    */
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                [email protected]

Reply via email to