Move stringbuf into librpmio, rename header
- rename header to more generic rpmstring.h for collecting misc string helper functions
This commit is contained in:
Panu Matilainen
parent
abeea80a38
commit
d6990c3ab1
|
|
@ -46,6 +46,7 @@ pkginclude_HEADERS += rpmio/rpmlog.h
|
|||
pkginclude_HEADERS += rpmio/rpmmessages.h
|
||||
pkginclude_HEADERS += rpmio/rpmpgp.h
|
||||
pkginclude_HEADERS += rpmio/rpmsq.h
|
||||
pkginclude_HEADERS += rpmio/rpmstring.h
|
||||
pkginclude_HEADERS += rpmio/rpmsw.h
|
||||
|
||||
pkginclude_HEADERS += rpmdb/header.h
|
||||
|
|
@ -62,7 +63,6 @@ pkginclude_HEADERS += lib/rpmgi.h
|
|||
pkginclude_HEADERS += lib/rpmps.h
|
||||
pkginclude_HEADERS += lib/rpmte.h
|
||||
pkginclude_HEADERS += lib/rpmts.h
|
||||
pkginclude_HEADERS += lib/stringbuf.h
|
||||
|
||||
pkginclude_HEADERS += build/rpmbuild.h
|
||||
pkginclude_HEADERS += build/rpmfc.h
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
#include <rpmcli.h>
|
||||
|
||||
/* and it shouldn't need these :-( */
|
||||
#include <stringbuf.h>
|
||||
#include <rpmstring.h>
|
||||
|
||||
/* but this will be needed */
|
||||
#include <rpmspec.h>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
#include <rpmlib.h> /* for rpmds, rpmSpec */
|
||||
#include <argv.h> /* for ARGV_t */
|
||||
#include <stringbuf.h> /* for StringBuf */
|
||||
#include <rpmstring.h> /* for StringBuf */
|
||||
#include <rpmspec.h> /* for Package */
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
* The rpmSpec and Package data structures used during build.
|
||||
*/
|
||||
|
||||
#include <stringbuf.h> /* StringBuf */
|
||||
#include <rpmstring.h> /* StringBuf */
|
||||
#include <rpmcli.h> /* for QVA_t */
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ librpm_la_SOURCES = \
|
|||
rpmal.c rpmchecksig.c rpmds.c rpmfi.c rpmgi.c rpmgi_internal.h \
|
||||
rpminstall.c rpmtsscore.h rpmts_internal.h \
|
||||
rpmlead.c rpmlead.h rpmlibprov.c rpmps.c rpmrc.c rpmte.c rpmts.c \
|
||||
rpmvercmp.c signature.c signature.h stringbuf.c transaction.c \
|
||||
rpmvercmp.c signature.c signature.h transaction.c \
|
||||
verify.c rpmlock.c rpmlock.h misc.h
|
||||
librpm_la_LDFLAGS = -release 4.4
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
#include <rpmlib.h>
|
||||
#include <rpmmacro.h>
|
||||
|
||||
#include <stringbuf.h>
|
||||
#include <rpmstring.h>
|
||||
#include "manifest.h"
|
||||
#include "debug.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -34,6 +34,10 @@ include/rpm/rpmsq.h: rpmio/rpmsq.h include/rpm/.dirstamp
|
|||
$(INSTALL_DATA) $(top_srcdir)/rpmio/rpmsq.h include/rpm/rpmsq.h
|
||||
BUILT_SOURCES += include/rpm/rpmsq.h
|
||||
CLEANFILES += include/rpm/rpmsq.h
|
||||
include/rpm/rpmstring.h: rpmio/rpmstring.h include/rpm/.dirstamp
|
||||
$(INSTALL_DATA) $(top_srcdir)/rpmio/rpmstring.h include/rpm/rpmstring.h
|
||||
BUILT_SOURCES += include/rpm/rpmstring.h
|
||||
CLEANFILES += include/rpm/rpmstring.h
|
||||
include/rpm/rpmsw.h: rpmio/rpmsw.h include/rpm/.dirstamp
|
||||
$(INSTALL_DATA) $(top_srcdir)/rpmio/rpmsw.h include/rpm/rpmsw.h
|
||||
BUILT_SOURCES += include/rpm/rpmsw.h
|
||||
|
|
@ -86,10 +90,6 @@ include/rpm/rpmts.h: lib/rpmts.h include/rpm/.dirstamp
|
|||
$(INSTALL_DATA) $(top_srcdir)/lib/rpmts.h include/rpm/rpmts.h
|
||||
BUILT_SOURCES += include/rpm/rpmts.h
|
||||
CLEANFILES += include/rpm/rpmts.h
|
||||
include/rpm/stringbuf.h: lib/stringbuf.h include/rpm/.dirstamp
|
||||
$(INSTALL_DATA) $(top_srcdir)/lib/stringbuf.h include/rpm/stringbuf.h
|
||||
BUILT_SOURCES += include/rpm/stringbuf.h
|
||||
CLEANFILES += include/rpm/stringbuf.h
|
||||
include/rpm/rpmbuild.h: build/rpmbuild.h include/rpm/.dirstamp
|
||||
$(INSTALL_DATA) $(top_srcdir)/build/rpmbuild.h include/rpm/rpmbuild.h
|
||||
BUILT_SOURCES += include/rpm/rpmbuild.h
|
||||
|
|
|
|||
|
|
@ -14,7 +14,9 @@ librpmio_la_SOURCES = \
|
|||
argv.c base64.c digest.h digest.c fts.c macro.c \
|
||||
rpmhook.c rpmio.c rpmlog.c rpmlua.c rpmmalloc.c \
|
||||
rpmpgp.c rpmrpc.c rpmsq.c rpmsw.c strcasecmp.c url.c ugid.c \
|
||||
rpmio_internal.h rpmlua.h rpmhook.h ugid.h fts.h
|
||||
rpmio_internal.h rpmlua.h rpmhook.h ugid.h fts.h \
|
||||
rpmstring.c
|
||||
|
||||
librpmio_la_LDFLAGS = -release 4.4
|
||||
librpmio_la_LIBADD = \
|
||||
../misc/libmisc.la \
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
/**
|
||||
* \file lib/stringbuf.c
|
||||
* \file rpmio/rpmstring.c
|
||||
*/
|
||||
|
||||
#include "system.h"
|
||||
|
||||
#include <stringbuf.h>
|
||||
#include <rpmstring.h>
|
||||
#include "debug.h"
|
||||
|
||||
#define BUF_CHUNK 1024
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef _STRINGBUF_H_
|
||||
#define _STRINGBUF_H_
|
||||
#ifndef _RPMSTRING_H_
|
||||
#define _RPMSTRING_H_
|
||||
|
||||
/** \file lib/stringbuf.h
|
||||
/** \file rpmio/rpmstring.h
|
||||
*
|
||||
*/
|
||||
|
||||
|
|
@ -49,4 +49,4 @@ void appendStringBufAux(StringBuf sb, const char * s, int nl);
|
|||
}
|
||||
#endif
|
||||
|
||||
#endif /* _STRINGBUF_H_ */
|
||||
#endif /* _RPMSTRING_H_ */
|
||||
Loading…
Reference in New Issue