Changeset 1559 in MondoRescue

Timestamp:

Jul 25, 2007, 12:36:06 AM (17 years ago)

Author:

Bruno Cornec

Message:

Improve mr_conf error messages

Location:

branches/stable/mondo/src

Files:

• include/my-stuff.h (modified) (1 diff)
• lib/mr_conf.c (modified) (5 diffs)

branches/stable/mondo/src/include/my-stuff.h

@@ -259 +259 @@
  * Log file, function, line, and @p x.
  */
-#define iamhere(x) {log_it("%s, %s, %ld: %s", __FILE__, __FUNCTION__, __LINE__, x);}
+#define iamhere(x) {mr_msg(2, x);}
 
 /**

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

@@ -54 +54 @@
 
 /*warnings*/
-#define MRCONF_STR_SET_TO_ZERO    _("variable will be set to 0")
+#define MRCONF_STR_SET_TO_ZERO    _("variable will be set to 0:")
 #define MRCONF_STR_IGNORE    _("has no value, ignoring it")
 #define MRCONF_STR_CLOSE_BUT_NOT_OPEN _("attempt to close mr_conf but it has not been opened yet")
@@ -231 +231 @@
 
     if (*p != '"') {
-        mr_conf_error_msg(MRCONF_STRING_QUOTE, "");
+        mr_conf_error_msg(MRCONF_STRING_QUOTE, field_name);
         return (NULL);
     }
@@ -240 +240 @@
     r--;
     if (*r != '"') {
-        mr_conf_error_msg(MRCONF_STRING_QUOTE, "");
+        mr_conf_error_msg(MRCONF_STRING_QUOTE, field_name);
         return (NULL);
     }
@@ -321 +321 @@
             }
             if (buffer[i] == (char) 0) {
-                mr_conf_error_msg(MRCONF_STRING_ENDQUOTE, "");
+                mr_conf_error_msg(MRCONF_STRING_ENDQUOTE, buffer);
             }
         }
@@ -389 +389 @@
         switch (error_code) {
         case MRCONF_BAD_FILE:
-            mr_msg_int(1,line,file,"%s %s %s\n", MRCONF_STR_ERROR, MRCONF_STR_BAD_FILE,
+            mr_msg_int(1,line,file,"%s %s %s", MRCONF_STR_ERROR, MRCONF_STR_BAD_FILE,
                    add_line);
             break;
 
         case MRCONF_READING_FAILED:
-            mr_msg_int(1,line,file,"%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_READING_FAILED);
+            mr_msg_int(1,line,file,"%s %s", MRCONF_STR_ERROR, MRCONF_STR_READING_FAILED);
             break;
 
         case MRCONF_FIELD_NOT_FOUND:
-            mr_msg_int(1,line,file,"%s %s \"%s\"\n", MRCONF_STR_ERROR, MRCONF_STR_FIELD_NOT_FOUND, add_line);
-            mr_msg_int(1,line,file,"%s %s\n", MRCONF_STR_WARNING, MRCONF_STR_SET_TO_ZERO);
+            mr_msg_int(1,line,file,"%s %s \"%s\"", MRCONF_STR_ERROR, MRCONF_STR_FIELD_NOT_FOUND, add_line);
+            mr_msg_int(1,line,file,"%s %s", MRCONF_STR_WARNING, MRCONF_STR_SET_TO_ZERO);
             break;
 
         case MRCONF_FIELD_NO_VALUE:
-            mr_msg_int(1,line,file,"%s %s \"%s\"\n", MRCONF_STR_ERROR, MRCONF_STR_FIELD_NO_VALUE, add_line);
-            mr_msg_int(1,line,file,"%s %s\n", MRCONF_STR_WARNING, MRCONF_STR_IGNORE);
+            mr_msg_int(1,line,file,"%s %s \"%s\"", MRCONF_STR_ERROR, MRCONF_STR_FIELD_NO_VALUE, add_line);
+            mr_msg_int(1,line,file,"%s %s", MRCONF_STR_WARNING, MRCONF_STR_IGNORE);
             break;
 
         case MRCONF_CLOSE_BUT_NOT_OPEN:
-            mr_msg_int(1,line,file,"%s %s\n", MRCONF_STR_WARNING, MRCONF_STR_CLOSE_BUT_NOT_OPEN);
+            mr_msg_int(1,line,file,"%s %s", MRCONF_STR_WARNING, MRCONF_STR_CLOSE_BUT_NOT_OPEN);
             break;
 
         case MRCONF_CALL_BUT_NOT_OPEN:
-            mr_msg_int(1,line,file,"%s %s\n", MRCONF_STR_WARNING, MRCONF_STR_CALL_BUT_NOT_OPEN);
+            mr_msg_int(1,line,file,"%s %s", MRCONF_STR_WARNING, MRCONF_STR_CALL_BUT_NOT_OPEN);
             break;
 
         case MRCONF_OPEN_OPENED:
-            mr_msg_int(1,line,file,"%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_OPEN_OPENED);
+            mr_msg_int(1,line,file,"%s %s", MRCONF_STR_ERROR, MRCONF_STR_OPEN_OPENED);
             break;
 
         case MRCONF_STRING_QUOTE:
-            mr_msg_int(1,line,file,"%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_STRING_QUOTE);
+            mr_msg_int(1,line,file,"%s %s", MRCONF_STR_ERROR, MRCONF_STR_STRING_QUOTE);
             break;
 
         case MRCONF_STRING_ENDQUOTE:
-            mr_msg_int(1,line,file,"%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_STRING_ENDQUOTE);
+            mr_msg_int(1,line,file,"%s %s", MRCONF_STR_ERROR, MRCONF_STR_STRING_ENDQUOTE);
             break;
 
         default:
-            mr_msg_int(1,line,file,"%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_DEFAULT_ERROR);
-            break;
-        }
-    }
-}
+            mr_msg_int(1,line,file,"%s %s", MRCONF_STR_ERROR, MRCONF_STR_DEFAULT_ERROR);
+            break;
+        }
+    }
+}