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

Timestamp:

Feb 13, 2016, 2:57:55 AM (8 years ago)

Author:

Bruno Cornec

Message:

• Change mr_msg_int interface by adding the FUNCTION macro
• Use mr_msg in mr_system
• Ability to use that new log system everywhere now

File:

• branches/3.2/mondo/src/lib/mr_mem.c (modified) (8 diffs)

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

@@ -36 +36 @@
         *allocated = NULL;
     } else {
-        mr_msg_int(8,line,file,"Attempt to free NULL pointer");
+        mr_msg_int(8,line,file,"mr_asprintf","Attempt to free NULL pointer");
     }
 }
@@ -47 +47 @@
     ret = malloc(size);
     if (ret == NULL) {
-        mr_msg_int(1,line,file,"Unable to alloc memory in mr_malloc\nExiting...");
+        mr_msg_int(1,line,file,"mr_asprintf","Unable to alloc memory in mr_malloc\nExiting...");
         mr_exit(-1,"Unable to alloc memory in mr_malloc");
     }
@@ -62 +62 @@
     res = vasprintf(strp, fmt, args);
     if (res == -1) {
-        mr_msg_int(1,line,file,"Unable to alloc memory in mr_asprintf\nExiting...");
+        mr_msg_int(1,line,file,"mr_asprintf","Unable to alloc memory in mr_asprintf\nExiting...");
         mr_exit(-1,"Unable to alloc memory in mr_asprintf");
     }
@@ -76 +76 @@
     if (*lineptr != NULL) {
         /* free a variable which should be already free */
-        mr_msg_int(1,line,file,"mr_getline_ found a non freed variable here");
+        mr_msg_int(1,line,file,"mr_getline_int","mr_getline_ found a non freed variable here");
         mr_free_int((void **)lineptr,line,file);
     }
     ret = getline(lineptr,&n,fd);
     if ((ret == -1) && (! feof(fd))) {
-        mr_msg_int(1,line,file,"Unable to alloc memory in mr_getline\nExiting...");
+        mr_msg_int(1,line,file,"mr_getline_int","Unable to alloc memory in mr_getline\nExiting...");
         mr_exit(-1,"Unable to alloc memory in mr_getline");
     }
@@ -109 +109 @@
     
     if (name == NULL) {
-        mr_msg_int(1,line,file,"Unable to setenv a NULL variable\nExiting...");
+        mr_msg_int(1,line,file,"mr_setenv_int","Unable to setenv a NULL variable\nExiting...");
         mr_exit(-1, "Unable to setenv a NULL variable");
     }
     if (value == NULL) {
-        mr_msg_int(1,line,file,"Unable to affect NULL to %s\nExiting...", name);
+        mr_msg_int(1,line,file,"mr_setenv_int","Unable to affect NULL to %s\nExiting...", name);
         mr_exit(-1, "Unable to affect a NULL variable");
     }
     if (setenv(name, value, 1) != 0) {
-        mr_msg_int(1,line,file,"Unable to put %s in environment", name);
+        mr_msg_int(1,line,file,"mr_setenv_int","Unable to put %s in environment", name);
         mr_exit(-1,"Unable to put in environment");
     }
@@ -136 +136 @@
     }
     if (in == NULL) {
-        mr_msg_int(1,line,file,"Unable to add to NULL pointer\nExiting...");
+        mr_msg_int(1,line,file,"mr_strcat_int","Unable to add to NULL pointer\nExiting...");
         mr_exit(-1, "Unable to add to a NULL pointer");
     }
@@ -143 +143 @@
         res = vasprintf(in, fmt, args);
         if (res == -1) {
-            mr_msg_int(1,line,file,"Unable to alloc memory in mr_strcat\nExiting...");
+            mr_msg_int(1,line,file,"mr_strcat_int","Unable to alloc memory in mr_strcat\nExiting...");
             mr_exit(-1,"Unable to alloc memory in mr_strcat");
         }
@@ -151 +151 @@
         res = vasprintf(in, fmt2, args);
         if (res == -1) {
-            mr_msg_int(1,line,file,"Unable to alloc memory in mr_strcat\nExiting...");
+            mr_msg_int(1,line,file,"mr_strcat_int","Unable to alloc memory in mr_strcat\nExiting...");
             mr_exit(-1,"Unable to alloc memory in mr_strcat");
         }