fix some warnings in tunproxy.c

[sliver-openvswitch.git] / lib / vlog.c

diff --git a/lib/vlog.c b/lib/vlog.c
index 2587cde..8bc9938 100644 (file)
--- a/lib/vlog.c
+++ b/lib/vlog.c
@@ -43,6 +43,11 @@ VLOG_DEFINE_THIS_MODULE(vlog);
 
 COVERAGE_DEFINE(vlog_recursive);
 
+/* ovs_assert() logs the assertion message, so using ovs_assert() in this
+ * source file could cause recursion. */
+#undef ovs_assert
+#define ovs_assert use_assert_instead_of_ovs_assert_in_this_module
+
 /* Name for each logging level. */
 static const char *level_names[VLL_N_LEVELS] = {
 #define VLOG_LEVEL(NAME, SYSLOG_LEVEL) #NAME,
@@ -426,6 +431,16 @@ exit:
     return msg;
 }
 
+/* Set debugging levels.  Abort with an error message if 's' is invalid. */
+void
+vlog_set_levels_from_string_assert(const char *s)
+{
+    char *error = vlog_set_levels_from_string(s);
+    if (error) {
+        ovs_fatal(0, "%s", error);
+    }
+}
+
 /* If 'arg' is null, configure maximum verbosity.  Otherwise, sets
  * configuration according to 'arg' (see vlog_set_levels_from_string()). */
 void