summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2020-09-18 12:17:37 +0300
committerPanu Matilainen <pmatilai@redhat.com>2020-09-30 10:47:16 +0300
commit88f223f67470d41ec7e48006e5e7acb5e04a0f33 (patch)
treef1dc142babd16a5987f74db783c08b5eea7f489c
parentc8149dad5d245c77c6370c6c738a096c3ddc7ef1 (diff)
downloadrpm-88f223f67470d41ec7e48006e5e7acb5e04a0f33.tar.gz
Unbreak build due to defined but not used warning from ensureMacro()
Warning introduced in commit 64b4ebd315ccdaac402c083a71b431310238f6ba which failed to take this into account, dunno how this wasn't caught in CI or local testing. (cherry picked from commit 4cbdd7c94071f52dfe64466df80e859193d89d89)
-rw-r--r--lib/transaction.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/transaction.c b/lib/transaction.c
index f76eaa802..55bc2d961 100644
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -1471,6 +1471,8 @@ static int rpmtsSetup(rpmts ts, rpmprobFilterFlags ignoreSet)
return 0;
}
+/* XXX _minimize_writes is not safe for mass-consumption yet */
+#if 0
/* Push a macro with current value or default if no previous value exists */
static void ensureMacro(const char *name, const char *def)
{
@@ -1486,16 +1488,18 @@ static void ensureMacro(const char *name, const char *def)
/* Enable / disable optimizations for solid state disks */
static void setSSD(int enable)
{
- /* XXX _minimize_writes is not safe for mass-consumption yet */
-#if 0
if (enable) {
rpmlog(RPMLOG_DEBUG, "optimizing for non-rotational disks\n");
ensureMacro("_minimize_writes", "1");
} else {
rpmPopMacro(NULL, "_minimize_writes");
}
-#endif
}
+#else
+static void setSSD(int enable)
+{
+}
+#endif
static int rpmtsFinish(rpmts ts)
{