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: 22-May-2009 19:57:28
Branch: rpm-5_2 Handle: 2009052217572800
Modified files: (Branch: rpm-5_2)
rpm/rpmio bzdio.c iosm.c lsyck.c
Log:
- make rpmio/*.c identical to HEAD.
Summary:
Revision Changes Path
2.20.2.1 +1 -1 rpm/rpmio/bzdio.c
1.38.2.2 +1 -1 rpm/rpmio/iosm.c
2.5.2.1 +4 -2 rpm/rpmio/lsyck.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmio/bzdio.c
============================================================================
$ cvs diff -u -r2.20 -r2.20.2.1 bzdio.c
--- rpm/rpmio/bzdio.c 15 Apr 2009 12:12:46 -0000 2.20
+++ rpm/rpmio/bzdio.c 22 May 2009 17:57:28 -0000 2.20.2.1
@@ -65,7 +65,7 @@
{
rpmbz bz;
int level = -1; /* XXX use _bzdB default */
- mode_t omode;
+ mode_t omode = O_RDONLY;
int small = -1; /* XXX use _bzdS default */
int verbosity = -1; /* XXX use _bzdV default */
const char * s = fmode;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/iosm.c
============================================================================
$ cvs diff -u -r1.38.2.1 -r1.38.2.2 iosm.c
--- rpm/rpmio/iosm.c 22 May 2009 15:09:20 -0000 1.38.2.1
+++ rpm/rpmio/iosm.c 22 May 2009 17:57:28 -0000 1.38.2.2
@@ -1,5 +1,5 @@
/** \ingroup payload
- * \file lib/iosm.c
+ * \file rpmio/iosm.c
* File state machine to handle a payload from a package.
*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/lsyck.c
============================================================================
$ cvs diff -u -r2.5 -r2.5.2.1 lsyck.c
--- rpm/rpmio/lsyck.c 7 Apr 2009 10:47:13 -0000 2.5
+++ rpm/rpmio/lsyck.c 22 May 2009 17:57:28 -0000 2.5.2.1
@@ -1,8 +1,8 @@
/*
* lsyck.c
*
- * $Author: afb $
- * $Date: 2009/04/07 10:47:13 $
+ * $Author: jbj $
+ * $Date: 2009/05/22 17:57:28 $
*
* Copyright (C) 2005 Zachary P. Landau <kaphe...@divineinvasion.net>
*/
@@ -35,7 +35,9 @@
lua_syck_parser_handler(SyckParser *p, SyckNode *n)
{
struct parser_xtra *bonus = (struct parser_xtra *)p->bonus;
- int o, o2, o3 = -1;
+ int o = -1;
+ int o2 = -1;
+ int o3 = -1;
SYMID oid;
int i;
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
