RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs                       Email:  [EMAIL PROTECTED]
  Module: rpm                              Date:   06-Oct-2008 21:50:09
  Branch: rpm-5_1                          Handle: 2008100619500900

  Modified files:           (Branch: rpm-5_1)
    rpm/rpmio               iosm.c

  Log:
    inline the stat buffer to get rid of compile-time warnings under
    non-Linux platforms where matchpathcon expands to an empty macro
    (similar to what we already have on HEAD)

  Summary:
    Revision    Changes     Path
    1.22.2.3    +1  -2      rpm/rpmio/iosm.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/rpmio/iosm.c
  ============================================================================
  $ cvs diff -u -r1.22.2.2 -r1.22.2.3 iosm.c
  --- rpm/rpmio/iosm.c  6 Oct 2008 19:11:38 -0000       1.22.2.2
  +++ rpm/rpmio/iosm.c  6 Oct 2008 19:50:09 -0000       1.22.2.3
  @@ -826,9 +826,8 @@
        */
       iosm->fcontext = NULL;
       if (!iosm->nofcontexts) {
  -     struct stat * st = &iosm->sb;
        security_context_t scon = NULL;
  -     int xx = matchpathcon(iosm->path, st->st_mode, &scon);
  +     int xx = matchpathcon(iosm->path, iosm->sb.st_mode, &scon);
   
   /[EMAIL PROTECTED]@*/
        if (!xx && scon != NULL)
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                [email protected]

Reply via email to