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

Remove hidden --nolibio cli switch, avoid exporting noLibio

This commit is contained in:
Panu Matilainen 2008-02-26 22:04:17 +02:00
parent 2579e086c2
commit b010266b0e
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/poptALL.c
View File

@ -63,8 +63,6 @@ extern int _rpmts_debug;
extern int _rpmts_stats;
extern int noLibio;
const char * rpmcliPipeOutput = NULL;
const char * rpmcliRcfile = NULL;
@ -73,8 +71,6 @@ const char * rpmcliRootDir = "/";
rpmQueryFlags rpmcliQueryFlags;
extern int noLibio;
extern int _rpmio_debug;
static int rpmcliInitialized = -1;
@ -224,10 +220,6 @@ struct poptOption rpmcliAllPoptTable[] = {
N_("don't verify package digest(s)"), NULL },
{ "nohdrchk", '\0', POPT_ARGFLAG_DOC_HIDDEN, 0, RPMCLI_POPT_NOHDRCHK,
N_("don't verify database header(s) when retrieved"), NULL },
#if HAVE_LIBIO_H && defined(_G_IO_IO_FILE_VERSION)
{ "nolibio", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &noLibio, 1,
N_("disable use of libio(3) API"), NULL},
#endif
{ "nosignature", '\0', 0, 0, RPMCLI_POPT_NOSIGNATURE,
N_("don't verify package signature(s)"), NULL },
@ -258,11 +250,6 @@ struct poptOption rpmcliAllPoptTable[] = {
{ "version", '\0', 0, NULL, POPT_SHOWVERSION,
N_("print the version of rpm being used"), NULL },
#if HAVE_LIBIO_H && defined(_G_IO_IO_FILE_VERSION)
{ "nolibio", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &noLibio, 1,
N_("disable use of libio(3) API"), NULL},
#endif
{ "promoteepoch", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmds_nopromote, 0,
NULL, NULL},

5
rpmio/rpmio.c
View File

@ -44,9 +44,9 @@ extern int h_errno;
/**
*/
#if _USE_LIBIO
int noLibio = 0;
static int noLibio = 0;
#else
int noLibio = 1;
static int noLibio = 1;
#endif
#define TIMEOUT_SECS 60
@ -92,7 +92,6 @@ static FDIO_t fpio;
static FDIO_t ufdio;
static FDIO_t gzdio;
static FDIO_t bzdio;
static FDIO_t fadio;
/**
*/