|
 |
629b27 |
From 845b5c3882b1eecb31d712b61a4e91fe0eb70712 Mon Sep 17 00:00:00 2001
|
|
|
629b27 |
From: Matthew Almond <malmond@fb.com>
|
|
|
629b27 |
Date: Sun, 31 Jan 2021 12:30:33 -0800
|
|
|
629b27 |
Subject: [PATCH 02/30] Remove use of bool type for consistency
|
|
|
629b27 |
|
|
|
629b27 |
---
|
|
|
629b27 |
lib/fsm.c | 9 ++++-----
|
|
|
629b27 |
1 file changed, 4 insertions(+), 5 deletions(-)
|
|
|
629b27 |
|
|
|
629b27 |
diff --git a/lib/fsm.c b/lib/fsm.c
|
|
|
629b27 |
index 90193c749..feda3750c 100644
|
|
|
629b27 |
--- a/lib/fsm.c
|
|
|
629b27 |
+++ b/lib/fsm.c
|
|
|
629b27 |
@@ -8,7 +8,6 @@
|
|
|
629b27 |
|
|
|
629b27 |
#include <utime.h>
|
|
|
629b27 |
#include <errno.h>
|
|
|
629b27 |
-#include <stdbool.h>
|
|
|
629b27 |
#if WITH_CAP
|
|
|
629b27 |
#include <sys/capability.h>
|
|
|
629b27 |
#endif
|
|
|
629b27 |
@@ -896,10 +895,10 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files,
|
|
|
629b27 |
|
|
|
629b27 |
Header h = rpmteHeader(te);
|
|
|
629b27 |
const char *payloadfmt = headerGetString(h, RPMTAG_PAYLOADFORMAT);
|
|
|
629b27 |
- bool cpio = true;
|
|
|
629b27 |
+ int cpio = 1;
|
|
|
629b27 |
|
|
|
629b27 |
if (payloadfmt && rstreq(payloadfmt, "clon")) {
|
|
|
629b27 |
- cpio = false;
|
|
|
629b27 |
+ cpio = 0;
|
|
|
629b27 |
}
|
|
|
629b27 |
|
|
|
629b27 |
/* transaction id used for temporary path suffix while installing */
|
|
|
629b27 |
@@ -927,13 +926,13 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files,
|
|
|
629b27 |
/* Run fsm file pre hook for all plugins */
|
|
|
629b27 |
rc = rpmpluginsCallFsmFilePre(plugins, fi, fp->fpath,
|
|
|
629b27 |
fp->sb.st_mode, fp->action);
|
|
|
629b27 |
- fp->plugin_contents = false;
|
|
|
629b27 |
+ fp->plugin_contents = 0;
|
|
|
629b27 |
switch (rc) {
|
|
|
629b27 |
case RPMRC_OK:
|
|
|
629b27 |
setFileState(fs, fx);
|
|
|
629b27 |
break;
|
|
|
629b27 |
case RPMRC_PLUGIN_CONTENTS:
|
|
|
629b27 |
- fp->plugin_contents = true;
|
|
|
629b27 |
+ fp->plugin_contents = 1;
|
|
|
629b27 |
// reduce reads on cpio to this value. Could be zero if
|
|
|
629b27 |
// this is from a hard link.
|
|
|
629b27 |
rc = RPMRC_OK;
|
|
|
629b27 |
--
|
|
|
629b27 |
2.35.1
|
|
|
629b27 |
|