aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2007-08-30 21:16:14 +0000
committerRafael J. Wysocki <rjw@sisk.pl>2007-08-30 21:16:14 +0000
commit2cfb07983576464d3094ad7754371ff6224bbf66 (patch)
treefee2453fa5e21f0375de08835e2f4beadc40d350
parentb44a7bba88a860902e56e3cf069fe54c4d55f8e0 (diff)
downloadsuspend-utils-2cfb07983576464d3094ad7754371ff6224bbf66.tar.gz
Clean up the code in suspend.c (part 1).
-rw-r--r--suspend.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/suspend.c b/suspend.c
index 6794f35..d647ca6 100644
--- a/suspend.c
+++ b/suspend.c
@@ -1377,16 +1377,6 @@ int main(int argc, char *argv[])
mem_size += LZO1X_1_MEM_COMPRESS;
#endif
#ifdef CONFIG_ENCRYPT
- if (do_encrypt)
- mem_size += buffer_size;
-#endif
- mem_pool = malloc(mem_size);
- if (!mem_pool) {
- ret = errno;
- suspend_error("Could not allocate memory.");
- return ret;
- }
-#ifdef CONFIG_ENCRYPT
if (do_encrypt) {
printf("%s: libgcrypt version: %s\n", my_name,
gcry_check_version(NULL));
@@ -1397,8 +1387,18 @@ int main(int argc, char *argv[])
fprintf(stderr, "%s: libgcrypt error %s\n", my_name,
gcry_strerror(ret));
do_encrypt = 0;
+ } else {
+ mem_size += buffer_size;
}
}
+#endif
+ mem_pool = malloc(mem_size);
+ if (!mem_pool) {
+ ret = errno;
+ suspend_error("Could not allocate memory.");
+ return ret;
+ }
+#ifdef CONFIG_ENCRYPT
if (do_encrypt) {
mem_size -= buffer_size;
key_data = (struct key_data *)((char *)mem_pool + mem_size);