[CVS] RPM: rpm-5_4: rpm/rpmio/ tder.c

[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:   07-Jul-2016 14:15:38
  Branch: rpm-5_4                          Handle: 2016070712153800

  Modified files:           (Branch: rpm-5_4)
    rpm/rpmio               tder.c

  Log:
    - tder.c: remove compiler warnings.

  Summary:
    Revision    Changes     Path
    1.1.2.2     +14 -0      rpm/rpmio/tder.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/rpmio/tder.c
  ============================================================================
  $ cvs diff -u -r1.1.2.1 -r1.1.2.2 tder.c
  --- rpm/rpmio/tder.c  29 Apr 2014 18:05:56 -0000      1.1.2.1
  +++ rpm/rpmio/tder.c  7 Jul 2016 12:15:38 -0000       1.1.2.2
  @@ -7,6 +7,7 @@
   #include "system.h"
   #include <stddef.h>
   
  +#include <rpmdefs.h>
   #include <rpmio.h>
   #include <poptIO.h>
   
  @@ -429,6 +430,7 @@
   extern const SEC_ASN1Template * NSS_Get_##x (void *arg, PRBool enc);
   
   #define SEC_ASN1_CHOOSER_IMPLEMENT(x) \
  +RPM_GNUC_CONST \
   const SEC_ASN1Template * NSS_Get_##x(void * arg, PRBool enc) \
   { return x; }
   
  @@ -1259,6 +1261,7 @@
    * entire encoding); everything else takes one plus the number of bytes
    * in the length.
    */
  +RPM_GNUC_CONST
   int
   SEC_ASN1LengthLength (unsigned long len)
   {
  @@ -1314,6 +1317,7 @@
       return subt;
   }
   
  +RPM_GNUC_PURE
   PRBool SEC_ASN1IsTemplateSimple(const SEC_ASN1Template *theTemplate)
   {
       if (!theTemplate) {
  @@ -2220,6 +2224,13 @@
   
   /* ========== */
   
  +RPM_GNUC_CONST
  +SECStatus doit(void)
  +{
  +    SECStatus rv = SECSuccess;
  +     return rv;
  +}
  +
   static struct poptOption rpmasnOptionsTable[] = {
   
    { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmioAllPoptTable, 0,
  @@ -2239,8 +2250,11 @@
   main(int argc, char *argv[])
   {
       poptContext con = rpmioInit(argc, argv, rpmasnOptionsTable);
  +    SECStatus rv = doit();
       int ec = 0;
   
  +    (void)rv;
  +
       con = rpmioFini(con);
   
       return ec;
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org