RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs                       Email:  rse@rpm5.org
  Module: rpm                              Date:   12-Nov-2007 13:30:46
  Branch: HEAD                             Handle: 2007111212304501

  Modified files:
    rpm                     CHANGES
    rpm/lib                 fs.c rpmcli.h rpmps.h rpmts.h

  Log:
    fix type mismatches between function prototype and function
    definitions related to uint64_t

  Summary:
    Revision    Changes     Path
    1.1811      +1  -0      rpm/CHANGES
    2.60        +3  -3      rpm/lib/fs.c
    2.73        +4  -4      rpm/lib/rpmcli.h
    2.13        +1  -1      rpm/lib/rpmps.h
    2.86        +1  -1      rpm/lib/rpmts.h
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1810 -r1.1811 CHANGES
  --- rpm/CHANGES	12 Nov 2007 10:58:33 -0000	1.1810
  +++ rpm/CHANGES	12 Nov 2007 12:30:45 -0000	1.1811
  @@ -1,4 +1,5 @@
   5.0a1 -> 5.0a2:
  +    - rse: fix type mismatches between function prototype and function definitions related to uint64_t
       - rse: replace still existing u_int32_t with uint32_t to get building under Solaris
       - rse: remove warnings in rpmdb/dbconfig.c when building an SQLite-only RPM
       - rse: fix building against external Berkeley-DB under Solaris (where -lrt is required)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/fs.c
  ============================================================================
  $ cvs diff -u -r2.59 -r2.60 fs.c
  --- rpm/lib/fs.c	3 Nov 2007 23:44:00 -0000	2.59
  +++ rpm/lib/fs.c	12 Nov 2007 12:30:46 -0000	2.60
  @@ -280,10 +280,10 @@
       return 0;
   }
   
  -int rpmGetFilesystemUsage(const char ** fileList, uint_32 * fssizes, int numFiles,
  -			  uint_64 ** usagesPtr, /*@unused@*/ int flags)
  +int rpmGetFilesystemUsage(const char ** fileList, uint32_t * fssizes, int numFiles,
  +			  uint64_t ** usagesPtr, /*@unused@*/ int flags)
   {
  -    uint_64 * usages;
  +    uint64_t * usages;
       int i, len, j;
       char * buf, * dirName;
       char * chptr;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmcli.h
  ============================================================================
  $ cvs diff -u -r2.72 -r2.73 rpmcli.h
  --- rpm/lib/rpmcli.h	3 Nov 2007 23:44:00 -0000	2.72
  +++ rpm/lib/rpmcli.h	12 Nov 2007 12:30:46 -0000	2.73
  @@ -457,9 +457,9 @@
   /*@unchecked@*/
   extern int rpmcliHashesTotal;
   /*@unchecked@*/
  -extern unsigned long long rpmcliProgressCurrent;
  +extern uint64_t rpmcliProgressCurrent;
   /*@unchecked@*/
  -extern unsigned long long rpmcliProgressTotal;
  +extern uint64_t rpmcliProgressTotal;
   
   /** \ingroup rpmcli
    * The rpm CLI generic transaction callback handler.
  @@ -480,8 +480,8 @@
   /*@null@*/
   void * rpmShowProgress(/*@null@*/ const void * arg,
   		const rpmCallbackType what,
  -		const unsigned long long amount,
  -		const unsigned long long total,
  +		const uint64_t amount,
  +		const uint64_t total,
   		/*@null@*/ fnpyKey key,
   		/*@null@*/ void * data)
   	/*@globals rpmcliHashesCurrent,
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmps.h
  ============================================================================
  $ cvs diff -u -r2.12 -r2.13 rpmps.h
  --- rpm/lib/rpmps.h	20 Oct 2007 04:55:43 -0000	2.12
  +++ rpm/lib/rpmps.h	12 Nov 2007 12:30:46 -0000	2.13
  @@ -217,7 +217,7 @@
   		/*@exposed@*/ /*@null@*/ fnpyKey key,
   		/*@null@*/ const char * dn, /*@null@*/ const char * bn,
   		/*@null@*/ const char * altNEVR,
  -		unsigned long long ulong1)
  +		uint64_t ulong1)
   	/*@modifies ps @*/;
   
   /**
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmts.h
  ============================================================================
  $ cvs diff -u -r2.85 -r2.86 rpmts.h
  --- rpm/lib/rpmts.h	9 Nov 2007 23:23:59 -0000	2.85
  +++ rpm/lib/rpmts.h	12 Nov 2007 12:30:46 -0000	2.86
  @@ -775,7 +775,7 @@
    */
   /*@null@*/
   void * rpmtsNotify(rpmts ts, rpmte te,
  -                rpmCallbackType what, unsigned long long amount, unsigned long long total)
  +                rpmCallbackType what, uint64_t amount, uint64_t total)
   	/*@*/;
   
   /**
  @@ .