Changeset 3208 in MondoRescue for branches/3.2/mondo/src/lib/mr_mem.c

Timestamp:

Dec 10, 2013, 8:50:00 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Fix typos preventnig compilation !
• revert mr_getline modifications which where in fact incorrect
• initialize log earlier so all messages go indeed in it

File:

• branches/3.2/mondo/src/lib/mr_mem.c (modified) (1 diff)

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

@@ -74 +74 @@
     size_t n = 0;
 
-    /*  We reached end of file, allocating empty string */
-    if (feof(fd)) {
-        mr_asprintf_int(lineptr, line, file, "");
-        return;
-    }
     ret = getline(lineptr,&n,fd);
-    if (ret == -1) {
+    if ((ret == -1) && (! feof(fd))) {
         mr_msg_int(1,line,file,"Unable to alloc memory in mr_getline\nExiting...");
         mr_exit(-1,"Unable to alloc memory in mr_getline");
+    }
+    /*  We reached end of file, allocating empty string */
+    if (ret == -1) {
+        mr_asprintf_int(lineptr, line, file, "");
     }
 }