diff --git a/src/api/encryption_get.c b/src/api/encryption_get.c index 7805d97fba5b7c4fe613cd5ba0bda85fb93bc0c8..cc64e6c214514d323a2befa0d0ac33e37da1ee42 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 5503deb8670a52c6f6baaf6d95f6ee99a931aa2e..14d6742dc34a04fdc104cd80352ef30b09840bd8 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 9773c09528bd10ef5120a9bb745b9fc733a5981e..afa4ff6001f7ebc62e28161883fd667af7cdd0c0 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); }