Diane Delgado's changes for a fixed table-locking order

[moira.git] / lib / mr_call.c

diff --git a/lib/mr_call.c b/lib/mr_call.c
index b1e35c509f340422c50b2eafc6ac4c377eb53642..86ca32c980207809b064c8458c6abede49ce8cc3 100644 (file)
--- a/lib/mr_call.c
+++ b/lib/mr_call.c
@@ -13,46 +13,36 @@ static char *rcsid_sms_call_c = "$Header$";
 #endif lint
 
 #include <mit-copyright.h>
-#include "sms_private.h"
+#include "mr_private.h"
 
-sms_do_call(params, reply)
-    struct sms_params *params;
-    struct sms_params **reply;
+mr_do_call(params, reply)
+    struct mr_params *params;
+    struct mr_params **reply;
 {
     CHECK_CONNECTED;
     
-    if (!_sms_send_op)
-       _sms_send_op = create_operation();
+    if (!_mr_send_op)
+       _mr_send_op = create_operation();
 
-    if (!_sms_recv_op)
-       _sms_recv_op = create_operation();
+    if (!_mr_recv_op)
+       _mr_recv_op = create_operation();
 
-    initialize_operation(_sms_send_op, sms_start_send, (char *)params,
+    initialize_operation(_mr_send_op, mr_start_send, (char *)params,
                         (int (*)())NULL);
-    queue_operation(_sms_conn, CON_OUTPUT, _sms_send_op);
+    queue_operation(_mr_conn, CON_OUTPUT, _mr_send_op);
 
-    initialize_operation(_sms_recv_op, sms_start_recv, (char *)reply,
+    initialize_operation(_mr_recv_op, mr_start_recv, (char *)reply,
                         (int (*)())NULL);
-    queue_operation(_sms_conn, CON_INPUT, _sms_recv_op);
+    queue_operation(_mr_conn, CON_INPUT, _mr_recv_op);
 
     /* Block until operation done. */
-    complete_operation(_sms_send_op);
-    complete_operation(_sms_recv_op);
+    mr_complete_operation(_mr_send_op);
+    mr_complete_operation(_mr_recv_op);
     /* Look at results */
-    if ((OP_STATUS(_sms_send_op) != OP_COMPLETE) ||
-       (OP_STATUS(_sms_recv_op) != OP_COMPLETE)) {
-       sms_disconnect();
-       return SMS_ABORTED;
+    if ((OP_STATUS(_mr_send_op) != OP_COMPLETE) ||
+       (OP_STATUS(_mr_recv_op) != OP_COMPLETE)) {
+       mr_disconnect();
+       return MR_ABORTED;
     }
     return 0;
 }
-/*
- * Local Variables:
- * mode: c
- * c-indent-level: 4
- * c-continued-statement-offset: 4
- * c-brace-offset: -4
- * c-argdecl-indent: 4
- * c-label-offset: -4
- * End:
- */