RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/lib/ fsm.c

From: Ralf S. Engelschall <rse@rpm5.org>
Date: Mon 16 Jul 2007 - 09:12:12 CEST
Message-Id: <20070716071212.5161F3484F3@rpm5.org>
  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:   16-Jul-2007 09:12:12
  Branch: HEAD                             Handle: 2007071608121200

  Modified files:
    rpm/lib                 fsm.c

  Log:
    workaround a compiler warning of an unused variable (when
    matchpathcon() expands to a NO-OP under non-SELinux)

  Summary:
    Revision    Changes     Path
    2.122       +1  -2      rpm/lib/fsm.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/lib/fsm.c
  ============================================================================
  $ cvs diff -u -r2.121 -r2.122 fsm.c
  --- rpm/lib/fsm.c	15 Jul 2007 16:32:16 -0000	2.121
  +++ rpm/lib/fsm.c	16 Jul 2007 07:12:12 -0000	2.122
  @@ -657,7 +657,6 @@
   {
       rpmts ts = fsmGetTs(fsm);
       rpmfi fi = fsmGetFi(fsm);
  -    struct stat * st = &fsm->sb;
   
       /*
        * Find file security context (if not disabled).
  @@ -668,7 +667,7 @@
       {
   	security_context_t scon = NULL;
   
  -	if (matchpathcon(fsm->path, st->st_mode, &scon) == 0 && scon != NULL)
  +	if (matchpathcon(fsm->path, &fsm->sb.st_mode, &scon) == 0 && scon != NULL)
   	    fsm->fcontext = scon;
   	else {
   	    int i = fsm->ix;
  @@ .
Received on Mon Jul 16 09:12:12 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.