Skip to content

Commit

Permalink
Rename the internal rpmpgp.h header to rpmpgpval.h for clarity
Browse files Browse the repository at this point in the history
Commit d8bb57e 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 650ba79.

No functional changes.

(cherry picked from commit 547acb6)
  • Loading branch information
pmatilai committed Aug 17, 2022
1 parent 54a3dfc commit f6b9531
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion rpmio/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion rpmio/rpmpgp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion rpmio/rpmpgp_internal.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
File renamed without changes.

0 comments on commit f6b9531

Please sign in to comment.