diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt index 5f9aec9b8e..c5fc2d5196 100644 --- a/build/CMakeLists.txt +++ b/build/CMakeLists.txt @@ -4,13 +4,13 @@ set_target_properties(librpmbuild PROPERTIES SOVERSION ${RPM_SOVERSION} ) target_sources(librpmbuild PRIVATE - build.c files.c misc.c pack.c - parseSimpleScript.c parseChangelog.c parseDescription.c - parseFiles.c parsePreamble.c parsePrep.c parseReqs.c parseScript.c - parseSpec.c parseList.c reqprov.c rpmfc.c spec.c - parsePolicies.c policies.c - rpmbuild_internal.h rpmbuild_misc.h - speclua.c + build.cc files.cc misc.cc pack.cc + parseSimpleScript.cc parseChangelog.cc parseDescription.cc + parseFiles.cc parsePreamble.cc parsePrep.cc parseReqs.cc parseScript.cc + parseSpec.cc parseList.cc reqprov.cc rpmfc.cc spec.cc + parsePolicies.cc policies.cc + rpmbuild_internal.hh rpmbuild_misc.hh + speclua.cc ) target_include_directories(librpmbuild @@ -53,15 +53,6 @@ if(OpenMP_C_FOUND) target_link_libraries(librpmbuild PRIVATE OpenMP::OpenMP_C) endif() -set (cxx_sources - build.c files.c misc.c pack.c - parseChangelog.c parseDescription.c parseFiles.c parseList.c - parsePolicies.c parsePreamble.c parsePrep.c parseReqs.c - parseScript.c parseSimpleScript.c parseSpec.c - policies.c reqprov.c rpmfc.c - spec.c speclua.c -) -set_source_files_properties(${cxx_sources} PROPERTIES LANGUAGE CXX) if (OpenMP_C_FOUND) target_link_libraries(librpmbuild PRIVATE OpenMP::OpenMP_CXX) endif() diff --git a/build/build.c b/build/build.cc similarity index 99% rename from build/build.c rename to build/build.cc index 1f1afc3ef1..5ae1da45ac 100644 --- a/build/build.c +++ b/build/build.cc @@ -17,8 +17,8 @@ #include #include -#include "rpmbuild_internal.h" -#include "rpmbuild_misc.h" +#include "rpmbuild_internal.hh" +#include "rpmbuild_misc.hh" #include "debug.h" diff --git a/build/files.c b/build/files.cc similarity index 99% rename from build/files.c rename to build/files.cc index e184de625e..6f64748510 100644 --- a/build/files.c +++ b/build/files.cc @@ -31,11 +31,11 @@ #include #include -#include "rpmio_internal.h" /* XXX rpmioSlurp */ +#include "rpmio_internal.hh" /* XXX rpmioSlurp */ #include "rpmfts.h" -#include "rpmfi_internal.h" /* XXX fi->apath */ -#include "rpmbuild_internal.h" -#include "rpmbuild_misc.h" +#include "rpmfi_internal.hh" /* XXX fi->apath */ +#include "rpmbuild_internal.hh" +#include "rpmbuild_misc.hh" #include "debug.h" #include diff --git a/build/misc.c b/build/misc.cc similarity index 97% rename from build/misc.c rename to build/misc.cc index b4acdb44ae..5fa52361a3 100644 --- a/build/misc.c +++ b/build/misc.cc @@ -9,7 +9,7 @@ #include #include #include -#include "rpmbuild_misc.h" +#include "rpmbuild_misc.hh" #include "debug.h" #define BUF_CHUNK 1024 diff --git a/build/pack.c b/build/pack.cc similarity index 99% rename from build/pack.c rename to build/pack.cc index 72f30a3cb7..150dea36c9 100644 --- a/build/pack.c +++ b/build/pack.cc @@ -13,12 +13,11 @@ #include #include -#include "rpmio_internal.h" /* fdInitDigest, fdFiniDigest */ -#include "fsm.h" -#include "signature.h" -#include "rpmlead.h" -#include "rpmbuild_internal.h" -#include "rpmbuild_misc.h" +#include "rpmio_internal.hh" /* fdInitDigest, fdFiniDigest */ +#include "signature.hh" +#include "rpmlead.hh" +#include "rpmbuild_internal.hh" +#include "rpmbuild_misc.hh" #include "debug.h" diff --git a/build/parseChangelog.c b/build/parseChangelog.cc similarity index 99% rename from build/parseChangelog.c rename to build/parseChangelog.cc index 49e7980b03..0c3d44506c 100644 --- a/build/parseChangelog.c +++ b/build/parseChangelog.cc @@ -7,7 +7,7 @@ #include #include -#include "rpmbuild_internal.h" +#include "rpmbuild_internal.hh" #include "debug.h" #define SKIPSPACE(s) { while (*(s) && risspace(*(s))) (s)++; } diff --git a/build/parseDescription.c b/build/parseDescription.cc similarity index 98% rename from build/parseDescription.c rename to build/parseDescription.cc index 575d3d22a8..3fc4502c31 100644 --- a/build/parseDescription.c +++ b/build/parseDescription.cc @@ -7,7 +7,7 @@ #include #include -#include "rpmbuild_internal.h" +#include "rpmbuild_internal.hh" #include "debug.h" int parseDescription(rpmSpec spec) diff --git a/build/parseFiles.c b/build/parseFiles.cc similarity index 98% rename from build/parseFiles.c rename to build/parseFiles.cc index 569ca153ca..691b5ce6ee 100644 --- a/build/parseFiles.c +++ b/build/parseFiles.cc @@ -7,7 +7,7 @@ #include #include -#include "rpmbuild_internal.h" +#include "rpmbuild_internal.hh" #include "debug.h" int parseFiles(rpmSpec spec) diff --git a/build/parseList.c b/build/parseList.cc similarity index 95% rename from build/parseList.c rename to build/parseList.cc index 353317d6a5..d2cfe01871 100644 --- a/build/parseList.c +++ b/build/parseList.cc @@ -5,7 +5,7 @@ #include "system.h" #include -#include "rpmbuild_internal.h" +#include "rpmbuild_internal.hh" #include "debug.h" diff --git a/build/parsePolicies.c b/build/parsePolicies.cc similarity index 98% rename from build/parsePolicies.c rename to build/parsePolicies.cc index c9a7084ecd..960ca005be 100644 --- a/build/parsePolicies.c +++ b/build/parsePolicies.cc @@ -9,7 +9,7 @@ #include #include #include -#include "rpmbuild_internal.h" +#include "rpmbuild_internal.hh" #include "debug.h" int parsePolicies(rpmSpec spec) diff --git a/build/parsePreamble.c b/build/parsePreamble.cc similarity index 99% rename from build/parsePreamble.c rename to build/parsePreamble.cc index 8b0c4c5271..d513721f86 100644 --- a/build/parsePreamble.c +++ b/build/parsePreamble.cc @@ -12,8 +12,8 @@ #include #include #include -#include "rpmbuild_internal.h" -#include "rpmbuild_misc.h" +#include "rpmbuild_internal.hh" +#include "rpmbuild_misc.hh" #include "debug.h" #define SKIPSPACE(s) { while (*(s) && risspace(*(s))) (s)++; } diff --git a/build/parsePrep.c b/build/parsePrep.cc similarity index 99% rename from build/parsePrep.c rename to build/parsePrep.cc index e639ad569b..77b2781707 100644 --- a/build/parsePrep.c +++ b/build/parsePrep.cc @@ -11,9 +11,9 @@ #include #include #include -#include "rpmbuild_internal.h" -#include "rpmbuild_misc.h" -#include "rpmmacro_internal.h" +#include "rpmbuild_internal.hh" +#include "rpmbuild_misc.hh" +#include "rpmmacro_internal.hh" #include "debug.h" static void appendMb(rpmMacroBuf mb, const char *s, int nl) diff --git a/build/parseReqs.c b/build/parseReqs.cc similarity index 99% rename from build/parseReqs.c rename to build/parseReqs.cc index 1c45dd0bbe..2013fe42c2 100644 --- a/build/parseReqs.c +++ b/build/parseReqs.cc @@ -8,8 +8,8 @@ #include #include #include -#include "rpmbuild_internal.h" -#include "rpmbuild_misc.h" +#include "rpmbuild_internal.hh" +#include "rpmbuild_misc.hh" #include "debug.h" diff --git a/build/parseScript.c b/build/parseScript.cc similarity index 98% rename from build/parseScript.c rename to build/parseScript.cc index aa45fbab6d..f6f4fe9c6b 100644 --- a/build/parseScript.c +++ b/build/parseScript.cc @@ -8,11 +8,11 @@ #include #include -#include "rpmlua.h" -#include "rpmscript.h" /* script flags */ -#include "rpmtriggers.h" /* default priority */ -#include "rpmbuild_internal.h" -#include "rpmbuild_misc.h" +#include "rpmlua.hh" +#include "rpmscript.hh" /* script flags */ +#include "rpmtriggers.hh" /* default priority */ +#include "rpmbuild_internal.hh" +#include "rpmbuild_misc.hh" #include "debug.h" diff --git a/build/parseSimpleScript.c b/build/parseSimpleScript.cc similarity index 98% rename from build/parseSimpleScript.c rename to build/parseSimpleScript.cc index 244f8bdb61..79a867529f 100644 --- a/build/parseSimpleScript.c +++ b/build/parseSimpleScript.cc @@ -5,7 +5,7 @@ #include "system.h" #include -#include "rpmbuild_internal.h" +#include "rpmbuild_internal.hh" #include "debug.h" diff --git a/build/parseSpec.c b/build/parseSpec.cc similarity index 99% rename from build/parseSpec.c rename to build/parseSpec.cc index 031f646c44..dc7893ec05 100644 --- a/build/parseSpec.c +++ b/build/parseSpec.cc @@ -16,8 +16,8 @@ #include #include #include -#include "rpmbuild_internal.h" -#include "rpmbuild_misc.h" +#include "rpmbuild_internal.hh" +#include "rpmbuild_misc.hh" #include "debug.h" #define SKIPSPACE(s) { while (*(s) && risspace(*(s))) (s)++; } diff --git a/build/policies.c b/build/policies.cc similarity index 99% rename from build/policies.c rename to build/policies.cc index 69062ee6ae..2330c894e8 100644 --- a/build/policies.c +++ b/build/policies.cc @@ -10,8 +10,8 @@ #include #include -#include "rpmio_internal.h" -#include "rpmbuild_internal.h" +#include "rpmio_internal.hh" +#include "rpmbuild_internal.hh" #include "debug.h" diff --git a/build/reqprov.c b/build/reqprov.cc similarity index 98% rename from build/reqprov.c rename to build/reqprov.cc index 6d2ea4471a..5b77359cdc 100644 --- a/build/reqprov.c +++ b/build/reqprov.cc @@ -8,7 +8,7 @@ #include #include #include -#include "rpmbuild_internal.h" +#include "rpmbuild_internal.hh" #include "debug.h" int addReqProv(Package pkg, rpmTagVal tagN, diff --git a/build/rpmbuild_internal.h b/build/rpmbuild_internal.hh similarity index 99% rename from build/rpmbuild_internal.h rename to build/rpmbuild_internal.hh index 74f1a2f7c4..7d5d64b7f1 100644 --- a/build/rpmbuild_internal.h +++ b/build/rpmbuild_internal.hh @@ -8,8 +8,8 @@ #include #include #include -#include "rpmbuild_misc.h" -#include "rpmlua.h" +#include "rpmbuild_misc.hh" +#include "rpmlua.hh" using fileRenameHash = std::unordered_multimap; diff --git a/build/rpmbuild_misc.h b/build/rpmbuild_misc.hh similarity index 100% rename from build/rpmbuild_misc.h rename to build/rpmbuild_misc.hh diff --git a/build/rpmfc.c b/build/rpmfc.cc similarity index 99% rename from build/rpmfc.c rename to build/rpmfc.cc index e3d8b46c9c..b74459cb1a 100644 --- a/build/rpmfc.c +++ b/build/rpmfc.cc @@ -23,8 +23,8 @@ #include #include -#include "rpmfi_internal.h" /* rpmfiles stuff for now */ -#include "rpmbuild_internal.h" +#include "rpmfi_internal.hh" /* rpmfiles stuff for now */ +#include "rpmbuild_internal.hh" #include "debug.h" diff --git a/build/spec.c b/build/spec.cc similarity index 99% rename from build/spec.c rename to build/spec.cc index 6c7ebfa7e0..ef3331151c 100644 --- a/build/spec.c +++ b/build/spec.cc @@ -13,8 +13,8 @@ #include #include -#include "rpmfi_internal.h" /* rpmfiles stuff */ -#include "rpmbuild_internal.h" +#include "rpmfi_internal.hh" /* rpmfiles stuff */ +#include "rpmbuild_internal.hh" #include "debug.h" diff --git a/build/speclua.c b/build/speclua.cc similarity index 95% rename from build/speclua.c rename to build/speclua.cc index 8f5fe997ca..be8e1effb8 100644 --- a/build/speclua.c +++ b/build/speclua.cc @@ -1,8 +1,8 @@ #include "system.h" -#include "rpmlua.h" -#include "rpmbuild_internal.h" +#include "rpmlua.hh" +#include "rpmbuild_internal.hh" #include "debug.h" diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index a8999037d6..b05ad46559 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -21,64 +21,48 @@ target_include_directories(librpm PUBLIC $ $ - # This is needed for rpmcli.h + # This is needed for rpmcli.hh ${POPT_INCLUDE_DIRS} ) target_sources(librpm PRIVATE - backend/dbi.c backend/dbi.h backend/dummydb.c - backend/dbiset.c backend/dbiset.h - headerutil.c header.c headerfmt.c header_internal.h - rpmdb.c rpmdb_internal.h - fprint.c fprint.h tagname.c rpmtd.c tagtbl.inc - cpio.c cpio.h depends.c order.c formats.c tagexts.c fsm.c fsm.h - manifest.c manifest.h package.c - poptALL.c poptI.c poptQV.c psm.c query.c - rpmal.c rpmal.h rpmchecksig.c rpmds.c rpmds_internal.h - rpmfi.c rpmfi_internal.h - rpmgi.h rpmgi.c rpminstall.c rpmts_internal.h - rpmlead.c rpmlead.h rpmps.c rpmprob.c rpmrc.c - rpmte.c rpmte_internal.h rpmts.c rpmfs.h rpmfs.c - signature.c signature.h transaction.c - verify.c rpmlock.c rpmlock.h misc.h relocation.c - rpmscript.h rpmscript.c - rpmchroot.c rpmchroot.h - rpmplugins.c rpmplugins.h rpmug.c rpmug.h - rpmtriggers.h rpmtriggers.c rpmvs.c rpmvs.h + backend/dbi.cc backend/dbi.hh backend/dummydb.cc + backend/dbiset.cc backend/dbiset.hh + headerutil.cc header.cc headerfmt.cc header_internal.hh + rpmdb.cc rpmdb_internal.hh + fprint.cc fprint.hh tagname.cc rpmtd.cc tagtbl.inc + cpio.cc cpio.hh depends.cc order.cc formats.cc tagexts.cc fsm.cc fsm.hh + manifest.cc manifest.hh package.cc + poptALL.cc poptI.cc poptQV.cc psm.cc query.cc + rpmal.cc rpmal.hh rpmchecksig.cc rpmds.cc rpmds_internal.hh + rpmfi.cc rpmfi_internal.hh + rpmgi.hh rpmgi.cc rpminstall.cc rpmts_internal.hh + rpmlead.cc rpmlead.hh rpmps.cc rpmprob.cc rpmrc.cc + rpmte.cc rpmte_internal.hh rpmts.cc rpmfs.hh rpmfs.cc + signature.cc signature.hh transaction.cc + verify.cc rpmlock.cc rpmlock.hh misc.hh relocation.cc + rpmscript.hh rpmscript.cc + rpmchroot.cc rpmchroot.hh + rpmplugins.cc rpmplugins.hh rpmug.cc rpmug.hh + rpmtriggers.hh rpmtriggers.cc rpmvs.cc rpmvs.hh ) if(ENABLE_SQLITE) - target_sources(librpm PRIVATE backend/sqlite.c) + target_sources(librpm PRIVATE backend/sqlite.cc) target_link_libraries(librpm PRIVATE PkgConfig::SQLITE) endif() if(ENABLE_NDB) target_sources(librpm PRIVATE - backend/ndb/glue.c + backend/ndb/glue.cc backend/ndb/rpmpkg.c backend/ndb/rpmpkg.h backend/ndb/rpmidx.c backend/ndb/rpmidx.h backend/ndb/rpmxdb.c backend/ndb/rpmxdb.h ) endif() -# sources converted to c++ so far (avoid having to do everything at once) -set (cxx_sources - cpio.c depends.c formats.c fprint.c fsm.c header.c - headerfmt.c headerutil.c manifest.c order.c package.c - poptALL.c poptI.c poptQV.c psm.c - query.c relocation.c rpmal.c rpmchecksig.c rpmchroot.c - rpmdb.c rpmds.c rpmfi.c rpmfs.c rpmgi.c rpminstall.c - rpmlead.c rpmlock.c rpmplugins.c rpmprob.c rpmps.c - rpmrc.c rpmscript.c rpmtd.c rpmte.c rpmtriggers.c - rpmts.c rpmug.c rpmvs.c signature.c tagexts.c tagname.c - transaction.c verify.c - backend/dbi.c backend/dbiset.c backend/bdb_ro.c - backend/dummydb.c backend/sqlite.c backend/ndb/glue.c -) -set_source_files_properties(${cxx_sources} PROPERTIES LANGUAGE CXX) - if(ENABLE_BDB_RO) - target_sources(librpm PRIVATE backend/bdb_ro.c) + target_sources(librpm PRIVATE backend/bdb_ro.cc) endif() if(WITH_ACL) diff --git a/lib/backend/bdb_ro.c b/lib/backend/bdb_ro.cc similarity index 99% rename from lib/backend/bdb_ro.c rename to lib/backend/bdb_ro.cc index 35821df5b7..3472dc9c89 100644 --- a/lib/backend/bdb_ro.c +++ b/lib/backend/bdb_ro.cc @@ -9,7 +9,7 @@ #include #include -#include "rpmdb_internal.h" +#include "rpmdb_internal.hh" #include #include diff --git a/lib/backend/dbi.c b/lib/backend/dbi.cc similarity index 99% rename from lib/backend/dbi.c rename to lib/backend/dbi.cc index f1075f38e8..02d6c780b3 100644 --- a/lib/backend/dbi.c +++ b/lib/backend/dbi.cc @@ -10,7 +10,7 @@ #include #include #include -#include "rpmdb_internal.h" +#include "rpmdb_internal.hh" #include "debug.h" const struct rpmdbOps_s *backends[] = { diff --git a/lib/backend/dbi.h b/lib/backend/dbi.hh similarity index 99% rename from lib/backend/dbi.h rename to lib/backend/dbi.hh index 2ea94d7024..b21667ce67 100644 --- a/lib/backend/dbi.h +++ b/lib/backend/dbi.hh @@ -4,7 +4,7 @@ #include #include -#include "dbiset.h" +#include "dbiset.hh" #include /* XXX: make this backend-specific, eliminate or something... */ diff --git a/lib/backend/dbiset.c b/lib/backend/dbiset.cc similarity index 99% rename from lib/backend/dbiset.c rename to lib/backend/dbiset.cc index d8134148cc..bbcac8cfc5 100644 --- a/lib/backend/dbiset.c +++ b/lib/backend/dbiset.cc @@ -5,7 +5,7 @@ #include #include -#include "dbiset.h" +#include "dbiset.hh" #include "debug.h" using std::vector; diff --git a/lib/backend/dbiset.h b/lib/backend/dbiset.hh similarity index 100% rename from lib/backend/dbiset.h rename to lib/backend/dbiset.hh diff --git a/lib/backend/dummydb.c b/lib/backend/dummydb.cc similarity index 98% rename from lib/backend/dummydb.c rename to lib/backend/dummydb.cc index 3cfe0f75ef..0516f34567 100644 --- a/lib/backend/dummydb.c +++ b/lib/backend/dummydb.cc @@ -1,6 +1,6 @@ #include "system.h" -#include "rpmdb_internal.h" +#include "rpmdb_internal.hh" #include "debug.h" diff --git a/lib/backend/ndb/glue.c b/lib/backend/ndb/glue.cc similarity index 99% rename from lib/backend/ndb/glue.c rename to lib/backend/ndb/glue.cc index 6499c11f2c..714d1b9410 100644 --- a/lib/backend/ndb/glue.c +++ b/lib/backend/ndb/glue.cc @@ -4,7 +4,7 @@ #include #include -#include "rpmdb_internal.h" +#include "rpmdb_internal.hh" #include #include diff --git a/lib/backend/sqlite.c b/lib/backend/sqlite.cc similarity index 99% rename from lib/backend/sqlite.c rename to lib/backend/sqlite.cc index 28b5e0009f..7048d79615 100644 --- a/lib/backend/sqlite.c +++ b/lib/backend/sqlite.cc @@ -7,7 +7,7 @@ #include #include #include -#include "rpmdb_internal.h" +#include "rpmdb_internal.hh" #include "debug.h" diff --git a/lib/cpio.c b/lib/cpio.cc similarity index 99% rename from lib/cpio.c rename to lib/cpio.cc index 8511614ed4..3b0c0cdd41 100644 --- a/lib/cpio.c +++ b/lib/cpio.cc @@ -24,7 +24,7 @@ #include #include -#include "cpio.h" +#include "cpio.hh" #include "debug.h" diff --git a/lib/cpio.h b/lib/cpio.hh similarity index 100% rename from lib/cpio.h rename to lib/cpio.hh diff --git a/lib/depends.c b/lib/depends.cc similarity index 99% rename from lib/depends.c rename to lib/depends.cc index a0c6799205..8b44cdebad 100644 --- a/lib/depends.c +++ b/lib/depends.cc @@ -16,13 +16,13 @@ #include #include -#include "rpmts_internal.h" -#include "rpmte_internal.h" -#include "rpmds_internal.h" -#include "rpmfi_internal.h" /* rpmfiles stuff for now */ -#include "misc.h" +#include "rpmts_internal.hh" +#include "rpmte_internal.hh" +#include "rpmds_internal.hh" +#include "rpmfi_internal.hh" /* rpmfiles stuff for now */ +#include "misc.hh" -#include "backend/dbiset.h" +#include "backend/dbiset.hh" #include "debug.h" diff --git a/lib/formats.c b/lib/formats.cc similarity index 99% rename from lib/formats.c rename to lib/formats.cc index 6f8f248621..61d04fe65e 100644 --- a/lib/formats.c +++ b/lib/formats.cc @@ -16,10 +16,10 @@ #include #include -#include "rpmpgpval.h" -#include "manifest.h" -#include "misc.h" -#include "signature.h" +#include "rpmpgpval.hh" +#include "manifest.hh" +#include "misc.hh" +#include "signature.hh" #include "debug.h" diff --git a/lib/fprint.c b/lib/fprint.cc similarity index 99% rename from lib/fprint.c rename to lib/fprint.cc index 41fc1b5799..364a52ea87 100644 --- a/lib/fprint.c +++ b/lib/fprint.cc @@ -11,11 +11,11 @@ #include #include -#include "rpmdb_internal.h" -#include "rpmfi_internal.h" -#include "rpmte_internal.h" -#include "fprint.h" -#include "misc.h" +#include "rpmdb_internal.hh" +#include "rpmfi_internal.hh" +#include "rpmte_internal.hh" +#include "fprint.hh" +#include "misc.hh" #include "debug.h" #include diff --git a/lib/fprint.h b/lib/fprint.hh similarity index 100% rename from lib/fprint.h rename to lib/fprint.hh diff --git a/lib/fsm.c b/lib/fsm.cc similarity index 99% rename from lib/fsm.c rename to lib/fsm.cc index 4c0968f73a..e3be219c37 100644 --- a/lib/fsm.c +++ b/lib/fsm.cc @@ -18,12 +18,12 @@ #include #include -#include "rpmio_internal.h" /* fdInit/FiniDigest */ -#include "fsm.h" -#include "rpmte_internal.h" /* XXX rpmfs */ -#include "rpmfi_internal.h" /* rpmfiSetOnChdir */ -#include "rpmplugins.h" /* rpm plugins hooks */ -#include "rpmug.h" +#include "rpmio_internal.hh" /* fdInit/FiniDigest */ +#include "fsm.hh" +#include "rpmte_internal.hh" /* XXX rpmfs */ +#include "rpmfi_internal.hh" /* rpmfiSetOnChdir */ +#include "rpmplugins.hh" /* rpm plugins hooks */ +#include "rpmug.hh" #include "debug.h" diff --git a/lib/fsm.h b/lib/fsm.hh similarity index 100% rename from lib/fsm.h rename to lib/fsm.hh diff --git a/lib/header.c b/lib/header.cc similarity index 99% rename from lib/header.c rename to lib/header.cc index 82e29a172b..d0eb3ad36b 100644 --- a/lib/header.c +++ b/lib/header.cc @@ -14,8 +14,8 @@ #include #include #include -#include "header_internal.h" -#include "misc.h" /* tag function proto */ +#include "header_internal.hh" +#include "misc.hh" /* tag function proto */ #include "debug.h" diff --git a/lib/header_internal.h b/lib/header_internal.hh similarity index 98% rename from lib/header_internal.h rename to lib/header_internal.hh index ded353bda8..d470e7b938 100644 --- a/lib/header_internal.h +++ b/lib/header_internal.hh @@ -2,7 +2,7 @@ #define H_HEADER_INTERNAL /** \ingroup header - * \file header_internal.h + * \file header_internal.hh */ #include diff --git a/lib/headerfmt.c b/lib/headerfmt.cc similarity index 99% rename from lib/headerfmt.c rename to lib/headerfmt.cc index 9cba6cbf91..f6cb9fad90 100644 --- a/lib/headerfmt.c +++ b/lib/headerfmt.cc @@ -11,7 +11,7 @@ #include #include #include -#include "misc.h" /* format function protos */ +#include "misc.hh" /* format function protos */ #include "debug.h" diff --git a/lib/headerutil.c b/lib/headerutil.cc similarity index 100% rename from lib/headerutil.c rename to lib/headerutil.cc diff --git a/lib/manifest.c b/lib/manifest.cc similarity index 99% rename from lib/manifest.c rename to lib/manifest.cc index d47e5b306d..10db900e26 100644 --- a/lib/manifest.c +++ b/lib/manifest.cc @@ -12,7 +12,7 @@ #include #include -#include "manifest.h" +#include "manifest.hh" #include "debug.h" diff --git a/lib/manifest.h b/lib/manifest.hh similarity index 100% rename from lib/manifest.h rename to lib/manifest.hh diff --git a/lib/misc.h b/lib/misc.hh similarity index 98% rename from lib/misc.h rename to lib/misc.hh index 73f4b2ff7b..890f7da66f 100644 --- a/lib/misc.h +++ b/lib/misc.hh @@ -9,7 +9,7 @@ #include #include #include /* for headerGetFlags typedef, duh.. */ -#include "rpmfs.h" +#include "rpmfs.hh" typedef const struct headerFmt_s * headerFmt; diff --git a/lib/order.c b/lib/order.cc similarity index 99% rename from lib/order.c rename to lib/order.cc index 6f6f0b9439..4febd9d42e 100644 --- a/lib/order.c +++ b/lib/order.cc @@ -14,8 +14,8 @@ #include #include -#include "rpmte_internal.h" /* XXX tsortInfo_s */ -#include "rpmts_internal.h" +#include "rpmte_internal.hh" /* XXX tsortInfo_s */ +#include "rpmts_internal.hh" #include "debug.h" diff --git a/lib/package.c b/lib/package.cc similarity index 98% rename from lib/package.c rename to lib/package.cc index a80a5f03d3..1267522fe4 100644 --- a/lib/package.c +++ b/lib/package.cc @@ -15,10 +15,10 @@ #include #include -#include "rpmlead.h" -#include "rpmio_internal.h" /* fd digest bits */ -#include "header_internal.h" /* XXX headerCheck */ -#include "rpmvs.h" +#include "rpmlead.hh" +#include "rpmio_internal.hh" /* fd digest bits */ +#include "header_internal.hh" /* XXX headerCheck */ +#include "rpmvs.hh" #include "debug.h" diff --git a/lib/poptALL.c b/lib/poptALL.cc similarity index 100% rename from lib/poptALL.c rename to lib/poptALL.cc diff --git a/lib/poptI.c b/lib/poptI.cc similarity index 100% rename from lib/poptI.c rename to lib/poptI.cc diff --git a/lib/poptQV.c b/lib/poptQV.cc similarity index 99% rename from lib/poptQV.c rename to lib/poptQV.cc index b0759e3d1a..a919c66e61 100644 --- a/lib/poptQV.c +++ b/lib/poptQV.cc @@ -8,7 +8,7 @@ #include #include -#include "rpmgi.h" /* XXX for giFlags */ +#include "rpmgi.hh" /* XXX for giFlags */ #include "debug.h" diff --git a/lib/psm.c b/lib/psm.cc similarity index 98% rename from lib/psm.c rename to lib/psm.cc index 3faf706b50..9afbe750e5 100644 --- a/lib/psm.c +++ b/lib/psm.cc @@ -18,18 +18,18 @@ #include #include -#include "fsm.h" /* XXX CPIO_FOO/FSM_FOO constants */ -#include "rpmchroot.h" -#include "rpmfi_internal.h" /* XXX replaced/states... */ -#include "rpmte_internal.h" /* XXX internal apis */ -#include "rpmdb_internal.h" /* rpmdbAdd/Remove */ -#include "rpmts_internal.h" /* rpmtsPlugins() etc */ -#include "rpmds_internal.h" /* rpmdsFilterTi() */ -#include "rpmscript.h" -#include "misc.h" -#include "rpmtriggers.h" - -#include "rpmplugins.h" +#include "fsm.hh" /* XXX CPIO_FOO/FSM_FOO constants */ +#include "rpmchroot.hh" +#include "rpmfi_internal.hh" /* XXX replaced/states... */ +#include "rpmte_internal.hh" /* XXX internal apis */ +#include "rpmdb_internal.hh" /* rpmdbAdd/Remove */ +#include "rpmts_internal.hh" /* rpmtsPlugins() etc */ +#include "rpmds_internal.hh" /* rpmdsFilterTi() */ +#include "rpmscript.hh" +#include "misc.hh" +#include "rpmtriggers.hh" + +#include "rpmplugins.hh" #include "debug.h" diff --git a/lib/query.c b/lib/query.cc similarity index 99% rename from lib/query.c rename to lib/query.cc index f55c11a33b..7b36ee015e 100644 --- a/lib/query.c +++ b/lib/query.cc @@ -19,8 +19,8 @@ #include /* rpmCleanPath */ #include -#include "rpmgi.h" -#include "manifest.h" +#include "rpmgi.hh" +#include "manifest.hh" #include "debug.h" diff --git a/lib/relocation.c b/lib/relocation.cc similarity index 99% rename from lib/relocation.c rename to lib/relocation.cc index 0202b5c461..5bdd52a2c5 100644 --- a/lib/relocation.c +++ b/lib/relocation.cc @@ -8,8 +8,8 @@ #include #include -#include "rpmfs.h" -#include "misc.h" +#include "rpmfs.hh" +#include "misc.hh" #include "debug.h" diff --git a/lib/rpmal.c b/lib/rpmal.cc similarity index 98% rename from lib/rpmal.c rename to lib/rpmal.cc index a0836e557b..14f148a1ed 100644 --- a/lib/rpmal.c +++ b/lib/rpmal.cc @@ -11,12 +11,12 @@ #include #include -#include "rpmal.h" -#include "misc.h" -#include "rpmte_internal.h" -#include "rpmds_internal.h" -#include "rpmfi_internal.h" -#include "rpmts_internal.h" +#include "rpmal.hh" +#include "misc.hh" +#include "rpmte_internal.hh" +#include "rpmds_internal.hh" +#include "rpmfi_internal.hh" +#include "rpmts_internal.hh" #include "debug.h" diff --git a/lib/rpmal.h b/lib/rpmal.hh similarity index 100% rename from lib/rpmal.h rename to lib/rpmal.hh diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.cc similarity index 98% rename from lib/rpmchecksig.c rename to lib/rpmchecksig.cc index 2d2c6b4ebd..c85a12e621 100644 --- a/lib/rpmchecksig.c +++ b/lib/rpmchecksig.cc @@ -17,10 +17,10 @@ #include #include -#include "rpmio_internal.h" /* fdSetBundle() */ -#include "rpmlead.h" -#include "header_internal.h" -#include "rpmvs.h" +#include "rpmio_internal.hh" /* fdSetBundle() */ +#include "rpmlead.hh" +#include "header_internal.hh" +#include "rpmvs.hh" #include "debug.h" diff --git a/lib/rpmchroot.c b/lib/rpmchroot.cc similarity index 98% rename from lib/rpmchroot.c rename to lib/rpmchroot.cc index ea0cea68a7..040b6ace1a 100644 --- a/lib/rpmchroot.c +++ b/lib/rpmchroot.cc @@ -4,8 +4,8 @@ #include #include #include -#include "rpmchroot.h" -#include "rpmug.h" +#include "rpmchroot.hh" +#include "rpmug.hh" #include "debug.h" struct rootState_s { diff --git a/lib/rpmchroot.h b/lib/rpmchroot.hh similarity index 100% rename from lib/rpmchroot.h rename to lib/rpmchroot.hh diff --git a/lib/rpmdb.c b/lib/rpmdb.cc similarity index 99% rename from lib/rpmdb.c rename to lib/rpmdb.cc index 16d7c61c21..410f71bcbb 100644 --- a/lib/rpmdb.c +++ b/lib/rpmdb.cc @@ -31,13 +31,13 @@ #include #include -#include "rpmchroot.h" -#include "rpmdb_internal.h" -#include "fprint.h" -#include "header_internal.h" /* XXX for headerSetInstance() */ -#include "backend/dbi.h" -#include "backend/dbiset.h" -#include "misc.h" +#include "rpmchroot.hh" +#include "rpmdb_internal.hh" +#include "fprint.hh" +#include "header_internal.hh" /* XXX for headerSetInstance() */ +#include "backend/dbi.hh" +#include "backend/dbiset.hh" +#include "misc.hh" #include "debug.h" using std::unordered_map; diff --git a/lib/rpmdb_internal.h b/lib/rpmdb_internal.hh similarity index 99% rename from lib/rpmdb_internal.h rename to lib/rpmdb_internal.hh index 48c061cca3..3d8100ea12 100644 --- a/lib/rpmdb_internal.h +++ b/lib/rpmdb_internal.hh @@ -7,7 +7,7 @@ #include #include #include -#include "backend/dbi.h" +#include "backend/dbi.hh" using packageHash = std::unordered_map; diff --git a/lib/rpmds.c b/lib/rpmds.cc similarity index 99% rename from lib/rpmds.c rename to lib/rpmds.cc index 9ae9103207..4f791c7573 100644 --- a/lib/rpmds.c +++ b/lib/rpmds.cc @@ -10,7 +10,7 @@ #include #include -#include "rpmds_internal.h" +#include "rpmds_internal.hh" #include "debug.h" diff --git a/lib/rpmds_internal.h b/lib/rpmds_internal.hh similarity index 100% rename from lib/rpmds_internal.h rename to lib/rpmds_internal.hh diff --git a/lib/rpmfi.c b/lib/rpmfi.cc similarity index 99% rename from lib/rpmfi.c rename to lib/rpmfi.cc index 424d3749e2..5785951afc 100644 --- a/lib/rpmfi.c +++ b/lib/rpmfi.cc @@ -20,12 +20,12 @@ #include #include -#include "rpmfi_internal.h" -#include "rpmte_internal.h" /* relocations */ -#include "cpio.h" /* XXX CPIO_FOO */ -#include "fsm.h" /* rpmpsm stuff for now */ -#include "rpmug.h" -#include "rpmio_internal.h" /* fdInit/FiniDigest */ +#include "rpmfi_internal.hh" +#include "rpmte_internal.hh" /* relocations */ +#include "cpio.hh" /* XXX CPIO_FOO */ +#include "fsm.hh" /* rpmpsm stuff for now */ +#include "rpmug.hh" +#include "rpmio_internal.hh" /* fdInit/FiniDigest */ #include "debug.h" diff --git a/lib/rpmfi_internal.h b/lib/rpmfi_internal.hh similarity index 99% rename from lib/rpmfi_internal.h rename to lib/rpmfi_internal.hh index d3fa598fed..2360207702 100644 --- a/lib/rpmfi_internal.h +++ b/lib/rpmfi_internal.hh @@ -4,7 +4,7 @@ #include #include #include -#include "fprint.h" +#include "fprint.hh" #include "cpio.h" #define RPMFIMAGIC 0x09697923 diff --git a/lib/rpmfs.c b/lib/rpmfs.cc similarity index 99% rename from lib/rpmfs.c rename to lib/rpmfs.cc index 95f8a868cf..d64fb97742 100644 --- a/lib/rpmfs.c +++ b/lib/rpmfs.cc @@ -5,7 +5,7 @@ #include -#include "rpmfs.h" +#include "rpmfs.hh" #include "debug.h" using std::vector; diff --git a/lib/rpmfs.h b/lib/rpmfs.hh similarity index 100% rename from lib/rpmfs.h rename to lib/rpmfs.hh diff --git a/lib/rpmgi.c b/lib/rpmgi.cc similarity index 99% rename from lib/rpmgi.c rename to lib/rpmgi.cc index d3ee8843a5..6bcd914ecb 100644 --- a/lib/rpmgi.c +++ b/lib/rpmgi.cc @@ -13,8 +13,8 @@ #include #include -#include "rpmgi.h" -#include "manifest.h" +#include "rpmgi.hh" +#include "manifest.hh" #include "debug.h" diff --git a/lib/rpmgi.h b/lib/rpmgi.hh similarity index 100% rename from lib/rpmgi.h rename to lib/rpmgi.hh diff --git a/lib/rpminstall.c b/lib/rpminstall.cc similarity index 99% rename from lib/rpminstall.c rename to lib/rpminstall.cc index 16a8c42588..45a076c23f 100644 --- a/lib/rpminstall.c +++ b/lib/rpminstall.cc @@ -16,8 +16,8 @@ #include #include -#include "rpmgi.h" -#include "manifest.h" +#include "rpmgi.hh" +#include "manifest.hh" #include "debug.h" static int rpmcliPackagesTotal = 0; diff --git a/lib/rpmlead.c b/lib/rpmlead.cc similarity index 96% rename from lib/rpmlead.c rename to lib/rpmlead.cc index 7420e3822e..41658cb8c5 100644 --- a/lib/rpmlead.c +++ b/lib/rpmlead.cc @@ -11,9 +11,9 @@ #include #include -#include "signature.h" -#include "header_internal.h" /* Freadall() */ -#include "rpmlead.h" +#include "signature.hh" +#include "header_internal.hh" /* Freadall() */ +#include "rpmlead.hh" #include "debug.h" diff --git a/lib/rpmlead.h b/lib/rpmlead.hh similarity index 100% rename from lib/rpmlead.h rename to lib/rpmlead.hh diff --git a/lib/rpmlock.c b/lib/rpmlock.cc similarity index 99% rename from lib/rpmlock.c rename to lib/rpmlock.cc index a539a0cb21..d177ba679a 100644 --- a/lib/rpmlock.c +++ b/lib/rpmlock.cc @@ -8,7 +8,7 @@ #include #include -#include "rpmlock.h" +#include "rpmlock.hh" #include "debug.h" diff --git a/lib/rpmlock.h b/lib/rpmlock.hh similarity index 100% rename from lib/rpmlock.h rename to lib/rpmlock.hh diff --git a/lib/rpmplugins.c b/lib/rpmplugins.cc similarity index 99% rename from lib/rpmplugins.c rename to lib/rpmplugins.cc index 5a3df8511b..bd5e83d992 100644 --- a/lib/rpmplugins.c +++ b/lib/rpmplugins.cc @@ -9,7 +9,7 @@ #include #include -#include "rpmplugins.h" +#include "rpmplugins.hh" #include using std::vector; diff --git a/lib/rpmplugins.h b/lib/rpmplugins.hh similarity index 100% rename from lib/rpmplugins.h rename to lib/rpmplugins.hh diff --git a/lib/rpmprob.c b/lib/rpmprob.cc similarity index 100% rename from lib/rpmprob.c rename to lib/rpmprob.cc diff --git a/lib/rpmps.c b/lib/rpmps.cc similarity index 100% rename from lib/rpmps.c rename to lib/rpmps.cc diff --git a/lib/rpmrc.c b/lib/rpmrc.cc similarity index 99% rename from lib/rpmrc.c rename to lib/rpmrc.cc index 76f2b09708..56daf8d2a3 100644 --- a/lib/rpmrc.c +++ b/lib/rpmrc.cc @@ -34,11 +34,11 @@ #include #include -#include "rpmlua.h" -#include "rpmio_internal.h" /* XXX for rpmioSlurp */ -#include "misc.h" -#include "backend/dbi.h" -#include "rpmug.h" +#include "rpmlua.hh" +#include "rpmio_internal.hh" /* XXX for rpmioSlurp */ +#include "misc.hh" +#include "backend/dbi.hh" +#include "rpmug.hh" #include "debug.h" diff --git a/lib/rpmscript.c b/lib/rpmscript.cc similarity index 99% rename from lib/rpmscript.c rename to lib/rpmscript.cc index b76c5e8480..6843a9eaa3 100644 --- a/lib/rpmscript.c +++ b/lib/rpmscript.cc @@ -13,12 +13,12 @@ #include #include -#include "rpmlua.h" -#include "rpmscript.h" -#include "rpmio_internal.h" +#include "rpmlua.hh" +#include "rpmscript.hh" +#include "rpmio_internal.hh" -#include "rpmchroot.h" -#include "rpmplugins.h" /* rpm plugins hooks */ +#include "rpmchroot.hh" +#include "rpmplugins.hh" /* rpm plugins hooks */ #include "debug.h" diff --git a/lib/rpmscript.h b/lib/rpmscript.hh similarity index 100% rename from lib/rpmscript.h rename to lib/rpmscript.hh diff --git a/lib/rpmtd.c b/lib/rpmtd.cc similarity index 99% rename from lib/rpmtd.c rename to lib/rpmtd.cc index 0ad109f68d..41e3d3e390 100644 --- a/lib/rpmtd.c +++ b/lib/rpmtd.cc @@ -3,7 +3,7 @@ #include #include #include -#include "misc.h" /* format function prototypes */ +#include "misc.hh" /* format function prototypes */ #include "debug.h" diff --git a/lib/rpmte.c b/lib/rpmte.cc similarity index 99% rename from lib/rpmte.c rename to lib/rpmte.cc index 394f031ace..6b98918752 100644 --- a/lib/rpmte.c +++ b/lib/rpmte.cc @@ -16,13 +16,13 @@ #include #include -#include "misc.h" -#include "rpmplugins.h" -#include "rpmte_internal.h" +#include "misc.hh" +#include "rpmplugins.hh" +#include "rpmte_internal.hh" /* strpool-related interfaces */ -#include "rpmfi_internal.h" -#include "rpmds_internal.h" -#include "rpmts_internal.h" +#include "rpmfi_internal.hh" +#include "rpmds_internal.hh" +#include "rpmts_internal.hh" #include "debug.h" diff --git a/lib/rpmte_internal.h b/lib/rpmte_internal.hh similarity index 99% rename from lib/rpmte_internal.h rename to lib/rpmte_internal.hh index 40809e2148..01d7696de0 100644 --- a/lib/rpmte_internal.h +++ b/lib/rpmte_internal.hh @@ -4,7 +4,7 @@ #include #include #include -#include "rpmfs.h" +#include "rpmfs.hh" typedef enum pkgGoal_e { PKG_NONE = 0, diff --git a/lib/rpmtriggers.c b/lib/rpmtriggers.cc similarity index 98% rename from lib/rpmtriggers.c rename to lib/rpmtriggers.cc index 342630968d..1d4a78e6fa 100644 --- a/lib/rpmtriggers.c +++ b/lib/rpmtriggers.cc @@ -7,13 +7,13 @@ #include #include -#include "rpmtriggers.h" -#include "rpmts_internal.h" -#include "rpmdb_internal.h" -#include "rpmds_internal.h" -#include "rpmfi_internal.h" -#include "rpmte_internal.h" -#include "rpmchroot.h" +#include "rpmtriggers.hh" +#include "rpmts_internal.hh" +#include "rpmdb_internal.hh" +#include "rpmds_internal.hh" +#include "rpmfi_internal.hh" +#include "rpmte_internal.hh" +#include "rpmchroot.hh" #define TRIGGER_PRIORITY_BOUND 10000 diff --git a/lib/rpmtriggers.h b/lib/rpmtriggers.hh similarity index 99% rename from lib/rpmtriggers.h rename to lib/rpmtriggers.hh index 7747f9e09d..1e436bb4aa 100644 --- a/lib/rpmtriggers.h +++ b/lib/rpmtriggers.hh @@ -2,7 +2,7 @@ #define _RPMTRIGGERS_H #include -#include "rpmscript.h" +#include "rpmscript.hh" #define RPMTRIGGER_DEFAULT_PRIORITY 1000000 diff --git a/lib/rpmts.c b/lib/rpmts.cc similarity index 99% rename from lib/rpmts.c rename to lib/rpmts.cc index 7030910f56..2119b0f72c 100644 --- a/lib/rpmts.c +++ b/lib/rpmts.cc @@ -24,14 +24,14 @@ #include #include -#include "rpmpgpval.h" -#include "rpmal.h" -#include "rpmchroot.h" -#include "rpmplugins.h" -#include "rpmts_internal.h" -#include "rpmte_internal.h" -#include "misc.h" -#include "rpmtriggers.h" +#include "rpmpgpval.hh" +#include "rpmal.hh" +#include "rpmchroot.hh" +#include "rpmplugins.hh" +#include "rpmts_internal.hh" +#include "rpmte_internal.hh" +#include "misc.hh" +#include "rpmtriggers.hh" #include "debug.h" diff --git a/lib/rpmts_internal.h b/lib/rpmts_internal.hh similarity index 96% rename from lib/rpmts_internal.h rename to lib/rpmts_internal.hh index 9ce1081d19..c75def22e6 100644 --- a/lib/rpmts_internal.h +++ b/lib/rpmts_internal.hh @@ -8,12 +8,12 @@ #include #include -#include "rpmal.h" /* XXX availablePackage */ -#include "fprint.h" -#include "rpmlock.h" -#include "rpmdb_internal.h" -#include "rpmscript.h" -#include "rpmtriggers.h" +#include "rpmal.hh" /* XXX availablePackage */ +#include "fprint.hh" +#include "rpmlock.hh" +#include "rpmdb_internal.hh" +#include "rpmscript.hh" +#include "rpmtriggers.hh" struct diskspaceInfo { std::string mntPoint;/*!< File system mount point */ diff --git a/lib/rpmug.c b/lib/rpmug.cc similarity index 99% rename from lib/rpmug.c rename to lib/rpmug.cc index 472ff4108a..2e11a4afd3 100644 --- a/lib/rpmug.c +++ b/lib/rpmug.cc @@ -8,8 +8,8 @@ #include #include -#include "misc.h" -#include "rpmug.h" +#include "misc.hh" +#include "rpmug.hh" #include "debug.h" using std::unordered_map; diff --git a/lib/rpmug.h b/lib/rpmug.hh similarity index 100% rename from lib/rpmug.h rename to lib/rpmug.hh diff --git a/lib/rpmvs.c b/lib/rpmvs.cc similarity index 99% rename from lib/rpmvs.c rename to lib/rpmvs.cc index 6610ed06c0..9f2fecc1ec 100644 --- a/lib/rpmvs.c +++ b/lib/rpmvs.cc @@ -3,8 +3,8 @@ #include #include #include -#include "rpmvs.h" -#include "rpmpgpval.h" +#include "rpmvs.hh" +#include "rpmpgpval.hh" #include "debug.h" diff --git a/lib/rpmvs.h b/lib/rpmvs.hh similarity index 98% rename from lib/rpmvs.h rename to lib/rpmvs.hh index 83f543bca6..28a9fccf59 100644 --- a/lib/rpmvs.h +++ b/lib/rpmvs.hh @@ -3,7 +3,7 @@ #include #include /* for rpmVSFlags */ -#include "header_internal.h" +#include "header_internal.hh" /* siginfo range bits */ enum { diff --git a/lib/signature.c b/lib/signature.cc similarity index 98% rename from lib/signature.c rename to lib/signature.cc index 6d3e5879ee..c5049ffc2d 100644 --- a/lib/signature.c +++ b/lib/signature.cc @@ -13,9 +13,9 @@ #include #include -#include "rpmlead.h" -#include "header_internal.h" -#include "signature.h" +#include "rpmlead.hh" +#include "header_internal.hh" +#include "signature.hh" #include "debug.h" diff --git a/lib/signature.h b/lib/signature.hh similarity index 100% rename from lib/signature.h rename to lib/signature.hh diff --git a/lib/tagexts.c b/lib/tagexts.cc similarity index 99% rename from lib/tagexts.c rename to lib/tagexts.cc index f2e3953ffc..ed2f678964 100644 --- a/lib/tagexts.c +++ b/lib/tagexts.cc @@ -11,7 +11,7 @@ #include #include #include -#include "misc.h" /* tag function proto */ +#include "misc.hh" /* tag function proto */ #include "debug.h" diff --git a/lib/tagname.c b/lib/tagname.cc similarity index 100% rename from lib/tagname.c rename to lib/tagname.cc diff --git a/lib/transaction.c b/lib/transaction.cc similarity index 99% rename from lib/transaction.c rename to lib/transaction.cc index 1453bc782e..4d411fe40a 100644 --- a/lib/transaction.c +++ b/lib/transaction.cc @@ -32,19 +32,18 @@ #include #include -#include "fprint.h" -#include "misc.h" -#include "rpmchroot.h" -#include "rpmlock.h" -#include "rpmds_internal.h" -#include "rpmfi_internal.h" /* only internal apis */ -#include "rpmte_internal.h" /* only internal apis */ -#include "rpmts_internal.h" -#include "rpmvs.h" -#include "rpmhook.h" -#include "rpmtriggers.h" - -#include "rpmplugins.h" +#include "fprint.hh" +#include "misc.hh" +#include "rpmchroot.hh" +#include "rpmlock.hh" +#include "rpmds_internal.hh" +#include "rpmfi_internal.hh" /* only internal apis */ +#include "rpmte_internal.hh" /* only internal apis */ +#include "rpmts_internal.hh" +#include "rpmvs.hh" +#include "rpmtriggers.hh" + +#include "rpmplugins.hh" #include "debug.h" diff --git a/lib/verify.c b/lib/verify.cc similarity index 99% rename from lib/verify.c rename to lib/verify.cc index b8661c88cd..2aa9c5b592 100644 --- a/lib/verify.c +++ b/lib/verify.cc @@ -23,10 +23,10 @@ #include #include -#include "misc.h" -#include "rpmchroot.h" -#include "rpmte_internal.h" /* rpmteProcess() */ -#include "rpmug.h" +#include "misc.hh" +#include "rpmchroot.hh" +#include "rpmte_internal.hh" /* rpmteProcess() */ +#include "rpmug.hh" #include "debug.h" diff --git a/plugins/fsverity.c b/plugins/fsverity.c index 3f05da61ce..4bfa6eb63f 100644 --- a/plugins/fsverity.c +++ b/plugins/fsverity.c @@ -21,7 +21,7 @@ #include #include -#include "rpmsignverity.h" +#include "rpmsignverity.hh" /* RPM_FSVERITY_BLKSZ define only! */ static int sign_config_files = 0; diff --git a/rpmio/CMakeLists.txt b/rpmio/CMakeLists.txt index 43f5724604..1c23990c71 100644 --- a/rpmio/CMakeLists.txt +++ b/rpmio/CMakeLists.txt @@ -1,11 +1,11 @@ add_library(librpmio SHARED) target_sources(librpmio PRIVATE - argv.c base64.c digest.c expression.c macro.c rpmhook.h rpmhook.c - rpmio.c rpmlog.c rpmmalloc.c rgetopt.c rpmpgp.c rpmpgpval.h - rpmsq.c rpmsw.c url.c rpmio_internal.h rpmvercmp.c - rpmver.c rpmstring.c rpmfileutil.c rpmglob.c rpmkeyring.c - rpmstrpool.c rpmmacro_internal.h rpmlua.c rpmlua.h lposix.c + argv.cc base64.cc digest.cc expression.cc macro.cc rpmhook.hh rpmhook.cc + rpmio.cc rpmlog.cc rpmmalloc.cc rgetopt.cc rpmpgp.cc rpmpgpval.hh + rpmsq.cc rpmsw.cc url.cc rpmio_internal.hh rpmvercmp.cc + rpmver.cc rpmstring.cc rpmfileutil.cc rpmglob.cc rpmkeyring.cc + rpmstrpool.cc rpmmacro_internal.hh rpmlua.cc rpmlua.hh lposix.cc ) target_compile_definitions(librpmio PRIVATE RPM_CONFIGDIR="${RPM_CONFIGDIR}") target_include_directories(librpmio @@ -23,35 +23,25 @@ endif() if (WITH_SEQUOIA) pkg_check_modules(RPMSEQUOIA REQUIRED IMPORTED_TARGET rpm-sequoia>=1.7.0) - target_sources(librpmio PRIVATE rpmpgp_sequoia.c) + target_sources(librpmio PRIVATE rpmpgp_sequoia.cc) target_link_libraries(librpmio PRIVATE PkgConfig::RPMSEQUOIA) else() if (WITH_LEGACY_OPENPGP) target_link_libraries(librpmio PRIVATE rpmpgp_legacy) else() - target_sources(librpmio PRIVATE rpmpgp_dummy.c) + target_sources(librpmio PRIVATE rpmpgp_dummy.cc) endif() if (WITH_OPENSSL) find_package(OpenSSL 1.0.2 REQUIRED) - target_sources(librpmio PRIVATE digest_openssl.c) + target_sources(librpmio PRIVATE digest_openssl.cc) target_link_libraries(librpmio PRIVATE OpenSSL::Crypto) else() pkg_check_modules(LIBGCRYPT REQUIRED IMPORTED_TARGET libgcrypt) - target_sources(librpmio PRIVATE digest_libgcrypt.c) + target_sources(librpmio PRIVATE digest_libgcrypt.cc) target_link_libraries(librpmio PRIVATE PkgConfig::LIBGCRYPT) endif() endif() -set (cxx_sources - argv.c base64.c digest.c expression.c lposix.c macro.c - digest_libgcrypt.c digest_openssl.c - rgetopt.c rpmfileutil.c rpmglob.c rpmhook.c rpmio.c - rpmkeyring.c rpmlog.c rpmlua.c rpmpgp.c rpm_sequoia.c rpmsq.c - rpmsw.c rpmstring.c rpmstrpool.c - rpmver.c rpmvercmp.c url.c -) -set_source_files_properties(${cxx_sources} PROPERTIES LANGUAGE CXX) - set_target_properties(librpmio PROPERTIES VERSION ${RPM_LIBVERSION} SOVERSION ${RPM_SOVERSION} diff --git a/rpmio/argv.c b/rpmio/argv.cc similarity index 100% rename from rpmio/argv.c rename to rpmio/argv.cc diff --git a/rpmio/base64.c b/rpmio/base64.cc similarity index 100% rename from rpmio/base64.c rename to rpmio/base64.cc diff --git a/rpmio/digest.c b/rpmio/digest.cc similarity index 100% rename from rpmio/digest.c rename to rpmio/digest.cc diff --git a/rpmio/digest_libgcrypt.c b/rpmio/digest_libgcrypt.cc similarity index 100% rename from rpmio/digest_libgcrypt.c rename to rpmio/digest_libgcrypt.cc diff --git a/rpmio/digest_openssl.c b/rpmio/digest_openssl.cc similarity index 100% rename from rpmio/digest_openssl.c rename to rpmio/digest_openssl.cc diff --git a/rpmio/expression.c b/rpmio/expression.cc similarity index 99% rename from rpmio/expression.c rename to rpmio/expression.cc index f88e74a871..90a7d43fbe 100644 --- a/rpmio/expression.c +++ b/rpmio/expression.cc @@ -21,9 +21,9 @@ #include #include #include -#include "rpmmacro_internal.h" -#include "rpmhook.h" -#include "rpmlua.h" +#include "rpmmacro_internal.hh" +#include "rpmhook.hh" +#include "rpmlua.hh" #include "debug.h" /* #define DEBUG_PARSER 1 */ diff --git a/rpmio/lposix.c b/rpmio/lposix.cc similarity index 99% rename from rpmio/lposix.c rename to rpmio/lposix.cc index 4f53a3eb14..e3f5689aff 100644 --- a/rpmio/lposix.c +++ b/rpmio/lposix.cc @@ -29,19 +29,19 @@ #include #include #include -#include "rpmio_internal.h" -#include "rpmlua.h" +#include "rpmio_internal.hh" +#include "rpmlua.hh" #define MYNAME "posix" #define MYVERSION MYNAME " library for " LUA_VERSION " / Nov 2003" -#include "lposix.h" +#include "lposix.hh" #ifndef MYBUFSIZ #define MYBUFSIZ 512 #endif -#include "modemuncher.c" +#include "modemuncher.cc" extern int _rpmlua_have_forked; diff --git a/rpmio/lposix.h b/rpmio/lposix.hh similarity index 100% rename from rpmio/lposix.h rename to rpmio/lposix.hh diff --git a/rpmio/macro.c b/rpmio/macro.cc similarity index 99% rename from rpmio/macro.c rename to rpmio/macro.cc index 4ae0906b64..1a9f2f63ae 100644 --- a/rpmio/macro.c +++ b/rpmio/macro.cc @@ -35,8 +35,8 @@ #include #include -#include "rpmlua.h" -#include "rpmmacro_internal.h" +#include "rpmlua.hh" +#include "rpmmacro_internal.hh" #include "debug.h" using std::string; diff --git a/rpmio/modemuncher.c b/rpmio/modemuncher.cc similarity index 100% rename from rpmio/modemuncher.c rename to rpmio/modemuncher.cc diff --git a/rpmio/rgetopt.c b/rpmio/rgetopt.cc similarity index 96% rename from rpmio/rgetopt.c rename to rpmio/rgetopt.cc index 702d1f52ff..dcfe2801d5 100644 --- a/rpmio/rgetopt.c +++ b/rpmio/rgetopt.cc @@ -8,7 +8,7 @@ extern int optind; #endif #include -#include "rpmmacro_internal.h" +#include "rpmmacro_internal.hh" int rgetopt(int argc, char * const argv[], const char *opts, rgetoptcb callback, void *data) diff --git a/rpmio/rpmfileutil.c b/rpmio/rpmfileutil.cc similarity index 99% rename from rpmio/rpmfileutil.c rename to rpmio/rpmfileutil.cc index 8e47e972df..43f7879480 100644 --- a/rpmio/rpmfileutil.c +++ b/rpmio/rpmfileutil.cc @@ -17,7 +17,7 @@ #include #include -#include "rpmio_internal.h" +#include "rpmio_internal.hh" #include "debug.h" diff --git a/rpmio/rpmglob.c b/rpmio/rpmglob.cc similarity index 100% rename from rpmio/rpmglob.c rename to rpmio/rpmglob.cc diff --git a/rpmio/rpmhook.c b/rpmio/rpmhook.cc similarity index 99% rename from rpmio/rpmhook.c rename to rpmio/rpmhook.cc index bb62d452af..787e490ffe 100644 --- a/rpmio/rpmhook.c +++ b/rpmio/rpmhook.cc @@ -8,7 +8,7 @@ #include #include -#include "rpmhook.h" +#include "rpmhook.hh" #include "debug.h" diff --git a/rpmio/rpmhook.h b/rpmio/rpmhook.hh similarity index 100% rename from rpmio/rpmhook.h rename to rpmio/rpmhook.hh diff --git a/rpmio/rpmio.c b/rpmio/rpmio.cc similarity index 99% rename from rpmio/rpmio.c rename to rpmio/rpmio.cc index e0e5079b6f..2131c03a11 100644 --- a/rpmio/rpmio.c +++ b/rpmio/rpmio.cc @@ -19,7 +19,7 @@ #include #include -#include "rpmio_internal.h" +#include "rpmio_internal.hh" #include "debug.h" diff --git a/rpmio/rpmio_internal.h b/rpmio/rpmio_internal.hh similarity index 100% rename from rpmio/rpmio_internal.h rename to rpmio/rpmio_internal.hh diff --git a/rpmio/rpmkeyring.c b/rpmio/rpmkeyring.cc similarity index 100% rename from rpmio/rpmkeyring.c rename to rpmio/rpmkeyring.cc diff --git a/rpmio/rpmlog.c b/rpmio/rpmlog.cc similarity index 100% rename from rpmio/rpmlog.c rename to rpmio/rpmlog.cc diff --git a/rpmio/rpmlua.c b/rpmio/rpmlua.cc similarity index 99% rename from rpmio/rpmlua.c rename to rpmio/rpmlua.cc index 36d7458dee..9a0313447c 100644 --- a/rpmio/rpmlua.c +++ b/rpmio/rpmlua.cc @@ -25,12 +25,12 @@ #include #include #include -#include "rpmhook.h" +#include "rpmhook.hh" -#include "rpmlua.h" -#include "rpmio_internal.h" -#include "rpmmacro_internal.h" -#include "lposix.h" +#include "rpmlua.hh" +#include "rpmio_internal.hh" +#include "rpmmacro_internal.hh" +#include "lposix.hh" #include "debug.h" diff --git a/rpmio/rpmlua.h b/rpmio/rpmlua.hh similarity index 100% rename from rpmio/rpmlua.h rename to rpmio/rpmlua.hh diff --git a/rpmio/rpmmacro_internal.h b/rpmio/rpmmacro_internal.hh similarity index 100% rename from rpmio/rpmmacro_internal.h rename to rpmio/rpmmacro_internal.hh diff --git a/rpmio/rpmmalloc.c b/rpmio/rpmmalloc.cc similarity index 100% rename from rpmio/rpmmalloc.c rename to rpmio/rpmmalloc.cc diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.cc similarity index 96% rename from rpmio/rpmpgp.c rename to rpmio/rpmpgp.cc index 991977ff49..219f41ba7d 100644 --- a/rpmio/rpmpgp.c +++ b/rpmio/rpmpgp.cc @@ -10,8 +10,8 @@ #include #include -#include "rpmpgpval.h" -#include "rpmio_internal.h" /* XXX rpmioSlurp */ +#include "rpmpgpval.hh" +#include "rpmio_internal.hh" /* XXX rpmioSlurp */ #include "debug.h" diff --git a/rpmio/rpmpgp_dummy.c b/rpmio/rpmpgp_dummy.cc similarity index 99% rename from rpmio/rpmpgp_dummy.c rename to rpmio/rpmpgp_dummy.cc index 5a4dbb20ac..97babb67a3 100644 --- a/rpmio/rpmpgp_dummy.c +++ b/rpmio/rpmpgp_dummy.cc @@ -2,7 +2,7 @@ #include "system.h" #include -#include "rpmpgpval.h" +#include "rpmpgpval.hh" #include "debug.h" typedef struct pgpDigAlg_s * pgpDigAlg; diff --git a/rpmio/rpmpgp_sequoia.c b/rpmio/rpmpgp_sequoia.cc similarity index 99% rename from rpmio/rpmpgp_sequoia.c rename to rpmio/rpmpgp_sequoia.cc index 25eab37237..d7f362994a 100644 --- a/rpmio/rpmpgp_sequoia.c +++ b/rpmio/rpmpgp_sequoia.cc @@ -13,7 +13,7 @@ // to _pgpFoo. It's a bit ugly, but it is better than a brittle, // non-portable hack. -#include "rpmpgpval.h" +#include "rpmpgpval.hh" // Wrap a function. // diff --git a/rpmio/rpmpgpval.h b/rpmio/rpmpgpval.hh similarity index 100% rename from rpmio/rpmpgpval.h rename to rpmio/rpmpgpval.hh diff --git a/rpmio/rpmsq.c b/rpmio/rpmsq.cc similarity index 100% rename from rpmio/rpmsq.c rename to rpmio/rpmsq.cc diff --git a/rpmio/rpmstring.c b/rpmio/rpmstring.cc similarity index 100% rename from rpmio/rpmstring.c rename to rpmio/rpmstring.cc diff --git a/rpmio/rpmstrpool.c b/rpmio/rpmstrpool.cc similarity index 100% rename from rpmio/rpmstrpool.c rename to rpmio/rpmstrpool.cc diff --git a/rpmio/rpmsw.c b/rpmio/rpmsw.cc similarity index 100% rename from rpmio/rpmsw.c rename to rpmio/rpmsw.cc diff --git a/rpmio/rpmver.c b/rpmio/rpmver.cc similarity index 100% rename from rpmio/rpmver.c rename to rpmio/rpmver.cc diff --git a/rpmio/rpmvercmp.c b/rpmio/rpmvercmp.cc similarity index 100% rename from rpmio/rpmvercmp.c rename to rpmio/rpmvercmp.cc diff --git a/rpmio/url.c b/rpmio/url.cc similarity index 100% rename from rpmio/url.c rename to rpmio/url.cc diff --git a/sign/CMakeLists.txt b/sign/CMakeLists.txt index cfadbbe0a1..5c63a62598 100644 --- a/sign/CMakeLists.txt +++ b/sign/CMakeLists.txt @@ -3,7 +3,7 @@ set_target_properties(librpmsign PROPERTIES VERSION ${RPM_LIBVERSION} SOVERSION ${RPM_SOVERSION} ) -target_sources(librpmsign PRIVATE rpmgensig.c) +target_sources(librpmsign PRIVATE rpmgensig.cc) target_include_directories(librpmsign PRIVATE @@ -19,17 +19,12 @@ target_include_directories(librpmsign target_link_libraries(librpmsign PUBLIC librpmio librpm) target_link_libraries(librpmsign PRIVATE PkgConfig::POPT ${Intl_LIBRARIES}) if (WITH_IMAEVM) - target_sources(librpmsign PRIVATE rpmsignfiles.c) + target_sources(librpmsign PRIVATE rpmsignfiles.cc) target_link_libraries(librpmsign PRIVATE IMA::IMA) endif() if (WITH_FSVERITY) - target_sources(librpmsign PRIVATE rpmsignverity.c) + target_sources(librpmsign PRIVATE rpmsignverity.cc) target_link_libraries(librpmsign PRIVATE PkgConfig::FSVERITY) endif() -set (cxx_sources - rpmgensig.c rpmsignfiles.c rpmsignverity.c -) -set_source_files_properties(${cxx_sources} PROPERTIES LANGUAGE CXX) - install(TARGETS librpmsign EXPORT rpm-targets) diff --git a/sign/rpmgensig.c b/sign/rpmgensig.cc similarity index 99% rename from sign/rpmgensig.c rename to sign/rpmgensig.cc index f9e9282156..b930ab2669 100644 --- a/sign/rpmgensig.c +++ b/sign/rpmgensig.cc @@ -11,10 +11,10 @@ #include #ifdef WITH_FSVERITY #include -#include "rpmsignverity.h" +#include "rpmsignverity.hh" #endif #ifdef WITH_IMAEVM -#include "rpmsignfiles.h" +#include "rpmsignfiles.hh" #endif #include /* RPMSIGTAG & related */ @@ -24,11 +24,11 @@ #include /* rpmMkTemp() */ #include #include -#include "rpmio_internal.h" +#include "rpmio_internal.hh" -#include "rpmlead.h" -#include "signature.h" -#include "rpmvs.h" +#include "rpmlead.hh" +#include "signature.hh" +#include "rpmvs.hh" #include "debug.h" diff --git a/sign/rpmsignfiles.c b/sign/rpmsignfiles.cc similarity index 99% rename from sign/rpmsignfiles.c rename to sign/rpmsignfiles.cc index 9095d9a27f..05c6db6e43 100644 --- a/sign/rpmsignfiles.c +++ b/sign/rpmsignfiles.cc @@ -14,7 +14,7 @@ #include /* HEADERGET_MINMEM */ #include /* rpmRC */ -#include "rpmsignfiles.h" +#include "rpmsignfiles.hh" #define MAX_SIGNATURE_LENGTH 1024 diff --git a/sign/rpmsignfiles.h b/sign/rpmsignfiles.hh similarity index 100% rename from sign/rpmsignfiles.h rename to sign/rpmsignfiles.hh diff --git a/sign/rpmsignverity.c b/sign/rpmsignverity.cc similarity index 98% rename from sign/rpmsignverity.c rename to sign/rpmsignverity.cc index ef90082d14..8d33fe9058 100644 --- a/sign/rpmsignverity.c +++ b/sign/rpmsignverity.cc @@ -15,12 +15,12 @@ #include /* HEADERGET_MINMEM */ #include /* rpmRC */ #include -#include "header_internal.h" +#include "header_internal.hh" #include -#include "rpmio_internal.h" -#include "rpmvs.h" +#include "rpmio_internal.hh" +#include "rpmvs.hh" -#include "rpmsignverity.h" +#include "rpmsignverity.hh" #define MAX_SIGNATURE_LENGTH 1024 diff --git a/sign/rpmsignverity.h b/sign/rpmsignverity.hh similarity index 100% rename from sign/rpmsignverity.h rename to sign/rpmsignverity.hh diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index d19281dc9a..9fd90535cf 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -1,17 +1,17 @@ -add_library(cliutils OBJECT cliutils.c cliutils.h) +add_library(cliutils OBJECT cliutils.cc cliutils.hh) -add_executable(rpm rpm.c cliutils) -add_executable(rpmdb rpmdb.c cliutils) -add_executable(rpmkeys rpmkeys.c cliutils) -add_executable(rpmsign rpmsign.c cliutils) -add_executable(rpmbuild rpmbuild.c cliutils) -add_executable(rpmspec rpmspec.c cliutils) +add_executable(rpm rpm.cc cliutils) +add_executable(rpmdb rpmdb.cc cliutils) +add_executable(rpmkeys rpmkeys.cc cliutils) +add_executable(rpmsign rpmsign.cc cliutils) +add_executable(rpmbuild rpmbuild.cc cliutils) +add_executable(rpmspec rpmspec.cc cliutils) -add_executable(rpmdeps rpmdeps.c) -add_executable(rpmgraph rpmgraph.c) -add_executable(rpmlua rpmlua.c) -add_executable(rpmuncompress rpmuncompress.c) -add_executable(rpmdump rpmdump.c) +add_executable(rpmdeps rpmdeps.cc) +add_executable(rpmgraph rpmgraph.cc) +add_executable(rpmlua rpmlua.cc) +add_executable(rpmuncompress rpmuncompress.cc) +add_executable(rpmdump rpmdump.cc) target_link_libraries(rpmsign PRIVATE librpmsign) target_link_libraries(rpmlua PRIVATE LUA::LUA) @@ -21,12 +21,12 @@ target_link_libraries(rpmdeps PRIVATE librpmbuild) target_link_libraries(rpmuncompress PRIVATE PkgConfig::LIBARCHIVE) if (HAVE_STRCHRNUL) - add_executable(rpmsort rpmsort.c) + add_executable(rpmsort rpmsort.cc) install(TARGETS rpmsort) endif() if (LIBELF_FOUND) - add_executable(elfdeps elfdeps.c) + add_executable(elfdeps elfdeps.cc) target_link_libraries(elfdeps PRIVATE PkgConfig::LIBELF) install(TARGETS elfdeps DESTINATION ${RPM_CONFIGDIR}) endif() @@ -40,7 +40,7 @@ if (READLINE_FOUND) endif() if (WITH_ARCHIVE) - add_executable(rpm2archive rpm2archive.c) + add_executable(rpm2archive rpm2archive.cc) target_link_libraries(rpm2archive PRIVATE PkgConfig::LIBARCHIVE) install(TARGETS rpm2archive) endif() @@ -66,13 +66,6 @@ if (WITH_ARCHIVE) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/rpm2cpio TYPE BIN) endif() -set (cxx_sources - cliutils.c elfdeps.c rpm2archive.c rpmbuild.c rpm.c rpmdb.c - rpmdeps.c rpmdump.c rpmgraph.c rpmkeys.c rpmlua.c rpmsign.c - rpmsort.c rpmspec.c rpmuncompress.c -) -set_source_files_properties(${cxx_sources} PROPERTIES LANGUAGE CXX) - install(TARGETS rpm rpmdb rpmkeys rpmsign rpmbuild rpmspec rpmlua rpmgraph diff --git a/tools/cliutils.c b/tools/cliutils.cc similarity index 98% rename from tools/cliutils.c rename to tools/cliutils.cc index dc630bc8d4..6f44bf41ae 100644 --- a/tools/cliutils.c +++ b/tools/cliutils.cc @@ -7,7 +7,7 @@ #include #include #include -#include "cliutils.h" +#include "cliutils.hh" #include "debug.h" static pid_t pipeChild = 0; diff --git a/tools/cliutils.h b/tools/cliutils.hh similarity index 100% rename from tools/cliutils.h rename to tools/cliutils.hh diff --git a/tools/elfdeps.c b/tools/elfdeps.cc similarity index 100% rename from tools/elfdeps.c rename to tools/elfdeps.cc diff --git a/tools/rpm.c b/tools/rpm.cc similarity index 99% rename from tools/rpm.c rename to tools/rpm.cc index 13000200ef..6be1bf09e7 100644 --- a/tools/rpm.c +++ b/tools/rpm.cc @@ -7,7 +7,7 @@ #include #include -#include "cliutils.h" +#include "cliutils.hh" #include "debug.h" diff --git a/tools/rpm2archive.c b/tools/rpm2archive.cc similarity index 100% rename from tools/rpm2archive.c rename to tools/rpm2archive.cc diff --git a/tools/rpmbuild.c b/tools/rpmbuild.cc similarity index 99% rename from tools/rpmbuild.c rename to tools/rpmbuild.cc index 0cb821fda2..e932b7832d 100644 --- a/tools/rpmbuild.c +++ b/tools/rpmbuild.cc @@ -12,7 +12,7 @@ #include #include #include -#include "cliutils.h" +#include "cliutils.hh" #include "debug.h" diff --git a/tools/rpmdb.c b/tools/rpmdb.cc similarity index 99% rename from tools/rpmdb.c rename to tools/rpmdb.cc index 36efff8afb..20d5d67bda 100644 --- a/tools/rpmdb.c +++ b/tools/rpmdb.cc @@ -3,7 +3,7 @@ #include #include #include -#include "cliutils.h" +#include "cliutils.hh" #include "debug.h" enum modes { diff --git a/tools/rpmdeps.c b/tools/rpmdeps.cc similarity index 100% rename from tools/rpmdeps.c rename to tools/rpmdeps.cc diff --git a/tools/rpmdump.c b/tools/rpmdump.cc similarity index 100% rename from tools/rpmdump.c rename to tools/rpmdump.cc diff --git a/tools/rpmgraph.c b/tools/rpmgraph.cc similarity index 99% rename from tools/rpmgraph.c rename to tools/rpmgraph.cc index a1204ca618..9edf3968b8 100644 --- a/tools/rpmgraph.c +++ b/tools/rpmgraph.cc @@ -13,7 +13,7 @@ #include #include -#include "manifest.h" +#include "manifest.hh" #include "debug.h" static int noDeps = 1; diff --git a/tools/rpmkeys.c b/tools/rpmkeys.cc similarity index 99% rename from tools/rpmkeys.c rename to tools/rpmkeys.cc index c9fa7c3b82..0210523f5c 100644 --- a/tools/rpmkeys.c +++ b/tools/rpmkeys.cc @@ -3,7 +3,7 @@ #include #include #include -#include "cliutils.h" +#include "cliutils.hh" #include "debug.h" enum modes { diff --git a/tools/rpmlua.c b/tools/rpmlua.cc similarity index 97% rename from tools/rpmlua.c rename to tools/rpmlua.cc index cdfcae9b78..93767403c0 100644 --- a/tools/rpmlua.c +++ b/tools/rpmlua.cc @@ -10,8 +10,8 @@ #endif #include -#include "rpmlua.h" -#include "rpmio_internal.h" +#include "rpmlua.hh" +#include "rpmio_internal.hh" #include "debug.h" static char *opts = NULL; diff --git a/tools/rpmsign.c b/tools/rpmsign.cc similarity index 99% rename from tools/rpmsign.c rename to tools/rpmsign.cc index cda22091a6..16063991a3 100644 --- a/tools/rpmsign.c +++ b/tools/rpmsign.cc @@ -6,7 +6,7 @@ #include #include #include -#include "cliutils.h" +#include "cliutils.hh" #include "debug.h" enum modes { diff --git a/tools/rpmsort.c b/tools/rpmsort.cc similarity index 100% rename from tools/rpmsort.c rename to tools/rpmsort.cc diff --git a/tools/rpmspec.c b/tools/rpmspec.cc similarity index 99% rename from tools/rpmspec.c rename to tools/rpmspec.cc index cf58de80ee..4908babbe0 100644 --- a/tools/rpmspec.c +++ b/tools/rpmspec.cc @@ -10,7 +10,7 @@ #include #endif -#include "cliutils.h" +#include "cliutils.hh" #include "debug.h" diff --git a/tools/rpmuncompress.c b/tools/rpmuncompress.cc similarity index 100% rename from tools/rpmuncompress.c rename to tools/rpmuncompress.cc