Changeset 2320 in MondoRescue for branches/2.2.10/mondo/src/lib

Timestamp:

Aug 18, 2009, 2:37:39 PM (16 years ago)

Author:

Bruno Cornec

Message:

r3331@localhost: bruno | 2009-08-06 01:34:32 +0200

• bkpinfo->scratchdir is now dynamically allocated
• mondoarchive tests made in text+newt env. Seems OK. Valgrind errors to be fixed

Location:

branches/2.2.10/mondo/src/lib

Files:

• mr_err.c (modified) (2 diffs)
• mr_mem.c (modified) (1 diff)

branches/2.2.10/mondo/src/lib/mr_err.c

@@ -16 +16 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include "mr_msg.h"
 
 /* Pointer to the right cleanup function provided by each main */
-extern void (*mr_cleanup)(void);
+extern void (*mr_cleanup)(int);
 
 /*
@@ -26 +27 @@
 
     if (mr_cleanup != NULL) {
-        mr_cleanup();
+        mr_cleanup(errorcode);
     }
     if (message != NULL) {
         fprintf(stderr,"%s\n",message);
     }
+    mr_msg_close();
     exit(errorcode);
 }

branches/2.2.10/mondo/src/lib/mr_mem.c

@@ -57 +57 @@
     
     ssize_t ret;
-    ssize_t *n;
+    ssize_t n = 0;
 
-    ret = getline(lineptr,n,fd);
+    ret = getline(lineptr,&n,fd);
     if ((ret == -1) && (! feof(fd))) {
         mr_msg_int(1,line,file,"Unable to alloc memory in mr_getline\nExiting...");