RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/rpmio/ rpmxar.c

From: Jeff Johnson <jbj@rpm5.org>
Date: Mon 26 Nov 2007 - 16:33:20 CET
Message-Id: <20071126153320.CABEB348455@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:   26-Nov-2007 16:33:20
  Branch: HEAD                             Handle: 2007112615332000

  Modified files:
    rpm/rpmio               rpmxar.c

  Log:
    - rpmio: splint fiddles.

  Summary:
    Revision    Changes     Path
    2.12        +4  -0      rpm/rpmio/rpmxar.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmxar.c
  ============================================================================
  $ cvs diff -u -r2.11 -r2.12 rpmxar.c
  --- rpm/rpmio/rpmxar.c	23 Nov 2007 23:52:36 -0000	2.11
  +++ rpm/rpmio/rpmxar.c	26 Nov 2007 15:33:20 -0000	2.12
  @@ -149,8 +149,10 @@
   
   int rpmxarPush(rpmxar xar, const char * fn, unsigned char * b, size_t bsize)
   {
  +/*@+charint@*/
   if (_xar_debug)
   fprintf(stderr, "--> rpmxarPush(%p, %s) %p[%u] %02x%02x%02x%02x%02x%02x%02x%02x\n", xar, fn, b, (unsigned)bsize, b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7]);
  +/*@=charint@*/
   
       if (xar->x && b != NULL) {
   	xar->f = xar_add_frombuffer(xar->x, NULL, fn, (char *)b, bsize);
  @@ -181,11 +183,13 @@
       if (rc)
   	return 1;
   
  +/*@+charint -nullpass -nullderef @*/
   if (_xar_debug) {
   unsigned char * b = xar->b;
   size_t bsize = xar->bsize;
   fprintf(stderr, "--> rpmxarPull(%p, %s) %p[%u] %02x%02x%02x%02x%02x%02x%02x%02x\n", xar, fn, b, (unsigned)bsize, b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7]);
   }
  +/*@=charint =nullpass =nullderef @*/
   
       return 0;
   }
  @@ .
Received on Mon Nov 26 16:33:20 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.