RPM Community Forums

Mailing List Message of <rpm-devel>

Re: [CVS] RPM: rpm/lib/ formats.c rpm/rpmdb/ pkgio.c rpm/rpmio/ rpmmessage...

From: Jeff Johnson <n3npq@mac.com>
Date: Mon 12 Nov 2007 - 14:11:27 CET
Message-Id: <7ED6E757-8928-4D44-8188-7559720FCE7D@mac.com>
How are you detecting these?

I even tried sparse to get a handle on some of the problems still
known to be present without benefit.

I lack a functional methodology ...

73 de Jeff

On Nov 12, 2007, at 8:07 AM, Ralf S. Engelschall wrote:

>   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  
> 14:07:57
>   Branch: HEAD                             Handle: 2007111213075600
>
>   Modified files:
>     rpm/lib                 formats.c
>     rpm/rpmdb               pkgio.c
>     rpm/rpmio               rpmmessages.h rpmmg.c
>
>   Log:
>     fix a few additional type mismatches
>
>   Summary:
>     Revision    Changes     Path
>     2.118       +1  -1      rpm/lib/formats.c
>     1.30        +2  -2      rpm/rpmdb/pkgio.c
>     2.17        +2  -2      rpm/rpmio/rpmmessages.h
>     2.5         +1  -1      rpm/rpmio/rpmmg.c
>    
> ______________________________________________________________________ 
> ______
>
>   patch -p0 <<'@@ .'
>   Index: rpm/lib/formats.c
>    
> ====================================================================== 
> ======
>   $ cvs diff -u -r2.117 -r2.118 formats.c
>   --- rpm/lib/formats.c	10 Nov 2007 18:06:42 -0000	2.117
>   +++ rpm/lib/formats.c	12 Nov 2007 13:07:56 -0000	2.118
>   @@ -58,7 +58,7 @@
>        rpmTagData fnames = { .ptr = NULL };
>        rpmTagData fsizes = { .ptr = NULL };
>        rpmTagData p;
>   -    uint_64 * usages;
>   +    uint64_t *usages;
>        int numFiles;
>        int rc = 1;		/* assume error */
>        int xx, yy;
>   @@ .
>   patch -p0 <<'@@ .'
>   Index: rpm/rpmdb/pkgio.c
>    
> ====================================================================== 
> ======
>   $ cvs diff -u -r1.29 -r1.30 pkgio.c
>   --- rpm/rpmdb/pkgio.c	11 Nov 2007 15:00:08 -0000	1.29
>   +++ rpm/rpmdb/pkgio.c	12 Nov 2007 13:07:56 -0000	1.30
>   @@ -1155,7 +1155,7 @@
>        if ((rc = rpmwfNextXAR(wf)) != RPMRC_OK) return rc;
>        if ((rc = rpmwfPullXAR(wf, "Header")) != RPMRC_OK) return rc;
>    if (_jbj)
>   -fprintf(stderr, "==> wf->h %p[%d]\n", wf->h, wf->nh);
>   +fprintf(stderr, "==> wf->h %p[%d]\n", wf->h, (int)wf->nh);
>    assert(wf->nh > sizeof(block));
>        memcpy(block, wf->h, sizeof(block));
>    } else {
>   @@ -1265,7 +1265,7 @@
>        if ((rc = rpmwfNextXAR(wf)) != RPMRC_OK) return rc;
>        if ((rc = rpmwfPullXAR(wf, "Header")) != RPMRC_OK) return rc;
>    if (_jbj)
>   -fprintf(stderr, "==> wf->h %p[%d]\n", wf->h, wf->nh);
>   +fprintf(stderr, "==> wf->h %p[%d]\n", wf->h, (int)wf->nh);
>        h = headerLoad(wf->h);
>    } else {
>        h = headerRead(fd);
>   @@ .
>   patch -p0 <<'@@ .'
>   Index: rpm/rpmio/rpmmessages.h
>    
> ====================================================================== 
> ======
>   $ cvs diff -u -r2.16 -r2.17 rpmmessages.h
>   --- rpm/rpmio/rpmmessages.h	25 May 2007 17:36:37 -0000	2.16
>   +++ rpm/rpmio/rpmmessages.h	12 Nov 2007 13:07:56 -0000	2.17
>   @@ -70,8 +70,8 @@
>    typedef void * (*rpmCallbackFunction)
>    		(/*@null@*/ const void * h,
>    		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@*/ rpmCallbackData data)
>    	/*@globals internalState@*/
>   @@ .
>   patch -p0 <<'@@ .'
>   Index: rpm/rpmio/rpmmg.c
>    
> ====================================================================== 
> ======
>   $ cvs diff -u -r2.4 -r2.5 rpmmg.c
>   --- rpm/rpmio/rpmmg.c	11 Oct 2007 13:04:28 -0000	2.4
>   +++ rpm/rpmio/rpmmg.c	12 Nov 2007 13:07:56 -0000	2.5
>   @@ -103,6 +103,6 @@
>        t = xstrdup(t);
>
>    if (_rpmmg_debug)
>   -fprintf(stderr, "--> rpmmgBuffer(%p, %p[%d]) %s\n", mg, b, nb, t);
>   +fprintf(stderr, "--> rpmmgBuffer(%p, %p[%d]) %s\n", mg, b, (int) 
> nb, t);
>        return t;
>    }
>   @@ .
> ______________________________________________________________________
> RPM Package Manager                                    http://rpm5.org
> CVS Sources Repository                                rpm-cvs@rpm5.org
Received on Mon Nov 12 14:11:37 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.