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: 13-Aug-2014 19:43:09
Branch: rpm-5_4 Handle: 2014081317430800
Modified files: (Branch: rpm-5_4)
rpm/rpmio rpmmacro.h
Log:
- macro: stub in memory pool structures.
Summary:
Revision Changes Path
2.56.4.6 +7 -0 rpm/rpmio/rpmmacro.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmmacro.h
============================================================================
$ cvs diff -u -r2.56.4.5 -r2.56.4.6 rpmmacro.h
--- rpm/rpmio/rpmmacro.h 12 Jul 2013 21:40:49 -0000 2.56.4.5
+++ rpm/rpmio/rpmmacro.h 13 Aug 2014 17:43:08 -0000 2.56.4.6
@@ -10,8 +10,10 @@
typedef /*@abstract@*/ struct MacroContext_s * MacroContext;
#if defined(_MACRO_INTERNAL)
+#include <rpmiotypes.h>
/*! The structure used to store a macro. */
struct MacroEntry_s {
+ struct rpmioItem_s _item; /*!< usage mutex and pool identifier. */
struct MacroEntry_s *prev; /*!< Macro entry stack. */
const char *name; /*!< Macro name. */
const char *opts; /*!< Macro parameters (a la getopt) */
@@ -23,10 +25,15 @@
/*! The structure used to store the set of macros in a context. */
struct MacroContext_s {
+ struct rpmioItem_s _item; /*!< usage mutex and pool identifier. */
/*@owned@*//*@null@*/
MacroEntry *macroTable; /*!< Macro entry table for context. */
int macrosAllocated; /*!< No. of allocated macros. */
int firstFree; /*!< No. of macros. */
+#if defined(__LCLINT__)
+/*@refs@*/
+ int nrefs; /*!< (unused) keep splint happy */
+#endif
};
#endif
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
