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

Bury FTS inside librpmbuild and eliminate from public ABI

This commit is contained in:
Panu Matilainen 2010-03-19 18:23:52 +02:00
parent a0c2c6ed83
commit ad43e72d70
5 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/Makefile.am
View File

@ -12,7 +12,8 @@ librpmbuild_la_SOURCES = \
build.c buildio.h expression.c files.c misc.c names.c pack.c \
parseBuildInstallClean.c parseChangelog.c parseDescription.c \
parseFiles.c parsePreamble.c parsePrep.c parseReqs.c parseScript.c \
parseSpec.c poptBT.c reqprov.c rpmfc.c spec.c
parseSpec.c poptBT.c reqprov.c rpmfc.c spec.c fts.h fts.c
librpmbuild_la_LDFLAGS = -version-info 1:0:0
librpmbuild_la_LIBADD = \
$(top_builddir)/lib/librpm.la \

2
build/files.c
View File

@ -23,7 +23,7 @@
#include "rpmio/rpmio_internal.h" /* XXX rpmioSlurp */
#include "rpmio/base64.h"
#include "rpmio/fts.h"
#include "build/fts.h"
#include "lib/cpio.h"
#include "lib/rpmfi_internal.h" /* XXX fi->apath */
#include "build/buildio.h"

4
rpmio/fts.c → build/fts.c
View File

@ -37,7 +37,7 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
#include <fcntl.h>
#include <dirent.h>
#include <errno.h>
#include "rpmio/fts.h"
#include "build/fts.h"
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
@ -63,7 +63,7 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
#include "system.h"
#include <string.h>
#include <errno.h>
#include "rpmio/fts.h"
#include "build/fts.h"
#include <rpm/rpmio.h>
#include <rpm/rpmurl.h>
# define __set_errno(val) (*__errno_location ()) = (val)

7
rpmio/fts.h → build/fts.h
View File

@ -32,6 +32,8 @@
#ifndef _FTS_H
#define _FTS_H 1
#include <rpm/rpmutil.h>
#if defined(__GLIBC__)
#include <features.h>
#else
@ -157,6 +159,7 @@ __BEGIN_DECLS
* @param instr
* @return file set member
*/
RPM_GNUC_INTERNAL
FTSENT *Fts_children (FTS * sp, int instr) __THROW
;
@ -165,6 +168,7 @@ FTSENT *Fts_children (FTS * sp, int instr) __THROW
* @param sp file hierarchy state
* @return 0 on sucess, -1 on error
*/
RPM_GNUC_INTERNAL
int Fts_close (FTS * sp) __THROW
;
@ -175,6 +179,7 @@ int Fts_close (FTS * sp) __THROW
* @param compar traversal ordering (or NULL)
* @return file hierarchy state (or NULL on error)
*/
RPM_GNUC_INTERNAL
FTS *Fts_open (char * const * argv, int options,
int (*compar) (const FTSENT **, const FTSENT **)) __THROW
;
@ -184,6 +189,7 @@ FTS *Fts_open (char * const * argv, int options,
* @param sp file hierarchy state
* @return file set member
*/
RPM_GNUC_INTERNAL
FTSENT *Fts_read (FTS * sp) __THROW
;
@ -194,6 +200,7 @@ FTSENT *Fts_read (FTS * sp) __THROW
* @param instr new disposition for file set member
* @return 0 on sucess, -1 on error
*/
RPM_GNUC_INTERNAL
int Fts_set (FTS * sp, FTSENT * p, int instr) __THROW
;

4
rpmio/Makefile.am
View File

@ -11,10 +11,10 @@ AM_CPPFLAGS += -DLOCALSTATEDIR="\"$(localstatedir)\""
usrlibdir = $(libdir)
usrlib_LTLIBRARIES = librpmio.la
librpmio_la_SOURCES = \
argv.c base64.h base64.c digest.h digest.c fts.c macro.c \
argv.c base64.h base64.c digest.h digest.c macro.c \
rpmhook.c rpmio.c rpmlog.c rpmlua.c rpmmalloc.c \
rpmpgp.c rpmsq.c rpmsw.c url.c \
rpmio_internal.h rpmlua.h rpmhook.h fts.h \
rpmio_internal.h rpmlua.h rpmhook.h \
rpmstring.c rpmfileutil.c \
rpmkeyring.c