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:   30-Jul-2007 05:03:32
  Branch: rpm-4_5                          Handle: 2007073004033101

  Modified files:           (Branch: rpm-4_5)
    rpm                     CHANGES
    rpm/lib                 poptALL.c query.c
    rpm/rpmdb               rpmdb.c rpmdb.h

  Log:
    - eliminate --rsegfault/--wsegfault.

  Summary:
    Revision    Changes     Path
    1.1360.2.28 +1  -0      rpm/CHANGES
    2.28.2.4    +0  -13     rpm/lib/poptALL.c
    2.174.2.2   +0  -1      rpm/lib/query.c
    1.128.2.6   +0  -6      rpm/rpmdb/rpmdb.c
    1.57.2.1    +0  -16     rpm/rpmdb/rpmdb.h
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1360.2.27 -r1.1360.2.28 CHANGES
  --- rpm/CHANGES	30 Jul 2007 01:58:09 -0000	1.1360.2.27
  +++ rpm/CHANGES	30 Jul 2007 03:03:31 -0000	1.1360.2.28
  @@ -1,4 +1,5 @@
   4.4.9 -> 4.5:
  +    - jbj: eliminate --rsegfault/--wsegfault.
       - jbj: add RPMTAG_DBINSTANCE header extension.
       - jbj: parameterize Depends index and dependency result caching.
       - jbj: fix a --import memory leak.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/poptALL.c
  ============================================================================
  $ cvs diff -u -r2.28.2.3 -r2.28.2.4 poptALL.c
  --- rpm/lib/poptALL.c	16 Jun 2007 23:07:07 -0000	2.28.2.3
  +++ rpm/lib/poptALL.c	30 Jul 2007 03:03:32 -0000	2.28.2.4
  @@ -28,12 +28,6 @@
   /*@unchecked@*/
   static int _debug = 0;
   
  -/*@unchecked@*/
  -extern int _rsegfault;
  -
  -/*@unchecked@*/
  -extern int _wsegfault;
  -
   /*@-exportheadervar@*/
   /*@unchecked@*/
   extern int _rpmds_nopromote;
  @@ -348,13 +342,6 @@
    { "debug", 'd', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_debug, -1,
           NULL, NULL },
   
  -#if defined(POPT_ARGFLAG_RANDOM)
  - { "rsegfault", '\0', POPT_ARG_INT|POPT_ARGFLAG_RANDOM|POPT_ARGFLAG_DOC_HIDDEN,
  -	&_rsegfault, 0, NULL, NULL },
  - { "wsegfault", '\0', POPT_ARG_INT|POPT_ARGFLAG_RANDOM|POPT_ARGFLAG_DOC_HIDDEN,
  -	&_wsegfault, 0, NULL, NULL },
  -#endif
  -
    { "predefine", '\0', POPT_ARG_STRING|POPT_ARGFLAG_DOC_HIDDEN, 0, POPT_PREDEFINE,
   	N_("predefine MACRO with value EXPR"),
   	N_("'MACRO EXPR'") },
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/query.c
  ============================================================================
  $ cvs diff -u -r2.174.2.1 -r2.174.2.2 query.c
  --- rpm/lib/query.c	9 Jun 2007 15:47:48 -0000	2.174.2.1
  +++ rpm/lib/query.c	30 Jul 2007 03:03:32 -0000	2.174.2.2
  @@ -429,7 +429,6 @@
   	    continue;
   	if ((rc = qva->qva_showPackage(qva, ts, h)) != 0)
   	    ec = rc;
  -RSEGFAULT;
   	if (qva->qva_source == RPMQV_DBOFFSET)
   	    break;
       }
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/rpmdb.c
  ============================================================================
  $ cvs diff -u -r1.128.2.5 -r1.128.2.6 rpmdb.c
  --- rpm/rpmdb/rpmdb.c	18 Jun 2007 19:40:02 -0000	1.128.2.5
  +++ rpm/rpmdb/rpmdb.c	30 Jul 2007 03:03:32 -0000	1.128.2.6
  @@ -35,12 +35,6 @@
   int _rpmdb_debug = 0;
   
   /*@unchecked@*/
  -int _rsegfault = 0;
  -
  -/*@unchecked@*/
  -int _wsegfault = 0;
  -
  -/*@unchecked@*/
   static int _rebuildinprogress = 0;
   /*@unchecked@*/
   static int _db_filter_dups = 0;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/rpmdb.h
  ============================================================================
  $ cvs diff -u -r1.57 -r1.57.2.1 rpmdb.h
  --- rpm/rpmdb/rpmdb.h	25 May 2007 17:36:33 -0000	1.57
  +++ rpm/rpmdb/rpmdb.h	30 Jul 2007 03:03:32 -0000	1.57.2.1
  @@ -17,19 +17,6 @@
   extern int _rpmdb_debug;
   /*@=exportlocal@*/
   
  -/*@unchecked@*/
  -extern int _rsegfault;
  -/*@unchecked@*/
  -extern int _wsegfault;
  -
  -#if defined(__LCLINT__)
  -#define	RSEGFAULT
  -#define	WSEGFAULT
  -#else
  -#define	RSEGFAULT	{ if (_rsegfault > 0) assert(--_rsegfault); }
  -#define	WSEGFAULT	{ if (_wsegfault > 0) assert(--_wsegfault); }
  -#endif
  -
   #ifdef	NOTYET
   /** \ingroup rpmdb
    * Database of headers and tag value indices.
  @@ -615,7 +602,6 @@
       (void) rpmswEnter(sw, 0);
       rc = (dbi->dbi_vec->cdel) (dbi, dbcursor, key, data, flags);
       (void) rpmswExit(sw, data->size);
  -WSEGFAULT;
       return rc;
   }
   
  @@ -640,7 +626,6 @@
       (void) rpmswEnter(sw, 0);
       rc = (dbi->dbi_vec->cget) (dbi, dbcursor, key, data, flags);
       (void) rpmswExit(sw, data->size);
  -RSEGFAULT;
       return rc;
   }
   
  @@ -690,7 +675,6 @@
       (void) rpmswEnter(sw, 0);
       rc = (dbi->dbi_vec->cput) (dbi, dbcursor, key, data, flags);
       (void) rpmswExit(sw, data->size);
  -WSEGFAULT;
       return rc;
   }
   
  @@ .