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:   18-Sep-2007 08:47:56
  Branch: HEAD                             Handle: 2007091807475401

  Modified files:
    rpm/rpmconstant         constant.c
    rpm/rpmio               tdir.c tfts.c tget.c tglob.c thkp.c tiger.c tinv.c
                            tkey.c tmagic.c tput.c tpw.c trpmio.c
    rpm/tools               rpmcache.c rpmcmp.c rpmdeps.c rpmdigest.c rpmkey.c
                            txar.c

  Log:
    cleanup main() definitions in tests and tools
    
    Submitted by: Ralf Corsépius <corsepiu@fedoraproject.org>
    Obtained from: rpm.org (partly)

  Summary:
    Revision    Changes     Path
    1.5         +2  -2      rpm/rpmconstant/constant.c
    2.6         +1  -1      rpm/rpmio/tdir.c
    2.10        +1  -1      rpm/rpmio/tfts.c
    1.10        +1  -1      rpm/rpmio/tget.c
    2.7         +1  -1      rpm/rpmio/tglob.c
    2.12        +1  -1      rpm/rpmio/thkp.c
    1.6         +1  -1      rpm/rpmio/tiger.c
    1.9         +1  -1      rpm/rpmio/tinv.c
    2.18        +1  -1      rpm/rpmio/tkey.c
    1.7         +1  -1      rpm/rpmio/tmagic.c
    1.5         +1  -1      rpm/rpmio/tput.c
    1.3         +1  -1      rpm/rpmio/tpw.c
    2.8         +1  -1      rpm/rpmio/trpmio.c
    2.14        +1  -1      rpm/tools/rpmcache.c
    2.2         +1  -1      rpm/tools/rpmcmp.c
    2.13        +1  -1      rpm/tools/rpmdeps.c
    2.2         +2  -2      rpm/tools/rpmdigest.c
    1.3         +1  -1      rpm/tools/rpmkey.c
    2.7         +1  -1      rpm/tools/txar.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/rpmconstant/constant.c
  ============================================================================
  $ cvs diff -u -r1.4 -r1.5 constant.c
  --- rpm/rpmconstant/constant.c	19 Aug 2007 19:44:27 -0000	1.4
  +++ rpm/rpmconstant/constant.c	18 Sep 2007 06:47:54 -0000	1.5
  @@ -1,5 +1,5 @@
   /* Nanar <nanardon@zarb.org>
  - * $Id: constant.c,v 1.4 2007/08/19 19:44:27 jbj Exp $
  + * $Id: constant.c,v 1.5 2007/09/18 06:47:54 rse Exp $
    */
   
   #include "system.h"
  @@ -7,7 +7,7 @@
   #include <popt.h>
   #include "debug.h"
   
  -int main(int argc, const char *argv[]) {
  +int main(int argc, char *argv[]) {
       char * context =NULL;
       int c;
       const char * name;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/tdir.c
  ============================================================================
  $ cvs diff -u -r2.5 -r2.6 tdir.c
  --- rpm/rpmio/tdir.c	6 Aug 2007 10:44:13 -0000	2.5
  +++ rpm/rpmio/tdir.c	18 Sep 2007 06:47:54 -0000	2.6
  @@ -56,7 +56,7 @@
   };
   
   int
  -main(int argc, const char *argv[])
  +main(int argc, char *argv[])
   {
       poptContext optCon = poptGetContext(argv[0], argc, argv, optionsTable, 0);
       int rc;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/tfts.c
  ============================================================================
  $ cvs diff -u -r2.9 -r2.10 tfts.c
  --- rpm/rpmio/tfts.c	14 Jul 2007 22:33:06 -0000	2.9
  +++ rpm/rpmio/tfts.c	18 Sep 2007 06:47:54 -0000	2.10
  @@ -148,7 +148,7 @@
   };
   
   int
  -main(int argc, const char *argv[])
  +main(int argc, char *argv[])
   {
       poptContext optCon = poptGetContext(argv[0], argc, argv, optionsTable, 0);
       int rc;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/tget.c
  ============================================================================
  $ cvs diff -u -r1.9 -r1.10 tget.c
  --- rpm/rpmio/tget.c	15 Jul 2007 16:32:17 -0000	1.9
  +++ rpm/rpmio/tget.c	18 Sep 2007 06:47:54 -0000	1.10
  @@ -53,7 +53,7 @@
   };
   
   int
  -main(int argc, const char *argv[])
  +main(int argc, char *argv[])
   {
       poptContext optCon = poptGetContext(argv[0], argc, argv, optionsTable, 0);
       int rc;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/tglob.c
  ============================================================================
  $ cvs diff -u -r2.6 -r2.7 tglob.c
  --- rpm/rpmio/tglob.c	14 Jul 2007 22:38:19 -0000	2.6
  +++ rpm/rpmio/tglob.c	18 Sep 2007 06:47:54 -0000	2.7
  @@ -68,7 +68,7 @@
   };
   
   int
  -main(int argc, const char *argv[])
  +main(int argc, char *argv[])
   {
       poptContext optCon = poptGetContext(argv[0], argc, argv, optionsTable, 0);
       int rc;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/thkp.c
  ============================================================================
  $ cvs diff -u -r2.11 -r2.12 thkp.c
  --- rpm/rpmio/thkp.c	9 Sep 2007 19:06:52 -0000	2.11
  +++ rpm/rpmio/thkp.c	18 Sep 2007 06:47:54 -0000	2.12
  @@ -107,7 +107,7 @@
   };
   
   int
  -main(int argc, const char *argv[])
  +main(int argc, char *argv[])
   {
       poptContext optCon = poptGetContext(argv[0], argc, argv, optionsTable, 0);
       int rc;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/tiger.c
  ============================================================================
  $ cvs diff -u -r1.5 -r1.6 tiger.c
  --- rpm/rpmio/tiger.c	19 Jul 2007 19:07:56 -0000	1.5
  +++ rpm/rpmio/tiger.c	18 Sep 2007 06:47:54 -0000	1.6
  @@ -847,7 +847,7 @@
           00B83EB4E53440C5 76AC6AAEE0A74858 25FD15E70A59FFE4
   */
   
  -int main() {
  +int main(int argc, char *argv[]) {
       int rc = tiger_test();
       switch(rc) {
       case 0:	printf("OK\n");		break;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/tinv.c
  ============================================================================
  $ cvs diff -u -r1.8 -r1.9 tinv.c
  --- rpm/rpmio/tinv.c	24 Jun 2007 10:37:59 -0000	1.8
  +++ rpm/rpmio/tinv.c	18 Sep 2007 06:47:54 -0000	1.9
  @@ -463,7 +463,7 @@
   };
   
   int
  -main(int argc, const char * argv[])
  +main(int argc, char *argv[])
   {
       poptContext optCon = poptGetContext(argv[0], argc, argv, optionsTable, 0);
       mpbarrett q;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/tkey.c
  ============================================================================
  $ cvs diff -u -r2.17 -r2.18 tkey.c
  --- rpm/rpmio/tkey.c	9 Sep 2007 19:06:52 -0000	2.17
  +++ rpm/rpmio/tkey.c	18 Sep 2007 06:47:54 -0000	2.18
  @@ -100,7 +100,7 @@
   ;
   
   int
  -main (int argc, char *argv[])
  +main(int argc, char *argv[])
   {
       pgpDig dig;
       int printing = 1;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/tmagic.c
  ============================================================================
  $ cvs diff -u -r1.6 -r1.7 tmagic.c
  --- rpm/rpmio/tmagic.c	1 Aug 2007 19:03:01 -0000	1.6
  +++ rpm/rpmio/tmagic.c	18 Sep 2007 06:47:54 -0000	1.7
  @@ -48,7 +48,7 @@
   };
   
   int
  -main(int argc, const char *argv[])
  +main(int argc, char *argv[])
   {
       poptContext optCon = poptGetContext(argv[0], argc, argv, optionsTable, 0);
       rpmmg mg;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/tput.c
  ============================================================================
  $ cvs diff -u -r1.4 -r1.5 tput.c
  --- rpm/rpmio/tput.c	15 Jul 2007 16:32:17 -0000	1.4
  +++ rpm/rpmio/tput.c	18 Sep 2007 06:47:54 -0000	1.5
  @@ -120,7 +120,7 @@
   };
   
   int
  -main(int argc, const char *argv[])
  +main(int argc, char *argv[])
   {
       poptContext optCon = poptGetContext(argv[0], argc, argv, optionsTable, 0);
       int rc;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/tpw.c
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 tpw.c
  --- rpm/rpmio/tpw.c	24 Aug 2007 20:18:29 -0000	1.2
  +++ rpm/rpmio/tpw.c	18 Sep 2007 06:47:54 -0000	1.3
  @@ -23,7 +23,7 @@
   };
   
   int
  -main(int argc, char *const argv[])
  +main(int argc, char *argv[])
   {
       poptContext optCon = rpmcliInit(argc, argv, optionsTable);
       const char * prompt = "Enter pass phrase: ";
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/trpmio.c
  ============================================================================
  $ cvs diff -u -r2.7 -r2.8 trpmio.c
  --- rpm/rpmio/trpmio.c	15 Jul 2007 16:32:17 -0000	2.7
  +++ rpm/rpmio/trpmio.c	18 Sep 2007 06:47:54 -0000	2.8
  @@ -7,7 +7,7 @@
   #include "rpmio.h"
   #include "debug.h"
   
  -int main (void)
  +int main(int argc, char *argv[])
   {
       FD_t f1, f2, f3, f4, f5;
    
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tools/rpmcache.c
  ============================================================================
  $ cvs diff -u -r2.13 -r2.14 rpmcache.c
  --- rpm/tools/rpmcache.c	18 Aug 2007 16:45:02 -0000	2.13
  +++ rpm/tools/rpmcache.c	18 Sep 2007 06:47:55 -0000	2.14
  @@ -504,7 +504,7 @@
   };
   
   int
  -main(int argc, char *const argv[])
  +main(int argc, char *argv[])
   {
       rpmts ts = NULL;
       rpmgi gi = NULL;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tools/rpmcmp.c
  ============================================================================
  $ cvs diff -u -r2.1 -r2.2 rpmcmp.c
  --- rpm/tools/rpmcmp.c	18 Aug 2007 16:45:02 -0000	2.1
  +++ rpm/tools/rpmcmp.c	18 Sep 2007 06:47:55 -0000	2.2
  @@ -41,7 +41,7 @@
   };
   
   int
  -main(int argc, const char *argv[])
  +main(int argc, char *argv[])
   {
       poptContext optCon;
       ARGV_t av;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tools/rpmdeps.c
  ============================================================================
  $ cvs diff -u -r2.12 -r2.13 rpmdeps.c
  --- rpm/tools/rpmdeps.c	16 Aug 2007 18:33:06 -0000	2.12
  +++ rpm/tools/rpmdeps.c	18 Sep 2007 06:47:55 -0000	2.13
  @@ -217,7 +217,7 @@
   
   
   int
  -main(int argc, char *const argv[])
  +main(int argc, char *argv[])
   {
   static const char rpmdeps_string[] = "rpmdeps";
       poptContext optCon;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tools/rpmdigest.c
  ============================================================================
  $ cvs diff -u -r2.1 -r2.2 rpmdigest.c
  --- rpm/tools/rpmdigest.c	18 Aug 2007 16:45:02 -0000	2.1
  +++ rpm/tools/rpmdigest.c	18 Sep 2007 06:47:55 -0000	2.2
  @@ -12,7 +12,7 @@
   };
   
   int
  -main(int argc, const char *argv[])
  +main(int argc, char *argv[])
   {
       poptContext optCon;
       const char ** args;
  @@ -26,7 +26,7 @@
       int asAscii = 1;
       int rc = 0;
   
  -    optCon = poptGetContext(argv[0], argc, argv, optionsTable, 0);
  +    optCon = poptGetContext(argv[0], argc, (const char **)argv, optionsTable, 0);
       while ((rc = poptGetNextOpt(optCon)) > 0)
   	;
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tools/rpmkey.c
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 rpmkey.c
  --- rpm/tools/rpmkey.c	16 Aug 2007 18:33:41 -0000	1.2
  +++ rpm/tools/rpmkey.c	18 Sep 2007 06:47:55 -0000	1.3
  @@ -1274,7 +1274,7 @@
   };
   
   int
  -main(int argc, char *const argv[])
  +main(int argc, char *argv[])
   {
       poptContext optCon = rpmcliInit(argc, argv, optionsTable);
       int ret = 0;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tools/txar.c
  ============================================================================
  $ cvs diff -u -r2.6 -r2.7 txar.c
  --- rpm/tools/txar.c	6 Sep 2007 00:34:27 -0000	2.6
  +++ rpm/tools/txar.c	18 Sep 2007 06:47:55 -0000	2.7
  @@ -360,7 +360,7 @@
   };
   
   int
  -main(int argc, char *const argv[])
  +main(int argc, char *argv[])
   {
       poptContext optCon = rpmcliInit(argc, argv, optionsTable);
       const char ** args;
  @@ .