punt mrgdb

[moira.git] / lib / mr_access.c

diff --git a/lib/mr_access.c b/lib/mr_access.c
index 711754a7fd274b7ab755b485123485a0e1b7ec9a..ac70e3e79149dc1bab626c31b3ee48d0a786f4b2 100644 (file)
--- a/lib/mr_access.c
+++ b/lib/mr_access.c
@@ -17,49 +17,30 @@
 
 RCSID("$Header$");
 
-int mr_access_internal(int argc, char **argv);
-
 /*
  * Check access to a named query.
  */
 int mr_access(char *name, int argc, char **argv)
 {
-  char **nargv = malloc(sizeof(char *) * (argc + 1));
-  int status = 0;
-
-  if (!nargv)
-    return ENOMEM;
-  nargv[0] = name;
-  memcpy(nargv + 1, argv, sizeof(char *) * argc);
-  status = mr_access_internal(argc + 1, nargv);
-  free(nargv);
-  return status;
-}
-
-/*
- * Check access to a named query, where the query name is argv[0]
- * and the arguments are the rest of argv[].
- */
-int mr_access_internal(int argc, char **argv)
-{
+  mr_params params, reply;
   int status;
-  mr_params params_st;
-  mr_params *params = NULL;
-  mr_params *reply = NULL;
 
   CHECK_CONNECTED;
 
-  params = &params_st;
-  params->mr_version_no = sending_version_no;
-  params->mr_procno = MR_ACCESS;
-  params->mr_argc = argc;
-  params->mr_argl = NULL;
-  params->mr_argv = argv;
+  params.u.mr_procno = MR_ACCESS;
+  params.mr_argc = argc + 1;
+  params.mr_argv = malloc(sizeof(char *) * (argc + 1));
+  if (!params.mr_argv)
+    return ENOMEM;
+  params.mr_argv[0] = name;
+  memcpy(params.mr_argv + 1, argv, sizeof(char *) * argc);
+  params.mr_argl = NULL;
 
-  if ((status = mr_do_call(params, &reply)) == 0)
-    status = reply->mr_status;
+  if ((status = mr_do_call(&params, &reply)) == MR_SUCCESS)
+    status = reply.u.mr_status;
 
   mr_destroy_reply(reply);
+  free(params.mr_argv);
 
   return status;
 }