summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjbj <devnull@localhost>2004-03-28 16:07:26 +0000
committerjbj <devnull@localhost>2004-03-28 16:07:26 +0000
commit68325b9175c8306bf80fc2031c59c519f8a0e17c (patch)
tree4d84c9cb68c1fae7c7919faab5bbd5ebf4734c6d
parent13ca035edbc9a954d57048391e725d546c6bafb0 (diff)
downloadrpm-68325b9175c8306bf80fc2031c59c519f8a0e17c.tar.gz
rpm-68325b9175c8306bf80fc2031c59c519f8a0e17c.tar.bz2
rpm-68325b9175c8306bf80fc2031c59c519f8a0e17c.zip
- scareMem = 0 everywhere, document deprecation phase out.
CVS patchset: 7203 CVS date: 2004/03/28 16:07:26
-rw-r--r--CHANGES1
-rw-r--r--lib/rpmds.h1
-rw-r--r--lib/rpmfi.c10
-rw-r--r--lib/rpmfi.h1
4 files changed, 8 insertions, 5 deletions
diff --git a/CHANGES b/CHANGES
index 88533f8ca..f07a2f64e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
4.3.1 -> 4.4:
- use package build time as EVR comparison tie breaker.
- fix: don't add leading space to %* argv expansion (#119059).
+ - scareMem = 0 everywhere, document deprecation phase out.
4.3 -> 4.3.1:
diff --git a/lib/rpmds.h b/lib/rpmds.h
index eddcd3202..ff253bec4 100644
--- a/lib/rpmds.h
+++ b/lib/rpmds.h
@@ -107,6 +107,7 @@ rpmds rpmdsFree(/*@killref@*/ /*@only@*/ /*@null@*/ rpmds ds)
/*@modifies ds@*/;
/**
* Create and load a dependency set.
+ * @deprecated Only scareMem = 0 will be permitted.
* @param h header
* @param tagN type of dependency
* @param scareMem Use pointers to refcounted header memory?
diff --git a/lib/rpmfi.c b/lib/rpmfi.c
index d7152cbaa..70ad7531d 100644
--- a/lib/rpmfi.c
+++ b/lib/rpmfi.c
@@ -1435,7 +1435,7 @@ fprintf(stderr, "*** fi %p\t%s[%d]\n", fi, Type, (fi ? fi->fc : 0));
void rpmfiBuildFClasses(Header h,
/*@out@*/ const char *** fclassp, /*@out@*/ int * fcp)
{
- int scareMem = 1;
+ int scareMem = 0;
rpmfi fi = rpmfiNew(NULL, h, RPMTAG_BASENAMES, scareMem);
const char * FClass;
const char ** av;
@@ -1490,7 +1490,7 @@ exit:
void rpmfiBuildFContexts(Header h,
/*@out@*/ const char *** fcontextp, /*@out@*/ int * fcp)
{
- int scareMem = 1;
+ int scareMem = 0;
rpmfi fi = rpmfiNew(NULL, h, RPMTAG_BASENAMES, scareMem);
const char * fcontext;
const char ** av;
@@ -1545,7 +1545,7 @@ exit:
void rpmfiBuildFSContexts(Header h,
/*@out@*/ const char *** fcontextp, /*@out@*/ int * fcp)
{
- int scareMem = 1;
+ int scareMem = 0;
rpmfi fi = rpmfiNew(NULL, h, RPMTAG_BASENAMES, scareMem);
const char ** av;
int ac;
@@ -1616,7 +1616,7 @@ exit:
void rpmfiBuildREContexts(Header h,
/*@out@*/ const char *** fcontextp, /*@out@*/ int * fcp)
{
- int scareMem = 1;
+ int scareMem = 0;
rpmfi fi = rpmfiNew(NULL, h, RPMTAG_BASENAMES, scareMem);
rpmsx sx = NULL;
const char ** av;
@@ -1694,7 +1694,7 @@ exit:
void rpmfiBuildFDeps(Header h, rpmTag tagN,
/*@out@*/ const char *** fdepsp, /*@out@*/ int * fcp)
{
- int scareMem = 1;
+ int scareMem = 0;
rpmfi fi = rpmfiNew(NULL, h, RPMTAG_BASENAMES, scareMem);
rpmds ds = NULL;
const char ** av;
diff --git a/lib/rpmfi.h b/lib/rpmfi.h
index c3869d3ca..3a3bf9192 100644
--- a/lib/rpmfi.h
+++ b/lib/rpmfi.h
@@ -498,6 +498,7 @@ rpmfi rpmfiFree(/*@killref@*/ /*@only@*/ /*@null@*/ rpmfi fi)
/**
* Create and load a file info set.
+ * @deprecated Only scareMem = 0 will be permitted.
* @param ts transaction set (NULL skips path relocation)
* @param h header
* @param tagN RPMTAG_BASENAMES