Changeset 900 in MondoRescue for trunk/mondo/src/lib

Timestamp:

Oct 24, 2006, 8:49:18 AM (19 years ago)

Author:

Bruno Cornec

Message:

Huge patch to introduce low level functions that will bw used everywhere (mr_free, mr_asprintf, ...)
Nearly linking now due to that.

Location:

trunk/mondo/src/lib

Files:

• Makefile.am (modified) (1 diff)
• mr_conf.c (modified) (10 diffs)
• mr_err.c (added)
• mr_mem.c (added)
• mr_msg.c (added)
• mr_str.c (moved) (moved from trunk/mondo/src/lib/mr_string.c )

trunk/mondo/src/lib/Makefile.am

@@ -7 +7 @@
 noinst_LIBRARIES = libmr.a
 
-libmr_a_SOURCES  = mr_conf.c mr_string.c
+libmr_a_SOURCES  = mr_conf.c mr_str.c mr_mem.c mr_err.c mr_msg.c

trunk/mondo/src/lib/mr_conf.c

@@ -17 +17 @@
 #include <string.h>
 
-#include "my-stuff.h"
-
-/* BERLIOS: instead of this declaration, we need a good include structure */
-extern void (*log_debug_msg) (int debug_level, const char *szFile,
-                              const char *szFunction, int nLine,
-                              const char *fmt, ...);
+#include "mr_msg.h"
+#include "mr_mem.h"
+#include "mr_gettext.h"
 
 /* error flags */
@@ -79 +76 @@
 static FILE *CONF = NULL;       /* Configuration file FD */
 
-/*if output all error and warnin messages*/
+/*if output all error and warning messages*/
 static int mr_conf_flags = MRCONF_FLAG_VERBOSE;
 
@@ -95 +92 @@
 int mr_conf_open(const char *filename) {
     size_t length;              /*length of the buffer/file */
+    size_t res = 0;
 
     /* check if mr_conf is already opened? */
@@ -126 +124 @@
     /*reading file in buffer (skip all 0 characters) */
 
-    (void) fread(buffer, sizeof(char), length, CONF);
+    res = fread(buffer, sizeof(char), length, CONF);
     buffer[length] = (char) 0;  /*finalize the string */
 
@@ -146 +144 @@
         mr_conf_error_msg(MRCONF_CLOSE_BUT_NOT_OPEN, NULL);
     }
-    paranoid_free(buffer);
+    mr_free(buffer);
     fclose(CONF);
 
@@ -215 +213 @@
 /*
   reads string outstr after string str in the current file (between
-  "..."), not more than maxlength simbols: cannot check if outstr has
+  "..."), not more than maxlength symbols: cannot check if outstr has
   enough length! It must be at least maxlength+1 ! Returns number of
   read chars
@@ -233 +231 @@
         return(p);
     }
-    asprintf(&q, p);
+    mr_asprintf(&q, p);
 
     /* trunk at first \n */
@@ -252 +250 @@
 
     ret[i] = (char) 0;      /*and set its length */
-    paranoid_free(q);
+    mr_free(q);
 
     return ret;
@@ -299 +297 @@
     tmp_buf[k] = (char) 0;      /*and set its length */
 
-    paranoid_free(buffer);
+    mr_free(buffer);
     /*copy filtered data to the buffer */
     buffer = tmp_buf;
@@ -339 +337 @@
         switch (error_code) {
         case MRCONF_BAD_FILE:
-            log_msg(4, "%s %s %s\n", MRCONF_STR_ERROR, MRCONF_STR_BAD_FILE,
+            mr_msg(0,"%s %s %s\n", MRCONF_STR_ERROR, MRCONF_STR_BAD_FILE,
                    add_line);
             break;
 
         case MRCONF_ALLOC_FAILED:
-            log_msg(4, "%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_ALLOC_FAILED);
+            mr_msg(0,"%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_ALLOC_FAILED);
             break;
 
         case MRCONF_READING_FAILED:
-            log_msg(4, "%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_READING_FAILED);
+            mr_msg(0,"%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_READING_FAILED);
             break;
 
         case MRCONF_FIELD_NOT_FOUND:
-            log_msg(4, "%s %s \"%s\"\n", MRCONF_STR_ERROR,
-                   MRCONF_STR_FIELD_NOT_FOUND, add_line);
-            log_msg(4, "%s %s\n", MRCONF_STR_WARNING, MRCONF_STR_SET_TO_ZERO);
+            mr_msg(1,"%s %s \"%s\"\n", MRCONF_STR_ERROR, MRCONF_STR_FIELD_NOT_FOUND, add_line);
+            mr_msg(1,"%s %s\n", MRCONF_STR_WARNING, MRCONF_STR_SET_TO_ZERO);
             break;
 
         case MRCONF_FIELD_NO_VALUE:
-            log_msg(4, "%s %s \"%s\"\n", MRCONF_STR_ERROR,
-                   MRCONF_STR_FIELD_NO_VALUE, add_line);
-            log_msg(4, "%s %s\n", MRCONF_STR_WARNING, MRCONF_STR_IGNORE);
+            mr_msg(1,"%s %s \"%s\"\n", MRCONF_STR_ERROR, MRCONF_STR_FIELD_NO_VALUE, add_line);
+            mr_msg(1,"%s %s\n", MRCONF_STR_WARNING, MRCONF_STR_IGNORE);
             break;
 
         case MRCONF_CLOSE_BUT_NOT_OPEN:
-            log_msg(4, "%s %s\n", MRCONF_STR_WARNING,
-                   MRCONF_STR_CLOSE_BUT_NOT_OPEN);
+            mr_msg(0,"%s %s\n", MRCONF_STR_WARNING, MRCONF_STR_CLOSE_BUT_NOT_OPEN);
             break;
 
         case MRCONF_CALL_BUT_NOT_OPEN:
-            log_msg(4, "%s %s\n", MRCONF_STR_WARNING,
-                   MRCONF_STR_CALL_BUT_NOT_OPEN);
+            mr_msg(0,"%s %s\n", MRCONF_STR_WARNING, MRCONF_STR_CALL_BUT_NOT_OPEN);
             break;
 
         case MRCONF_OPEN_OPENED:
-            log_msg(4, "%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_OPEN_OPENED);
+            mr_msg(0,"%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_OPEN_OPENED);
             break;
 
         default:
-            log_msg(4, "%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_DEFAULT_ERROR);
-            break;
-        }
-    }
-}
+            mr_msg(1,"%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_DEFAULT_ERROR);
+            break;
+        }
+    }
+}