From 2a23b2e8a07c429489d7d92d56d563c95357a99a Mon Sep 17 00:00:00 2001
From: Arie Peterson <arie@greenhost.nl>
Date: Thu, 13 Jul 2017 14:35:12 +0200
Subject: [PATCH] Remove debugging flag from filesystem_fits_in_memory
---
src/api/encryption_get.c | 2 +-
src/api/encryption_init_post.c | 2 +-
src/auxiliary.c | 19 ++++---------------
3 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/src/api/encryption_get.c b/src/api/encryption_get.c
index 7805d97..cc64e6c 100644
--- a/src/api/encryption_get.c
+++ b/src/api/encryption_get.c
@@ -38,7 +38,7 @@ int callback_encryption_get(const struct _u_request * request,
"mounting root device failed");
}
bool fits = filesystem_fits_in_memory(UNENCRYPTED_MOUNTPOINT,
- MEMORY_USAGE, true);
+ MEMORY_USAGE);
umount(UNENCRYPTED_MOUNTPOINT);
if (! fits)
{
diff --git a/src/api/encryption_init_post.c b/src/api/encryption_init_post.c
index 5503deb..14d6742 100644
--- a/src/api/encryption_init_post.c
+++ b/src/api/encryption_init_post.c
@@ -64,7 +64,7 @@ int callback_encryption_init_post(const struct _u_request * request,
// Determine the filesystem usage of the device to be encrypted.
bool fits = filesystem_fits_in_memory(UNENCRYPTED_MOUNTPOINT,
- MEMORY_USAGE, true);
+ MEMORY_USAGE);
if (! fits)
{
// Projected memory usage is really high, so abort.
diff --git a/src/auxiliary.c b/src/auxiliary.c
index 9773c09..afa4ff6 100644
--- a/src/auxiliary.c
+++ b/src/auxiliary.c
@@ -116,11 +116,9 @@ unsigned long filesystem_usage(const char * path)
* @param path Path of the mounted filesystem.
* @param safety_margin Fraction (between zero and one) of free memory to
deem available for containing the files.
- * @param debug Whether to print debug messages.
* @return Whether the filesystem seems to fit into memory.
*/
-bool filesystem_fits_in_memory(const char * path, double safety_margin,
- bool debug)
+bool filesystem_fits_in_memory(const char * path, double safety_margin)
{
// Determine the filesystem usage of the device to be encrypted.
unsigned long size = filesystem_usage(path);
@@ -128,25 +126,16 @@ bool filesystem_fits_in_memory(const char * path, double safety_margin,
{
// Something went wrong in determining the filesystem usage.
// Return false as a precaution.
- if (debug)
- {
- printf("Determining file system usage failed (size: %lu)\n", size);
- }
+ printf("Determining file system usage failed (size: %lu)\n", size);
return false;
}
- if (debug)
- {
- printf("file system usage: %lu bytes\n", size);
- }
+ printf("file system usage: %lu bytes\n", size);
// Determine the available memory.
unsigned long memory = available_memory();
double projected_usage = (double)size / (double)memory;
- if (debug)
- {
- printf("projected memory usage: %.3f\n", projected_usage);
- }
+ printf("projected memory usage: %.3f\n", projected_usage);
return (projected_usage <= safety_margin);
}
--
GitLab