X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ovsdb%2Fovsdb-server.c;h=ab44b3ab6024c98dfcbb27570e806a3e3f1fe87b;hb=8a8cd0acd09763f5edca6506bb286447c5776778;hp=3520ffc059f55d6b5b3f04f2f55efecbde409ab5;hpb=0a3b723b8ffcfb44224ce591466524dba4914d40;p=sliver-openvswitch.git

diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c
index 3520ffc05..ab44b3ab6 100644
--- a/ovsdb/ovsdb-server.c
+++ b/ovsdb/ovsdb-server.c
@@ -45,7 +45,6 @@
 #include "shash.h"
 #include "stream-ssl.h"
 #include "stream.h"
-#include "stress.h"
 #include "sset.h"
 #include "table.h"
 #include "timeval.h"
@@ -137,7 +136,6 @@ main(int argc, char *argv[])
 
     proctitle_init(argc, argv);
     set_program_name(argv[0]);
-    stress_init_command();
     signal(SIGPIPE, SIG_IGN);
     process_init();
 
@@ -1295,7 +1293,8 @@ save_config__(FILE *config_file, const struct sset *remotes,
     char *s;
 
     if (ftruncate(fileno(config_file), 0) == -1) {
-        VLOG_FATAL("failed to truncate temporary file (%s)", strerror(errno));
+        VLOG_FATAL("failed to truncate temporary file (%s)",
+                   ovs_strerror(errno));
     }
 
     obj = json_object_create();
@@ -1307,7 +1306,7 @@ save_config__(FILE *config_file, const struct sset *remotes,
     if (fseek(config_file, 0, SEEK_SET) != 0
         || fputs(s, config_file) == EOF
         || fflush(config_file) == EOF) {
-        VLOG_FATAL("failed to write temporary file (%s)", strerror(errno));
+        VLOG_FATAL("failed to write temporary file (%s)", ovs_strerror(errno));
     }
     free(s);
 }
@@ -1353,7 +1352,7 @@ load_config(FILE *config_file, struct sset *remotes, struct sset *db_filenames)
     struct json *json;
 
     if (fseek(config_file, 0, SEEK_SET) != 0) {
-        VLOG_FATAL("seek failed in temporary file (%s)", strerror(errno));
+        VLOG_FATAL("seek failed in temporary file (%s)", ovs_strerror(errno));
     }
     json = json_from_stream(config_file);
     if (json->type == JSON_STRING) {