diff options
author | Panu Matilainen <pmatilai@redhat.com> | 2007-12-08 14:02:32 +0200 |
---|---|---|
committer | Panu Matilainen <pmatilai@redhat.com> | 2007-12-08 14:02:32 +0200 |
commit | 9ce13e09ef42ea4efca3c624054b0b719f06a43b (patch) | |
tree | 1660a7c311fba0c86afba2cacea8669f07b8eb51 /rpmio | |
parent | 179ebc1745b51eb9821dd783c9df475ac539532d (diff) | |
download | rpm-9ce13e09ef42ea4efca3c624054b0b719f06a43b.tar.gz rpm-9ce13e09ef42ea4efca3c624054b0b719f06a43b.tar.bz2 rpm-9ce13e09ef42ea4efca3c624054b0b719f06a43b.zip |
Switch to <rpm/foo.h> style for public headers
- adjust include paths accordingly
Diffstat (limited to 'rpmio')
-rw-r--r-- | rpmio/Makefile.am | 2 | ||||
-rw-r--r-- | rpmio/argv.c | 2 | ||||
-rw-r--r-- | rpmio/digest.h | 2 | ||||
-rw-r--r-- | rpmio/fts.c | 4 | ||||
-rw-r--r-- | rpmio/macro.c | 12 | ||||
-rw-r--r-- | rpmio/rpmfileutil.c | 10 | ||||
-rw-r--r-- | rpmio/rpmfileutil.h | 4 | ||||
-rw-r--r-- | rpmio/rpmio.c | 8 | ||||
-rw-r--r-- | rpmio/rpmio.h | 2 | ||||
-rw-r--r-- | rpmio/rpmio_internal.h | 8 | ||||
-rw-r--r-- | rpmio/rpmlog.c | 2 | ||||
-rw-r--r-- | rpmio/rpmlua.c | 8 | ||||
-rw-r--r-- | rpmio/rpmpgp.c | 2 | ||||
-rw-r--r-- | rpmio/rpmpgp.h | 2 | ||||
-rw-r--r-- | rpmio/rpmsq.c | 2 | ||||
-rw-r--r-- | rpmio/rpmsq.h | 2 | ||||
-rw-r--r-- | rpmio/rpmstring.c | 2 | ||||
-rw-r--r-- | rpmio/rpmsw.c | 2 | ||||
-rw-r--r-- | rpmio/strcasecmp.c | 2 | ||||
-rw-r--r-- | rpmio/tax.c | 2 | ||||
-rw-r--r-- | rpmio/tdir.c | 4 | ||||
-rw-r--r-- | rpmio/tfts.c | 4 | ||||
-rw-r--r-- | rpmio/tget.c | 4 | ||||
-rw-r--r-- | rpmio/tglob.c | 4 | ||||
-rw-r--r-- | rpmio/thkp.c | 4 | ||||
-rw-r--r-- | rpmio/tput.c | 4 | ||||
-rw-r--r-- | rpmio/trpmio.c | 2 | ||||
-rw-r--r-- | rpmio/tsw.c | 2 | ||||
-rw-r--r-- | rpmio/tufdio.c | 2 | ||||
-rw-r--r-- | rpmio/url.c | 8 |
30 files changed, 59 insertions, 59 deletions
diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am index 093cccde7..7f33c4ce9 100644 --- a/rpmio/Makefile.am +++ b/rpmio/Makefile.am @@ -1,6 +1,6 @@ # Makefile for rpm library. -AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/rpm +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/ AM_CPPFLAGS += @WITH_NSS_INCLUDE@ AM_CPPFLAGS += @WITH_LUA_INCLUDE@ AM_CPPFLAGS += @WITH_POPT_INCLUDE@ diff --git a/rpmio/argv.c b/rpmio/argv.c index 64cfd64c2..c39c9d118 100644 --- a/rpmio/argv.c +++ b/rpmio/argv.c @@ -4,7 +4,7 @@ #include "system.h" -#include <argv.h> +#include <rpm/argv.h> #include "debug.h" diff --git a/rpmio/digest.h b/rpmio/digest.h index 0abc45570..c4dabb855 100644 --- a/rpmio/digest.h +++ b/rpmio/digest.h @@ -2,7 +2,7 @@ #define _RPMDIGEST_H #include "rpmio/base64.h" -#include <rpmpgp.h> +#include <rpm/rpmpgp.h> #include <nss.h> #include <sechash.h> diff --git a/rpmio/fts.c b/rpmio/fts.c index 4b747a961..7c34700a6 100644 --- a/rpmio/fts.c +++ b/rpmio/fts.c @@ -64,8 +64,8 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94"; #endif #include "system.h" #include "rpmio/fts.h" -#include <rpmio.h> -#include <rpmurl.h> +#include <rpm/rpmio.h> +#include <rpm/rpmurl.h> # define __set_errno(val) (*__errno_location ()) = (val) # define __open open # define __close close diff --git a/rpmio/macro.c b/rpmio/macro.c index 2c1ca0416..753ee9be7 100644 --- a/rpmio/macro.c +++ b/rpmio/macro.c @@ -12,17 +12,17 @@ #define STREQ(_t, _f, _fn) ((_fn) == (sizeof(_t)-1) && !strncmp((_t), (_f), (_fn))) -#include <rpmio.h> -#include <rpmstring.h> -#include <rpmfileutil.h> -#include <rpmurl.h> -#include <rpmlog.h> +#include <rpm/rpmio.h> +#include <rpm/rpmstring.h> +#include <rpm/rpmfileutil.h> +#include <rpm/rpmurl.h> +#include <rpm/rpmlog.h> #ifdef WITH_LUA #include "rpmio/rpmlua.h" #endif -#include <rpmmacro.h> +#include <rpm/rpmmacro.h> #include "debug.h" diff --git a/rpmio/rpmfileutil.c b/rpmio/rpmfileutil.c index a1e128776..b3323db3a 100644 --- a/rpmio/rpmfileutil.c +++ b/rpmio/rpmfileutil.c @@ -14,11 +14,11 @@ #endif #include "rpmio/rpmio_internal.h" -#include <rpmfileutil.h> -#include <rpmurl.h> -#include <rpmmacro.h> -#include <rpmlog.h> -#include <argv.h> +#include <rpm/rpmfileutil.h> +#include <rpm/rpmurl.h> +#include <rpm/rpmmacro.h> +#include <rpm/rpmlog.h> +#include <rpm/argv.h> static int open_dso(const char * path, pid_t * pidp, size_t *fsizep) { diff --git a/rpmio/rpmfileutil.h b/rpmio/rpmfileutil.h index 9c49ffaff..0fd68141e 100644 --- a/rpmio/rpmfileutil.h +++ b/rpmio/rpmfileutil.h @@ -6,8 +6,8 @@ * File and path manipulation helper functions. */ -#include <rpmio.h> -#include <rpmpgp.h> +#include <rpm/rpmio.h> +#include <rpm/rpmpgp.h> /** \ingroup rpmfileutil */ diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c index 0aae1f705..21cd92123 100644 --- a/rpmio/rpmio.c +++ b/rpmio/rpmio.c @@ -24,10 +24,10 @@ extern int h_errno; #include "rpmio/rpmio_internal.h" #include "rpmio/ugid.h" -#include <argv.h> -#include <rpmlog.h> -#include <rpmmacro.h> -#include <rpmfileutil.h> +#include <rpm/argv.h> +#include <rpm/rpmlog.h> +#include <rpm/rpmmacro.h> +#include <rpm/rpmfileutil.h> #include "debug.h" diff --git a/rpmio/rpmio.h b/rpmio/rpmio.h index 65bacffb4..38d5e10a7 100644 --- a/rpmio/rpmio.h +++ b/rpmio/rpmio.h @@ -12,7 +12,7 @@ #include <stdlib.h> #include <unistd.h> -#include <rpmsw.h> +#include <rpm/rpmsw.h> #ifdef __cplusplus extern "C" { diff --git a/rpmio/rpmio_internal.h b/rpmio/rpmio_internal.h index 256fc2c85..3af593b4f 100644 --- a/rpmio/rpmio_internal.h +++ b/rpmio/rpmio_internal.h @@ -7,11 +7,11 @@ #include <assert.h> -#include <rpmio.h> -#include <rpmurl.h> +#include <rpm/rpmio.h> +#include <rpm/rpmurl.h> -#include <rpmpgp.h> -#include <rpmsw.h> +#include <rpm/rpmpgp.h> +#include <rpm/rpmsw.h> #include "rpmio/digest.h" /** \ingroup rpmio diff --git a/rpmio/rpmlog.c b/rpmio/rpmlog.c index 73d7c4029..450e57fe4 100644 --- a/rpmio/rpmlog.c +++ b/rpmio/rpmlog.c @@ -4,7 +4,7 @@ #include "system.h" #include <stdarg.h> -#include <rpmlog.h> +#include <rpm/rpmlog.h> #include "debug.h" static int nrecs = 0; diff --git a/rpmio/rpmlua.c b/rpmio/rpmlua.c index 142613ca5..a13e698d3 100644 --- a/rpmio/rpmlua.c +++ b/rpmio/rpmlua.c @@ -1,10 +1,10 @@ #include "system.h" #ifdef WITH_LUA -#include <rpmio.h> -#include <rpmmacro.h> -#include <rpmlog.h> -#include <rpmurl.h> +#include <rpm/rpmio.h> +#include <rpm/rpmmacro.h> +#include <rpm/rpmlog.h> +#include <rpm/rpmurl.h> #include "rpmio/rpmhook.h" #include <lua.h> diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c index 7b38a3db3..c556d12d3 100644 --- a/rpmio/rpmpgp.c +++ b/rpmio/rpmpgp.c @@ -7,7 +7,7 @@ #include "rpmio/digest.h" #include "rpmio/rpmio_internal.h" /* XXX rpmioSlurp */ -#include <rpmstring.h> +#include <rpm/rpmstring.h> #include "debug.h" diff --git a/rpmio/rpmpgp.h b/rpmio/rpmpgp.h index 8186b0772..a174c3b86 100644 --- a/rpmio/rpmpgp.h +++ b/rpmio/rpmpgp.h @@ -12,7 +12,7 @@ #include <string.h> #include <stdio.h> -#include <rpmints.h> +#include <rpm/rpmints.h> #ifdef __cplusplus extern "C" { diff --git a/rpmio/rpmsq.c b/rpmio/rpmsq.c index 466e548fd..d1cfc7119 100644 --- a/rpmio/rpmsq.c +++ b/rpmio/rpmsq.c @@ -64,7 +64,7 @@ static pthread_mutex_t rpmsigTbl_lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; #endif /* HAVE_PTHREAD_H */ #define _RPMSQ_INTERNAL -#include <rpmsq.h> +#include <rpm/rpmsq.h> #include "debug.h" diff --git a/rpmio/rpmsq.h b/rpmio/rpmsq.h index 42a2d6d89..bbb7c1890 100644 --- a/rpmio/rpmsq.h +++ b/rpmio/rpmsq.h @@ -6,7 +6,7 @@ * */ -#include <rpmsw.h> +#include <rpm/rpmsw.h> #ifdef __cplusplus extern "C" { diff --git a/rpmio/rpmstring.c b/rpmio/rpmstring.c index 3e747b12f..dae235949 100644 --- a/rpmio/rpmstring.c +++ b/rpmio/rpmstring.c @@ -4,7 +4,7 @@ #include "system.h" -#include <rpmstring.h> +#include <rpm/rpmstring.h> #include "debug.h" #define BUF_CHUNK 1024 diff --git a/rpmio/rpmsw.c b/rpmio/rpmsw.c index d530d5427..ea17afbec 100644 --- a/rpmio/rpmsw.c +++ b/rpmio/rpmsw.c @@ -3,7 +3,7 @@ */ #include "system.h" -#include <rpmsw.h> +#include <rpm/rpmsw.h> #include "debug.h" static rpmtime_t rpmsw_overhead = 0; diff --git a/rpmio/strcasecmp.c b/rpmio/strcasecmp.c index 686851d4c..79f030a10 100644 --- a/rpmio/strcasecmp.c +++ b/rpmio/strcasecmp.c @@ -3,7 +3,7 @@ */ #include "system.h" -#include <rpmstring.h> +#include <rpm/rpmstring.h> #include "debug.h" int xstrcasecmp(const char * s1, const char * s2) diff --git a/rpmio/tax.c b/rpmio/tax.c index 2f0f6407d..5c2621492 100644 --- a/rpmio/tax.c +++ b/rpmio/tax.c @@ -1,6 +1,6 @@ #include "system.h" -#include <rpmpgp.h> +#include <rpm/rpmpgp.h> #include "rpmio/base64.h" #include <popt.h> diff --git a/rpmio/tdir.c b/rpmio/tdir.c index df12f9ed6..3e673b159 100644 --- a/rpmio/tdir.c +++ b/rpmio/tdir.c @@ -1,8 +1,8 @@ #include "system.h" #include "rpmio/rpmio_internal.h" -#include <rpmmacro.h> -#include <rpmlog.h> +#include <rpm/rpmmacro.h> +#include <rpm/rpmlog.h> #include <popt.h> #include "debug.h" diff --git a/rpmio/tfts.c b/rpmio/tfts.c index 62a9e5076..dbf141774 100644 --- a/rpmio/tfts.c +++ b/rpmio/tfts.c @@ -2,8 +2,8 @@ #include "rpmio/fts.h" #include "rpmio/rpmio_internal.h" -#include <rpmmacro.h> -#include <rpmlog.h> +#include <rpm/rpmmacro.h> +#include <rpm/rpmlog.h> #include <popt.h> #include "debug.h" diff --git a/rpmio/tget.c b/rpmio/tget.c index 9e4f21eef..18e5d14ba 100644 --- a/rpmio/tget.c +++ b/rpmio/tget.c @@ -1,8 +1,8 @@ #include "system.h" #include "rpmio/rpmio_internal.h" -#include <rpmmacro.h> -#include <rpmlog.h> +#include <rpm/rpmmacro.h> +#include <rpm/rpmlog.h> #include <popt.h> #include "debug.h" diff --git a/rpmio/tglob.c b/rpmio/tglob.c index 3f51ea08c..213c4039d 100644 --- a/rpmio/tglob.c +++ b/rpmio/tglob.c @@ -1,8 +1,8 @@ #include "system.h" #include "rpmio/rpmio_internal.h" -#include <rpmmacro.h> -#include <rpmlog.h> +#include <rpm/rpmmacro.h> +#include <rpm/rpmlog.h> #include <popt.h> #include "debug.h" diff --git a/rpmio/thkp.c b/rpmio/thkp.c index d5a1e0084..133d8413b 100644 --- a/rpmio/thkp.c +++ b/rpmio/thkp.c @@ -1,8 +1,8 @@ #include "system.h" #include "rpmio/rpmio_internal.h" -#include <rpmmacro.h> -#include <rpmlog.h> +#include <rpm/rpmmacro.h> +#include <rpm/rpmlog.h> #include <popt.h> #include "debug.h" diff --git a/rpmio/tput.c b/rpmio/tput.c index c337e161b..4814d0ddd 100644 --- a/rpmio/tput.c +++ b/rpmio/tput.c @@ -1,8 +1,8 @@ #include "system.h" #include "rpmio/rpmio_internal.h" -#include <rpmmacro.h> -#include <rpmlog.h> +#include <rpm/rpmmacro.h> +#include <rpm/rpmlog.h> #include <popt.h> #include "debug.h" diff --git a/rpmio/trpmio.c b/rpmio/trpmio.c index 3d58b72f6..3438bee96 100644 --- a/rpmio/trpmio.c +++ b/rpmio/trpmio.c @@ -3,7 +3,7 @@ */ #include <stdio.h> -#include <rpmio.h> +#include <rpm/rpmio.h> #include "debug.h" int main (void) diff --git a/rpmio/tsw.c b/rpmio/tsw.c index f9c4518e4..e68f36bf8 100644 --- a/rpmio/tsw.c +++ b/rpmio/tsw.c @@ -1,5 +1,5 @@ #include "system.h" -#include <rpmsw.h> +#include <rpm/rpmsw.h> #include "debug.h" int diff --git a/rpmio/tufdio.c b/rpmio/tufdio.c index f2751add8..3345bccbd 100644 --- a/rpmio/tufdio.c +++ b/rpmio/tufdio.c @@ -4,7 +4,7 @@ #include "system.h" -#include <rpmurl.h> +#include <rpm/rpmurl.h> #include "rpmio/rpmio_internal.h" #include <stdarg.h> diff --git a/rpmio/url.c b/rpmio/url.c index fd9a50d34..e6fbd6dc7 100644 --- a/rpmio/url.c +++ b/rpmio/url.c @@ -7,10 +7,10 @@ #include <assert.h> #include <netinet/in.h> -#include <rpmmacro.h> -#include <rpmlog.h> -#include <rpmurl.h> -#include <rpmio.h> +#include <rpm/rpmmacro.h> +#include <rpm/rpmlog.h> +#include <rpm/rpmurl.h> +#include <rpm/rpmio.h> #include "debug.h" |