Merge branch 'refs/heads/t/clean_server_exit'

[paraslash.git] / afs.c

diff --git a/afs.c b/afs.c
index 0014379..4fe2140 100644 (file)
--- a/afs.c
+++ b/afs.c
@@ -22,8 +22,8 @@
 #include "string.h"
 #include "afh.h"
 #include "afs.h"
 #include "string.h"
 #include "afh.h"
 #include "afs.h"

-#include "server.h"

 #include "net.h"
 #include "net.h"

+#include "server.h"

 #include "ipc.h"
 #include "list.h"
 #include "sched.h"
 #include "ipc.h"
 #include "list.h"
 #include "sched.h"


@@ -687,8 +687,7 @@ static int open_afs_tables(void)
                ret = afs_tables[i].open(database_dir);
                if (ret >= 0)
                        continue;
                ret = afs_tables[i].open(database_dir);
                if (ret >= 0)
                        continue;

-               PARA_ERROR_LOG("%s open: %s\n", afs_tables[i].name,
-                       para_strerror(-ret));
+               PARA_ERROR_LOG("could not open %s\n", afs_tables[i].name);

                break;
        }
        if (ret >= 0)
                break;
        }
        if (ret >= 0)