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: 14-Apr-2012 22:42:29
Branch: rpm-5_4 Handle: 2012041420422801
Modified files: (Branch: rpm-5_4)
rpm/rpmio rpmiotypes.h yarn.c yarn.h
Log:
- c++: refactor and expose the yarnLock typedef.
Summary:
Revision Changes Path
1.47.2.5 +5 -1 rpm/rpmio/rpmiotypes.h
2.11.2.2 +2 -0 rpm/rpmio/yarn.c
2.4.2.1 +0 -1 rpm/rpmio/yarn.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmiotypes.h
============================================================================
$ cvs diff -u -r1.47.2.4 -r1.47.2.5 rpmiotypes.h
--- rpm/rpmio/rpmiotypes.h 14 Apr 2012 19:23:25 -0000 1.47.2.4
+++ rpm/rpmio/rpmiotypes.h 14 Apr 2012 20:42:28 -0000 1.47.2.5
@@ -29,12 +29,16 @@
*/
typedef /*@signedintegraltype@*/ int rpmint32_t;
+/** \ingroup rpmio
+ */
+typedef struct yarnLock_s * yarnLock;
+
/**
*/
typedef /*@refcounted@*/ struct rpmioItem_s * rpmioItem;
struct rpmioItem_s {
/*@null@*/
- void *use; /*!< use count -- return to pool when
zero */
+ yarnLock use; /*!< use count -- return to pool when zero */
/*@kept@*/ /*@null@*/
void *pool; /*!< pool (or NULL if malloc'd) */
void *next; /*!< factory queue linkage */
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/yarn.c
============================================================================
$ cvs diff -u -r2.11.2.1 -r2.11.2.2 yarn.c
--- rpm/rpmio/yarn.c 14 Apr 2012 18:18:30 -0000 2.11.2.1
+++ rpm/rpmio/yarn.c 14 Apr 2012 20:42:29 -0000 2.11.2.2
@@ -17,6 +17,8 @@
#include "system.h"
+#include <rpmiotypes.h>
+
/* for thread portability */
#if defined(WITH_PTHREADS)
#if !defined(_POSIX_PTHREAD_SEMANTICS)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/yarn.h
============================================================================
$ cvs diff -u -r2.4 -r2.4.2.1 yarn.h
--- rpm/rpmio/yarn.h 2 Nov 2010 15:13:08 -0000 2.4
+++ rpm/rpmio/yarn.h 14 Apr 2012 20:42:29 -0000 2.4.2.1
@@ -147,7 +147,6 @@
/*@globals fileSystem, internalState @*/
/*@modifies off_course, fileSystem, internalState @*/;
-typedef struct yarnLock_s * yarnLock;
yarnLock yarnNewLock(long)
/*@globals fileSystem, internalState @*/
/*@modifies fileSystem, internalState @*/;
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
