[CVS] RPM: rpm-5_4: rpm/lib/ tevr.c

2017-06-30 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:   01-Jul-2017 06:04:25
  Branch: rpm-5_4  Handle: 2017070104042500

  Modified files:   (Branch: rpm-5_4)
rpm/lib tevr.c

  Log:
- argv: add 3rd arg to trim input.

  Summary:
RevisionChanges Path
2.5.4.5 +1  -1  rpm/lib/tevr.c
  

  patch -p0 <<'@@ .'
  Index: rpm/lib/tevr.c
  
  $ cvs diff -u -r2.5.4.4 -r2.5.4.5 tevr.c
  --- rpm/lib/tevr.c16 May 2017 18:29:12 -  2.5.4.4
  +++ rpm/lib/tevr.c1 Jul 2017 04:04:25 -   2.5.4.5
  @@ -160,7 +160,7 @@
   
   if (ac == 0 || !strcmp(*av, "-")) {
av = NULL;
  - xx = argvFgets(&av, NULL);
  + xx = argvFgets(&av, NULL, 0);
ac = argvCount(av);
   }
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/lib/ tevr.c

2013-08-04 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:   04-Aug-2013 21:49:28
  Branch: rpm-5_4  Handle: 2013080419492800

  Modified files:   (Branch: rpm-5_4)
rpm/lib tevr.c

  Log:
- coverity #1060834.

  Summary:
RevisionChanges Path
2.5.4.3 +0  -1  rpm/lib/tevr.c
  

  patch -p0 <<'@@ .'
  Index: rpm/lib/tevr.c
  
  $ cvs diff -u -r2.5.4.2 -r2.5.4.3 tevr.c
  --- rpm/lib/tevr.c4 Aug 2013 18:59:17 -   2.5.4.2
  +++ rpm/lib/tevr.c4 Aug 2013 19:49:28 -   2.5.4.3
  @@ -218,7 +218,6 @@
   s.strnb += sizeof(*av) + 1;
   
   /* Compute size of dictionary store. */
  -if (dict->av != NULL)
   for (i = 0; dict->av[i] != NULL; i++) {
s.dictnb += sizeof(*dict->av) + strlen(dict->av[i]) + 1;
   }
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/lib/ tevr.c

2013-08-04 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:   04-Aug-2013 20:59:17
  Branch: rpm-5_4  Handle: 2013080418591700

  Modified files:   (Branch: rpm-5_4)
rpm/lib tevr.c

  Log:
- coverity #1060669.

  Summary:
RevisionChanges Path
2.5.4.2 +4  -1  rpm/lib/tevr.c
  

  patch -p0 <<'@@ .'
  Index: rpm/lib/tevr.c
  
  $ cvs diff -u -r2.5.4.1 -r2.5.4.2 tevr.c
  --- rpm/lib/tevr.c15 Apr 2012 21:20:58 -  2.5.4.1
  +++ rpm/lib/tevr.c4 Aug 2013 18:59:17 -   2.5.4.2
  @@ -1,4 +1,5 @@
   #include "system.h"
  +
   #include 
   #include 
   #include 
  @@ -206,9 +207,10 @@
evr->str = _free(evr->str);
   }
   
  -(void) argvSort(dict->av, rpmdictCmp);
  +(void) argvSort(dict->av,(int (*)(const char **, const char 
**))rpmdictCmp);
   
   /* Compute size of string & uuid store. */
  +if (av != NULL)
   for (i = 0; av[i] != NULL; i++) {
s.strnb += sizeof(*av) + strlen(av[i]) + 1;
s.uuidnb += 64/8;
  @@ -216,6 +218,7 @@
   s.strnb += sizeof(*av) + 1;
   
   /* Compute size of dictionary store. */
  +if (dict->av != NULL)
   for (i = 0; dict->av[i] != NULL; i++) {
s.dictnb += sizeof(*dict->av) + strlen(dict->av[i]) + 1;
   }
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org