Add #define's for container query argument positions.

[moira.git] / server / mr_scall.c

diff --git a/server/mr_scall.c b/server/mr_scall.c
index 222ac93705f4c3fdd23e71627051777aab88e81e..a3f1fa846e10952a8cc1b40e3015a9f42e1e2a99 100644 (file)
--- a/server/mr_scall.c
+++ b/server/mr_scall.c
@@ -77,8 +77,7 @@ void client_read(client *cl)
     {
       com_err(whoami, 0, "procno out of range");
       client_reply(cl, MR_UNKNOWN_PROC);
-      mr_destroy_reply(cl->req);
-      return;
+      goto out;
     }
   log_args(procnames[pn], 2, cl->req.mr_argc, cl->req.mr_argv);
 
@@ -86,8 +85,7 @@ void client_read(client *cl)
     {
       client_reply(cl, MR_DOWN);
       com_err(whoami, MR_DOWN, "(query refused)");
-      mr_destroy_reply(cl->req);
-      return;
+      goto out;
     }
 
   /* make sure this gets cleared before every operation */
@@ -131,6 +129,8 @@ void client_read(client *cl)
       do_version(cl);
       break;
     }
+
+out:
   mr_destroy_reply(cl->req);
   memset(&cl->req, 0, sizeof(mr_params));
 }