diddle some names to keep my C++ brethern happy (i.e. kpackage port).

CVS patchset: 3488
CVS date: 1999/12/16 21:58:19

16 files changed, 25 insertions, 24 deletions

diff --git a/CHANGES b/CHANGES
index b251a20e6..9b6dafad3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -27,6 +27,7 @@
 	- expose enough of legacy fdio interface to compile gnorpm.
 	- fix: missing strdup when overriding buildroot from command line
 	  argument (#1026,#5006).
+	- diddle some names to keep my C++ brethern happy (i.e. kpackage port).
 
 3.0.2 -> 3.0.3
 	- add --eval to find result of macro expansion.
diff --git a/lib/rpmio.h b/lib/rpmio.h
index fc29175d3..bc23b8c84 100644
--- a/lib/rpmio.h
+++ b/lib/rpmio.h
@@ -52,9 +52,9 @@ struct FDIO_s {
   fdio_seek_function_t *	seek;
   fdio_close_function_t *	close;
 
-  fdio_ref_function_t *		ref;
-  fdio_deref_function_t *	deref;
-  fdio_new_function_t *		new;
+  fdio_ref_function_t *		_fdref;
+  fdio_deref_function_t *	_fdderef;
+  fdio_new_function_t *		_fdnew;
   fdio_fileno_function_t *	_fileno;
 
   fdio_open_function_t *	_open;
@@ -142,9 +142,9 @@ extern /*@null@*/ FILE *fdFdopen( /*@only@*/ void * cookie, const char * mode);
 #define	fdSeek		fdio->seek
 #endif
 
-#define	fdLink(_fd, _msg)	fdio->ref(_fd, _msg, __FILE__, __LINE__)
-#define	fdFree(_fd, _msg)	fdio->deref(_fd, _msg, __FILE__, __LINE__)
-#define	fdNew(_msg)		fdio->new(_msg, __FILE__, __LINE__)
+#define	fdLink(_fd, _msg)	fdio->_fdref(_fd, _msg, __FILE__, __LINE__)
+#define	fdFree(_fd, _msg)	fdio->_fdderef(_fd, _msg, __FILE__, __LINE__)
+#define	fdNew(_msg)		fdio->_fdnew(_msg, __FILE__, __LINE__)
 
 int	fdWritable(FD_t fd, int secs);
 int	fdReadable(FD_t fd, int secs);
@@ -180,9 +180,9 @@ int	ufdGetFile( /*@killref@*/ FD_t sfd, FD_t tfd);
 #define	ufdWrite	ufdio->write
 #define	ufdSeek		ufdio->seek
 #define	ufdClose	ufdio->close
-#define	ufdLink		ufdio->ref
-#define	ufdFree		ufdio->deref
-#define	ufdNew		ufdio->new
+#define	ufdLink		ufdio->_fdref
+#define	ufdFree		ufdio->_fdderef
+#define	ufdNew		ufdio->_fdnew
 #define	ufdFileno	ufdio->_fileno
 #define	ufdOpen		ufdio->_open
 #define	ufdFopen	ufdio->_fopen
diff --git a/lib/url.c b/lib/url.c
index 474adf941..aa0918694 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -80,7 +80,7 @@ DBGREFS(0, (stderr, "--> url %p -- %d %s at %s:%u\n", u, u->nrefs, msg, file, li
 	Fclose(u->ctrl);
 #endif
 
-	u->ctrl = fdio->deref(u->ctrl, "persist ctrl (urlFree)", file, line);
+	u->ctrl = fdio->_fdderef(u->ctrl, "persist ctrl (urlFree)", file, line);
 	if (u->ctrl)
 	    fprintf(stderr, _("warning: u %p ctrl %p nrefs != 0 (%s %s)\n"),
 			u, u->ctrl, u->host, u->service);
@@ -97,7 +97,7 @@ DBGREFS(0, (stderr, "--> url %p -- %d %s at %s:%u\n", u, u->nrefs, msg, file, li
 	Fclose(u->ctrl);
 #endif
 
-	u->data = fdio->deref(u->data, "persist data (urlFree)", file, line);
+	u->data = fdio->_fdderef(u->data, "persist data (urlFree)", file, line);
 	if (u->data)
 	    fprintf(stderr, _("warning: u %p data %p nrefs != 0 (%s %s)\n"),
 			u, u->data, u->host, u->service);
diff --git a/po/cs.po b/po/cs.po
index e86cee362..8762316f7 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-12-16 14:22-0500\n"
+"POT-Creation-Date: 1999-12-16 15:59-0500\n"
 "PO-Revision-Date: 1998-10-10 10:10+0200\n"
 "Last-Translator: Pavel Makovec <pavelm@terminal.cz>\n"
 "Language-Team: Czech <pavelm@terminal.cz>\n"
diff --git a/po/de.po b/po/de.po
index 975a7baf3..72fc18998 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 2.5.2\n"
-"POT-Creation-Date: 1999-12-16 14:22-0500\n"
+"POT-Creation-Date: 1999-12-16 15:59-0500\n"
 "PO-Revision-Date: 1998-08-03 18:02+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
 "Language-Team: German <de@li.org>\n"
diff --git a/po/fi.po b/po/fi.po
index 8f957a4e1..6229e256f 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-12-16 14:22-0500\n"
+"POT-Creation-Date: 1999-12-16 15:59-0500\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
diff --git a/po/fr.po b/po/fr.po
index dd56ca114..f93d868ce 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 msgid ""
-msgstr "POT-Creation-Date: 1999-12-16 14:22-0500\n"
+msgstr "POT-Creation-Date: 1999-12-16 15:59-0500\n"
 
 #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:424
 #, c-format
diff --git a/po/pl.po b/po/pl.po
index ed5877319..dcb6fed10 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm-3.0.2\n"
-"POT-Creation-Date: 1999-12-16 14:22-0500\n"
+"POT-Creation-Date: 1999-12-16 15:59-0500\n"
 "PO-Revision-Date: 1999-05-25 17:00+0100\n"
 "Last-Translator: Paweł Dziekoński <pdziekonski@mml.ch.pwr.wroc.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e3dcf9acd..07702a1c0 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,7 +2,7 @@
 # Revised by Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 1998.
 #
 msgid ""
-msgstr "POT-Creation-Date: 1999-12-16 14:22-0500\n"
+msgstr "POT-Creation-Date: 1999-12-16 15:59-0500\n"
 
 #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:424
 #, c-format
diff --git a/po/rpm.pot b/po/rpm.pot
index 1173c0327..7ef882083 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-12-16 14:22-0500\n"
+"POT-Creation-Date: 1999-12-16 15:59-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ru.po b/po/ru.po
index 4723e15a5..85cbf617d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-12-16 14:22-0500\n"
+"POT-Creation-Date: 1999-12-16 15:59-0500\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/sk.po b/po/sk.po
index d2abf0da1..427a8bd34 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 2.93\n"
-"POT-Creation-Date: 1999-12-16 14:22-0500\n"
+"POT-Creation-Date: 1999-12-16 15:59-0500\n"
 "PO-Revision-Date: 1999-04-08 21:37+02:00\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/sr.po b/po/sr.po
index 9d9363111..a83a2a24a 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-12-16 14:22-0500\n"
+"POT-Creation-Date: 1999-12-16 15:59-0500\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 "From: Erik Troan <ewt@lacrosse.redhat.com>\n"
diff --git a/po/sv.po b/po/sv.po
index 2617bf89f..7f2a3caa5 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,5 +1,5 @@
 msgid ""
-msgstr "POT-Creation-Date: 1999-12-16 14:22-0500\n"
+msgstr "POT-Creation-Date: 1999-12-16 15:59-0500\n"
 
 #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:424
 #, c-format
diff --git a/po/tr.po b/po/tr.po
index 391db4376..2330a8eb3 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-12-16 14:22-0500\n"
+"POT-Creation-Date: 1999-12-16 15:59-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/rpm.spec b/rpm.spec
index 683274b69..c95350b2c 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -2,7 +2,7 @@ Summary: The Red Hat package management system.
 Name: rpm
 %define version 3.0.4
 Version: %{version}
-Release: 0.16
+Release: 0.17
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz
 Copyright: GPL