[CVS] RPM: rpm-5_4: rpm/tools/ dbconvert.c

2016-06-26 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   27-Jun-2016 05:15:26
  Branch: rpm-5_4  Handle: 2016062703152600

  Modified files:   (Branch: rpm-5_4)
rpm/tools   dbconvert.c

  Log:
- orphan.

  Summary:
RevisionChanges Path
2.1.2.20+8  -8  rpm/tools/dbconvert.c
  

  patch -p0 <<'@@ .'
  Index: rpm/tools/dbconvert.c
  
  $ cvs diff -u -r2.1.2.19 -r2.1.2.20 dbconvert.c
  --- rpm/tools/dbconvert.c 29 Sep 2014 18:36:46 -  2.1.2.19
  +++ rpm/tools/dbconvert.c 27 Jun 2016 03:15:26 -  2.1.2.20
  @@ -133,15 +133,15 @@
 DBC *dbcpCur = NULL, *dbcpNew = NULL;
 rdbNew = rpmtsGetRdb(tsNew);
 dbenvNew = rdbNew->db_dbenv;
  -  dbiIndex dbiCur = dbiOpen(rpmtsGetRdb(tsCur), RPMDBI_PACKAGES, 0);
  -  dbiIndex dbiNew = dbiOpen(rdbNew, RPMDBI_PACKAGES, 0);
  -  DB_TXN *txnidNew = dbiTxnid(dbiNew);
  +  rpmdbi dbiCur = rpmdbiOpen(rpmtsGetRdb(tsCur), RPMDBI_PACKAGES, 0);
  +  rpmdbi dbiNew = rpmdbiOpen(rdbNew, RPMDBI_PACKAGES, 0);
  +  DB_TXN *txnidNew = rpmdbiTxnid(dbiNew);
   
  -  if (!(xx = dbiCopen(dbiCur, NULL, NULL, 0)) && !(xx = dbiCopen(dbiNew, 
txnidNew, , DB_WRITECURSOR))) {
  +  if (!(xx = rpmdbiCopen(dbiCur, NULL, NULL, 0)) && !(xx = 
rpmdbiCopen(dbiNew, txnidNew, , DB_WRITECURSOR))) {
DB * _dbN = (DB *) dbiNew->dbi_db;
DB * _dbO = (DB *) dbiCur->dbi_db;
DBT key, data;
  - DB_TXN *txnidCur = dbiTxnid(dbiCur);
  + DB_TXN *txnidCur = rpmdbiTxnid(dbiCur);
uint32_t nkeys = 0;
   
memset(, 0, sizeof(key));
  @@ -222,7 +222,7 @@
   
}
fprintf(stderr, "\n");
  - if (!(xx = dbiCclose(dbiNew, dbcpNew, 0)) && !(xx = 
dbiCclose(dbiCur, dbcpCur, 0)) &&
  + if (!(xx = rpmdbiCclose(dbiNew, dbcpNew, 0)) && !(xx = 
rpmdbiCclose(dbiCur, dbcpCur, 0)) &&
rebuild) {
  xx = rpmtsCloseDB(tsCur);
   
  @@ -286,7 +286,7 @@
  /* TODO: signal handler? */
   
  /* Open (and re-create) each index. */
  -   (void) dbiOpen(rdbNew, dbiTags->tag, rdbNew->db_flags);
  +   (void) rpmdbiOpen(rdbNew, dbiTags->tag, rdbNew->db_flags);
  fprintf(stderr, "%d%%\n", 
(int)(100*((float)dbix/rdbNew->db_ndbi)));
  fflush(stdout);
}
  @@ -302,7 +302,7 @@
if (!Stat(fn, ))
  xx = Unlink(fn);
fprintf(stderr, "%s:\t", fn);
  - (void) dbiOpen(rdbNew, RPMDBI_SEQNO, rdbNew->db_flags);
  + (void) rpmdbiOpen(rdbNew, RPMDBI_SEQNO, rdbNew->db_flags);
fprintf(stderr, "100%%\n");
   
fn = _free(fn);
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/tools/ dbconvert.c

2014-09-10 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   10-Sep-2014 22:17:17
  Branch: rpm-5_4  Handle: 2014091020171600

  Modified files:   (Branch: rpm-5_4)
rpm/tools   dbconvert.c

  Log:
- clang: mask -Wswitch warnings.

  Summary:
RevisionChanges Path
2.1.2.17+3  -0  rpm/tools/dbconvert.c
  

  patch -p0 '@@ .'
  Index: rpm/tools/dbconvert.c
  
  $ cvs diff -u -r2.1.2.16 -r2.1.2.17 dbconvert.c
  --- rpm/tools/dbconvert.c 21 Jun 2013 21:29:10 -  2.1.2.16
  +++ rpm/tools/dbconvert.c 10 Sep 2014 20:17:16 -  2.1.2.17
  @@ -245,6 +245,8 @@
   
  rpmtsSetVSFlags(tsNew, vsflags);
   
  +#pragma clang diagnostic push
  +#pragma clang diagnostic ignored -Wswitch
  {
size_t dbix;
fprintf(stderr, rebuilding rpmdb:\n);
  @@ -310,6 +312,7 @@
  xx = bdb_log_lsn_reset(dbenvNew);
xx = rpmtsCloseDB(tsNew);
  }
  +#pragma clang diagnostic pop
}
  }
}
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/tools/ dbconvert.c

