diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2022-04-13 09:59:45 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2022-08-17 13:50:46 +0300 |
| commit | f6b95310afddc7525358ca3ec0036b6c44afb54d (patch) | |
| tree | 5dfcdcaea303ab767ea828d3ba208b537b09787c | |
| parent | 54a3dfc0a4e214f277c4795fe4acdf5e12835c0b (diff) | |
| download | rpm-f6b95310afddc7525358ca3ec0036b6c44afb54d.tar.gz | |
Rename the internal rpmpgp.h header to rpmpgpval.h for clarity
Commit d8bb57eeabe249c2c85bf46b1162d7e57a310e37 reintroduced
rpmio/rpmpgp.h which is quite confusing when we have a public header by
the same name elsewhere, and doubly more confusing to those of use who
are used to having the public header by the same name in this very
location prior to commit 650ba79f2253656f9ec8e06f399fafe40e556ed3.
No functional changes.
(cherry picked from commit 547acb66961e912a4be05bdbd32ab7f3aeac7357)
| -rw-r--r-- | rpmio/Makefile.am | 2 | ||||
| -rw-r--r-- | rpmio/rpmpgp.c | 2 | ||||
| -rw-r--r-- | rpmio/rpmpgp_internal.c | 2 | ||||
| -rw-r--r-- | rpmio/rpmpgpval.h (renamed from rpmio/rpmpgp.h) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am index 35718cbf8..d91dd1261 100644 --- a/rpmio/Makefile.am +++ b/rpmio/Makefile.am @@ -20,7 +20,7 @@ usrlib_LTLIBRARIES = librpmio.la librpmio_la_SOURCES = \ argv.c base64.c digest.h digest.c expression.c macro.c \ rpmhook.c rpmio.c rpmlog.c rpmmalloc.c rgetopt.c \ - rpmpgp.c rpmpgp.h rpmsq.c rpmsw.c url.c \ + rpmpgp.c rpmpgpval.h rpmsq.c rpmsw.c url.c \ rpmio_internal.h rpmhook.h rpmvercmp.c rpmver.c \ rpmstring.c rpmfileutil.c rpmglob.c \ rpmkeyring.c rpmstrpool.c rpmmacro_internal.h \ diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c index efff7ff06..15eff36e9 100644 --- a/rpmio/rpmpgp.c +++ b/rpmio/rpmpgp.c @@ -11,7 +11,7 @@ #include <rpm/rpmlog.h> #include "rpmio/digest.h" -#include "rpmio/rpmpgp.h" +#include "rpmio/rpmpgpval.h" #include "rpmio/rpmio_internal.h" /* XXX rpmioSlurp */ #include "debug.h" diff --git a/rpmio/rpmpgp_internal.c b/rpmio/rpmpgp_internal.c index fde8c3329..c4fab303b 100644 --- a/rpmio/rpmpgp_internal.c +++ b/rpmio/rpmpgp_internal.c @@ -12,7 +12,7 @@ #include <rpm/rpmbase64.h> #include "rpmio/digest.h" -#include "rpmio/rpmpgp.h" +#include "rpmio/rpmpgpval.h" #include "rpmio/rpmio_internal.h" /* XXX rpmioSlurp */ #include "debug.h" diff --git a/rpmio/rpmpgp.h b/rpmio/rpmpgpval.h index 0641f0803..0641f0803 100644 --- a/rpmio/rpmpgp.h +++ b/rpmio/rpmpgpval.h |