Changeset 3509 in MondoRescue for branches/3.2/mondo/src/lib/mr_file.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_file.c (modified) (4 diffs)

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

@@ -23 +23 @@
 
     if ((fd = fopen(path, mode)) == NULL) {
-        mr_msg_int(1,line,file,"Unable to open %s",path);
+        mr_msg_int(1,line,file,"mr_fopen_int","Unable to open %s",path);
         mr_exit(-1,"Exiting");
     }
@@ -34 +34 @@
 
     if (fd == NULL) {
-        mr_msg_int(1,line,file,"fd is NULL.\nShould NOT happen.");
+        mr_msg_int(1,line,file,"mr_fprintf_int","fd is NULL.\nShould NOT happen.");
         mr_exit(-1,"Exiting");
     }
     va_start(args,fmt);
     if (vfprintf(fd, fmt, args) < 0) {
-        mr_msg_int(1,line,file,"Unable to print to fd");
+        mr_msg_int(1,line,file,"mr_fprintf_int","Unable to print to fd");
         mr_exit(-1,"Exiting");
     }
@@ -48 +48 @@
 
     if (fd == NULL) {
-        mr_msg_int(1,line,file,"fd is NULL.\nShould NOT happen.");
+        mr_msg_int(1,line,file,"mr_fclose_int","fd is NULL.\nShould NOT happen.");
         mr_exit(-1,"Exiting");
     }
     if (*fd == NULL) {
-        mr_msg_int(1,line,file,"File descriptor is NULL.\nShould NOT happen.");
+        mr_msg_int(1,line,file,"mr_fclose_int","File descriptor is NULL.\nShould NOT happen.");
         mr_exit(-1,"Exiting");
     }
     if (fclose(*fd) < 0) {
-        mr_msg_int(1,line,file,"Unable to close File Descriptor");
+        mr_msg_int(1,line,file,"mr_fclose_int","Unable to close File Descriptor");
     }
     *fd = NULL;
@@ -64 +64 @@
 
     if (mkdir(pathname,mode) != 0) {
-        mr_msg_int(1,line,file,"Unable to create directory %s",pathname);
+        mr_msg_int(1,line,file,"mr_mkdir_int","Unable to create directory %s",pathname);
         mr_exit(-1,"Exiting");
     }