Changeset 688 in MondoRescue for trunk/mondo/mondo/common/libmondo-fifo.c

Timestamp:

Jul 17, 2006, 3:44:46 PM (18 years ago)

Author:

bcornec

Message:

Huge memory management patch.
Still not finished but a lot as been done.
What remains is around some functions returning strings, and some structure members.
(Could not finish due to laptop failure !)

File:

• trunk/mondo/mondo/common/libmondo-fifo.c (modified) (6 diffs)

trunk/mondo/mondo/common/libmondo-fifo.c

@@ -13 +13 @@
 #endif
 #include <fcntl.h>
-#include <stdio.h>
 
 #include <errno.h>
@@ -85 +84 @@
     wise_upper_limit = (am_I_in_disaster_recovery_mode()? 8 : 32);
     wise_lower_limit = 1;       // wise_upper_limit/2 + 1;
-    paranoid_system("sync");
+    sync();
     for (bufsize = wise_upper_limit, res = -1;
          res != 0 && bufsize >= wise_lower_limit; bufsize--) {
@@ -96 +95 @@
     if (!res) {
         bufsize++;
-        asprintf(&tmp, _("Negotiated max buffer of %d MB ", bufsize));
+        asprintf(&tmp, _("Negotiated max buffer of %d MB "), bufsize);
         log_to_screen(tmp);
         paranoid_free(tmp);
@@ -160 +159 @@
     char *command;
 
-    paranoid_system("sync");
+    sync();
     asprintf(&command,
             "ps wwax | grep -F \"%s\" | grep -Fv grep | awk '{print $1;}' | grep -v PID | tr -s '\n' ' ' | awk '{ print $1; }'",
@@ -167 +166 @@
     log_msg(2, "kill_buffer() --- command = %s", command);
 
-    asprintf(&tmp, "%s",
-             call_program_and_get_last_line_of_output(command));
+    tmp = call_program_and_get_last_line_of_output(command);
     paranoid_free(command);
 
@@ -177 +175 @@
         run_program_and_log_output(command, TRUE);
     }
+    paranoid_free(tmp);
     paranoid_free(command);
-    paranoid_free(tmp);
 }