Changeset 3185 in MondoRescue for branches/3.0/mondo/src/common/libmondo-fifo.c

Timestamp:

Sep 20, 2013, 2:29:57 PM (11 years ago)

Author:

Bruno Cornec

Message:

Simplify the interface of mr_getline and mr_asprintf. With 3.1 compatibility now will allow backports from this branch into 3.0

File:

• branches/3.0/mondo/src/common/libmondo-fifo.c (modified) (6 diffs)

branches/3.0/mondo/src/common/libmondo-fifo.c

@@ -88 +88 @@
     for (bufsize = wise_upper_limit, res = -1;
          res != 0 && bufsize >= wise_lower_limit; bufsize--) {
-        mr_asprintf(&tmp,
+        mr_asprintf(tmp,
                 "dd if=/dev/zero bs=1024 count=16k 2> /dev/null | buffer -o /dev/null -s %ld -m %d%c",
                 internal_tape_block_size, bufsize, 'm');
@@ -96 +96 @@
     if (!res) {
         bufsize++;
-        mr_asprintf(&tmp, "Negotiated max buffer of %d MB ", bufsize);
+        mr_asprintf(tmp, "Negotiated max buffer of %d MB ", bufsize);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -120 +120 @@
     }
     log_msg(2, "Calling buffer --- command = '%s'", g_sz_call_to_buffer);
-    mr_asprintf(&sz_dir, "%c", direction);
+    mr_asprintf(sz_dir, "%c", direction);
     fres = popen(g_sz_call_to_buffer, sz_dir);
     mr_free(sz_dir);
@@ -132 +132 @@
     }
     sleep(2);
-    mr_asprintf(&tmp, "ps %s | grep \"%s\"", ps_options, g_sz_call_to_buffer);
+    mr_asprintf(tmp, "ps %s | grep \"%s\"", ps_options, g_sz_call_to_buffer);
     if (run_program_and_log_output(tmp, 2)) {
         log_msg(2, "Warning - I think I failed to open tape, actually.");
@@ -138 +138 @@
     mr_free(tmp);
     g_tape_buffer_size_MB = bufsize;
-    mr_asprintf(&command, "ps %s | grep buffer | grep -v grep", ps_options);
+    mr_asprintf(command, "ps %s | grep buffer | grep -v grep", ps_options);
     if (run_program_and_log_output(command, 1)) {
         fres = NULL;
@@ -167 +167 @@
     }
     paranoid_system("sync");
-    mr_asprintf(&command, "ps %s | grep -F \"%s\" | grep -Fv grep | awk '{print $2;}' | grep -v PID | head -1", ps_options, g_sz_call_to_buffer);
+    mr_asprintf(command, "ps %s | grep -F \"%s\" | grep -Fv grep | awk '{print $2;}' | grep -v PID | head -1", ps_options, g_sz_call_to_buffer);
     log_msg(2, "kill_buffer() --- command = %s", command);
-    mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
+    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
 
-    mr_asprintf(&command, "kill %s", tmp);
+    mr_asprintf(command, "kill %s", tmp);
     log_msg(2, "kill_buffer() --- command = %s", command);
     if (strlen(tmp) > 0) {