Punt restriction against apostrophes in strings: the new server

[moira.git] / dcm / utils.c

diff --git a/dcm/utils.c b/dcm/utils.c
index 014b8ccdcbb46cb3cb3c92b77bbf4ef48dacf7d0..db51555b7b79cd4136525f9e2baed15e6e18d583 100644 (file)
--- a/dcm/utils.c
+++ b/dcm/utils.c
@@ -18,13 +18,13 @@ static char *rcsid_utils_c = "$Header$";
 #include <mit-copyright.h>
 #include <stdio.h>
 #include <strings.h>
+#include <errno.h>
 #include <varargs.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/file.h>
-#include <zephyr/zephyr.h>
-#include <sms.h>
-#include <sms_app.h>
+#include <moira.h>
+#include <moira_site.h>
 #include "dcm.h"
 
 
@@ -114,7 +114,7 @@ int exclusive;
 }
 
 
-int sms_query_with_retry(name, argc, argv, proc, hint)
+int mr_query_with_retry(name, argc, argv, proc, hint)
 char *name;
 int argc;
 char **argv;
@@ -124,8 +124,8 @@ char *hint;
     int status, tries;
 
     for (tries = 0; tries < DEADLOCK_TRIES; tries++) {
-       status = sms_query(name, argc, argv, proc, hint);
-       if (status != SMS_DEADLOCK)
+       status = mr_query(name, argc, argv, proc, hint);
+       if (status != MR_DEADLOCK)
          return(status);
        sleep(DEADLOCK_WAIT);
     }