Changeset 1133 in MondoRescue for branches/stable/mondo/src/lib/mr_file.c

Timestamp:

Feb 11, 2007, 12:02:57 PM (17 years ago)

Author:

Bruno Cornec

Message:

mr_msg used low level with a debug value of 1 (0 doesn't print enough info)
mr_file reviewed to also have low level debug functions

File:

• branches/stable/mondo/src/lib/mr_file.c (modified) (2 diffs)

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

@@ -19 +19 @@
 /*open and read file: each call must be coupled with mr_conf_close
   function: return 0 if success*/
-FILE *mr_fopen(const char *path, const char *mode) {
+FILE *mr_fopen_int(const char *path, const char *mode,int line, char *file) {
     FILE *fd = NULL;
 
     if ((fd = fopen(path, mode)) == NULL) {
-        mr_msg(0,"Unable to open %s",path);
+        mr_msg(1,line,file,"Unable to open %s",path);
         mr_exit(-1,"Exiting");
     }
@@ -29 +29 @@
 }
 
-void mr_fprintf(FILE *fd, const char *fmt, ...) {
+void mr_fprintf_int(FILE *fd, int line, char *file, const char *fmt, ...) {
     
     va_list args;
 
     if (fd == NULL) {
-        mr_log_exit(-1,"fd is NULL.\nShould NOT happen.\nExiting");
+        mr_msg(1,line,file,"fd is NULL.\nShould NOT happen.");
+        mr_exit(-1,"Exiting");
     }
     va_start(args,fmt);
     if (vfprintf(fd, fmt, args) < 0) {
-        mr_msg(0,"Unable to print '%s'",args);
+        mr_msg(1,line,file,"Unable to print to fd");
+        mr_exit(-1,"Exiting");
     }
     va_end(args);
 }
 
-void mr_fclose(FILE *fd) {
+void mr_fclose_int(FILE **fd, int line, char *file) {
 
-    if (fd == NULL) {
-        mr_log_exit(-1,"fd is NULL.\nShould NOT happen.\nExiting");
+    if (**fd == NULL) {
+        mr_msg(1,line,file,"fd is NULL.\nShould NOT happen.");
+        mr_exit(-1,"Exiting");
     }
-    if (fclose(fd) < 0) {
-        mr_msg(0,"Unable to close fd");
+    if (*fd == NULL) {
+        mr_msg(1,line,file,"File descriptor is NULL.\nShould NOT happen.");
+        mr_exit(-1,"Exiting");
     }
-    fd = NULL;
+    if (fclose(*fd) < 0) {
+        mr_msg(1,line,file,"Unable to close File Descriptor");
+    }
+    *fd = NULL;
 }
 
-void mr_mkdir(const char *pathname, mode_t mode) {
+void mr_mkdir_int(const char *pathname, mode_t mode, int line, char *file) {
 
     if (mkdir(pathname,mode) != 0) {
-        mr_msg("Unable to create directory %s",pathname);
+        mr_msg(1,line,file,"Unable to create directory %s",pathname);
         mr_exit(-1,"Exiting");
     }