folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

CVS patchset: 3488
CVS date: 1999/12/16 21:58:19
This commit is contained in:
jbj 1999-12-16 21:58:19 +00:00
parent 82a546f8f4
commit eddf0228f5
16 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -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.

18
lib/rpmio.h
View File

@ -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

4
lib/url.c
View File

@ -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);

2
po/cs.po
View File

@ -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"

2
po/de.po
View File

@ -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"

2
po/fi.po
View File

@ -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"

2
po/fr.po
View File

@ -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

2
po/pl.po
View File

@ -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"

2
po/pt_BR.po
View File

@ -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

2
po/rpm.pot
View File

@ -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"

2
po/ru.po
View File

@ -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"

2
po/sk.po
View File

@ -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"

2
po/sr.po
View File

@ -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"

2
po/sv.po
View File

@ -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

2
po/tr.po
View File

@ -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"

2
rpm.spec
View File

@ -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