Simplify two messages in acquire.c

[bacula/bacula] / bacula / src / stored / stored.c

diff --git a/bacula/src/stored/stored.c b/bacula/src/stored/stored.c
index 8d2868bb7f2fad838fff44319c8737da4d0b9d7b..37d69b540d173d4384b9d41306dce83e4487ff2b 100644 (file)
--- a/bacula/src/stored/stored.c
+++ b/bacula/src/stored/stored.c
@@ -44,21 +44,19 @@ static void *device_allocation(void *arg);
 
 
 /* Global variables exported */
+char OK_msg[]   = "3000 OK\n";
+char TERM_msg[] = "3999 Terminate\n";
+STORES *me;                          /* our Global resource */
 
-
-/* This is our own global resource */
-STORES *me;
-
-static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 static uint32_t VolSessionId = 0;
 uint32_t VolSessionTime;
-
 char *configfile;
-static int foreground = 0;
 
+/* Global static variables */
+static int foreground = 0;
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 static workq_t dird_workq;           /* queue for processing connections */
 
-
 static void usage()
 {
    fprintf(stderr, _(
@@ -92,7 +90,8 @@ int main (int argc, char *argv[])
    char *gid = NULL;
 
    init_stack_dump();
-   my_name_is(argc, argv, "stored");
+   my_name_is(argc, argv, "bacula-sd");
+   textdomain("bacula-sd");
    init_msg(NULL, NULL);
    daemon_start_time = time(NULL);
    memset(&last_job, 0, sizeof(last_job));
@@ -215,7 +214,7 @@ int main (int argc, char *argv[])
     * Sleep a bit to give device thread a chance to lock the resource
     * chain before we start the server.
     */
-   sleep(1); 
+   bmicrosleep(1, 0);
                                 
    /* Single server used for Director and File daemon */
    bnet_thread_server(me->SDaddr, me->SDport, me->max_concurrent_jobs * 2 + 1,