2013-06-21 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   21-Jun-2013 23:29:10
  Branch: rpm-5_4  Handle: 2013062121291000

  Modified files:   (Branch: rpm-5_4)
rpm/tools   dbconvert.c

  Log:
- remove duplicate test.

  Summary:
RevisionChanges Path
2.1.2.16+1  -1  rpm/tools/dbconvert.c
  

  patch -p0 '@@ .'
  Index: rpm/tools/dbconvert.c
  
  $ cvs diff -u -r2.1.2.15 -r2.1.2.16 dbconvert.c
  --- rpm/tools/dbconvert.c 5 May 2012 18:15:00 -   2.1.2.15
  +++ rpm/tools/dbconvert.c 21 Jun 2013 21:29:10 -  2.1.2.16
  @@ -109,7 +109,7 @@
 Globfree(gl);
   
 tsCur = rpmtsCreate();
  -  rpmtsSetRootDir(tsCur, prefix  prefix  prefix[0] ? prefix : NULL);
  +  rpmtsSetRootDir(tsCur, prefix  prefix[0] ? prefix : NULL);
 if(!rpmtsOpenDB(tsCur, O_RDONLY)) {
   if(dbtype == 1) {
 addMacro(NULL, _dbi_tags, NULL, 
Packages:Name:Basenames:Group:Requirename:Providename:Conflictname:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filedigests:Depends:Pubkeys,
 -1);
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/tools/ dbconvert.c

2012-05-05 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   05-May-2012 20:15:01
  Branch: rpm-5_4  Handle: 201205051815

  Modified files:   (Branch: rpm-5_4)
rpm/tools   dbconvert.c

  Log:
- sqldb: orphan checkin.

  Summary:
RevisionChanges Path
2.1.2.15+8  -6  rpm/tools/dbconvert.c
  

  patch -p0 '@@ .'
  Index: rpm/tools/dbconvert.c
  
  $ cvs diff -u -r2.1.2.14 -r2.1.2.15 dbconvert.c
  --- rpm/tools/dbconvert.c 26 Apr 2012 17:46:51 -  2.1.2.14
  +++ rpm/tools/dbconvert.c 5 May 2012 18:15:00 -   2.1.2.15
  @@ -136,6 +136,8 @@
 DB_TXN *txnidNew = dbiTxnid(dbiNew);
   
 if(!(xx = dbiCopen(dbiCur, NULL, NULL, 0))  !(xx = dbiCopen(dbiNew, 
txnidNew, dbcpNew, DB_WRITECURSOR))) {
  + DB * _dbN = (DB *) dbiNew-dbi_db;
  + DB * _dbO = (DB *) dbiCur-dbi_db;
DBT key, data;
DB_TXN *txnidCur = dbiTxnid(dbiCur);
uint32_t nkeys = 0;
  @@ -144,13 +146,13 @@
memset(data, 0, sizeof(data));
   
/* Acquire a cursor for the database. */
  - if ((xx = dbiCur-dbi_db-cursor(dbiCur-dbi_db, NULL, dbcpCur, 0)) != 
0) {
  -   dbiCur-dbi_db-err(dbiCur-dbi_db, xx, DB-cursor);
  + if ((xx = _dbO-cursor(_dbO, NULL, dbcpCur, 0)) != 0) {
  +   _dbO-err(_dbO, xx, DB-cursor);
}
   
  - if(!(xx = dbiCur-dbi_db-stat(dbiCur-dbi_db, txnidCur, 
dbiCur-dbi_stats, 0))) {
  + if(!(xx = _dbO-stat(_dbO, txnidCur, dbiCur-dbi_stats, 0))) {
   
  -   switch(dbiCur-dbi_db-type) {
  +   switch(_dbO-type) {
case DB_BTREE:
case DB_RECNO: {
DB_BTREE_STAT *db_stat = dbiCur-dbi_stats;
  @@ -191,7 +193,7 @@
  key.data = i;
  data.data = nkeys;
  key.size = data.size = sizeof(uint32_t);
  -   xx = dbiNew-dbi_db-put(dbiNew-dbi_db, NULL, key, data, 0);
  +   xx = _dbN-put(_dbN, NULL, key, data, 0);
}
while ((xx = dbcpCur-c_get(dbcpCur, key, data, DB_NEXT)) == 0) {
  tmp = pct;
  @@ -214,7 +216,7 @@
if(swap)
  *(uint32_t*)key.data = bswap32(*(uint32_t*)key.data);
  }
  -   xx = dbiNew-dbi_db-put(dbiNew-dbi_db, NULL, key, data, 0);
  +   xx = _dbN-put(_dbN, NULL, key, data, 0);
   
}
fprintf(stderr, \n);
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/tools/ dbconvert.c

2011-07-27 Thread Per �yvind Karlsen 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   27-Jul-2011 19:58:12
  Branch: rpm-5_4  Handle: 2011072717581200

  Modified files:   (Branch: rpm-5_4)
rpm/tools   dbconvert.c

  Log:
fix help text

  Summary:
RevisionChanges Path
2.1.2.9 +2  -2  rpm/tools/dbconvert.c
  

  patch -p0 '@@ .'
  Index: rpm/tools/dbconvert.c
  
  $ cvs diff -u -r2.1.2.8 -r2.1.2.9 dbconvert.c
  --- rpm/tools/dbconvert.c 6 Jul 2011 13:03:42 -   2.1.2.8
  +++ rpm/tools/dbconvert.c 27 Jul 2011 17:58:12 -  2.1.2.9
  @@ -376,9 +376,9 @@
rpm root path, path },
   
{ btree, 'b', POPT_ARG_VAL,   dbType, 0,
  - swap indexes to big endian, NULL },
  + convert database type to btree, NULL},
{ hash, 'h', POPT_ARG_VAL,   dbType, 1,
  - swap indexes to little endian, NULL },
  + convert database type to hash, NULL},
   
{ bigendian, 'B', POPT_ARG_VAL,   byteOrder, 1,
swap indexes to big endian, NULL },
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/tools/ dbconvert.c

2011-07-27 Thread Per �yvind Karlsen 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   27-Jul-2011 20:02:02
  Branch: rpm-5_4  Handle: 2011072718020200

  Modified files:   (Branch: rpm-5_4)
rpm/tools   dbconvert.c

  Log:
add a missing null pointer check

  Summary:
RevisionChanges Path
2.1.2.10+1  -1  rpm/tools/dbconvert.c
  

  patch -p0 '@@ .'
  Index: rpm/tools/dbconvert.c
  
  $ cvs diff -u -r2.1.2.9 -r2.1.2.10 dbconvert.c
  --- rpm/tools/dbconvert.c 27 Jul 2011 17:58:12 -  2.1.2.9
  +++ rpm/tools/dbconvert.c 27 Jul 2011 18:02:02 -  2.1.2.10
  @@ -332,7 +332,7 @@
  fn = _free(fn);
   
  /* clear locks */
  -   fn = rpmGetPath(prefix[0] ? prefix : , dbpath, /, __db.*, NULL);
  +   fn = rpmGetPath(prefix  prefix[0] ? prefix : , dbpath, /, 
__db.*, NULL);
  xx = Glob(fn, 0, NULL, gl);
  for (i = 0; i  (int)gl.gl_pathc; i++)
xx = Unlink(gl.gl_pathv[i]);
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/tools/ dbconvert.c

2011-06-02 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   02-Jun-2011 19:39:41
  Branch: rpm-5_4  Handle: 2011060217394100

  Modified files:   (Branch: rpm-5_4)
rpm/tools   dbconvert.c

  Log:
- dbconvert: fix: avoid RPMDB_DEPENDS build failures.

  Summary:
RevisionChanges Path
2.1.2.5 +5  -3  rpm/tools/dbconvert.c
  

  patch -p0 '@@ .'
  Index: rpm/tools/dbconvert.c
  
  $ cvs diff -u -r2.1.2.4 -r2.1.2.5 dbconvert.c
  --- rpm/tools/dbconvert.c 10 Apr 2011 10:17:09 -  2.1.2.4
  +++ rpm/tools/dbconvert.c 2 Jun 2011 17:39:41 -   2.1.2.5
  @@ -4,14 +4,14 @@
   #include errno.h
   #include stdint.h
   
  -#include popt.h
  -
   #define _RPMDB_INTERNAL
   #define _RPMTAG_INTERNAL
   #define WITH_DB
   
  -#include argv.h
   #include rpmio.h
  +#include poptIO.h
  +#include argv.h
  +
   #include rpmtag.h
   #include rpmdb.h
   #include rpmmacro.h
  @@ -207,7 +207,9 @@
case RPMDBI_AVAILABLE:
case RPMDBI_ADDED:
case RPMDBI_REMOVED:
  +#if defined(RPMDBI_DEPENDS)
case RPMDBI_DEPENDS:
  +#endif
case RPMDBI_BTREE:
case RPMDBI_HASH:
case RPMDBI_QUEUE:
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/tools/ dbconvert.c

2011-04-10 Thread Per �yvind Karlsen 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   10-Apr-2011 12:17:09
  Branch: rpm-5_4  Handle: 2011041010170900

  Modified files:   (Branch: rpm-5_4)
rpm/tools   dbconvert.c

  Log:
drop __builtin_expect micro optimization which most likely the only
considerable effect of being breaking compatibility

  Summary:
RevisionChanges Path
2.1.2.4 +2  -2  rpm/tools/dbconvert.c
  

  patch -p0 '@@ .'
  Index: rpm/tools/dbconvert.c
  
  $ cvs diff -u -r2.1.2.3 -r2.1.2.4 dbconvert.c
  --- rpm/tools/dbconvert.c 30 Mar 2011 14:17:31 -  2.1.2.3
  +++ rpm/tools/dbconvert.c 10 Apr 2011 10:17:09 -  2.1.2.4
  @@ -172,14 +172,14 @@
  fflush(stdout);
  if(i == 1  !*(uint32_t*)key.data)
continue;
  -   if(__builtin_expect(doswap, 1)  0) {
  +   if(doswap  0) {
if((htole32(*(uint32_t*)key.data)  1000  swap  0) ||
(htole32(*(uint32_t*)key.data)  1000  swap  0))
  doswap = 1;
else
  doswap = 0;
  }
  -   if(__builtin_expect(doswap, 1)) {
  +   if(doswap) {
if(swap)
  *(uint32_t*)key.data = bswap32(*(uint32_t*)key.data);
  }
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org