punt mrgdb

[moira.git] / lib / mr_query.c

diff --git a/lib/mr_query.c b/lib/mr_query.c
index af22ef891f5e265fb86e42151a94b92ffdc29d17..820c9108a51d9daf70631a899aff83141acf9558 100644 (file)
--- a/lib/mr_query.c
+++ b/lib/mr_query.c
@@ -18,9 +18,6 @@
 
 RCSID("$Header$");
 
-int mr_query_internal(int argc, char **argv,
-                     int (*callback)(int, char **, void *), void *callarg);
-
 /*
  * This routine is the primary external interface to the mr library.
  *
@@ -32,77 +29,45 @@ static int level = 0;
 int mr_query(char *name, int argc, char **argv,
             int (*callproc)(int, char **, void *), void *callarg)
 {
-  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_query_internal(argc + 1, nargv, callproc, callarg);
-  free(nargv);
-  return status;
-}
-
-/*
- * This routine makes a Moira query.
- *
- * argv[0] is the query name.
- * argv[1..argc-1] are the query arguments.
- *
- * callproc is called once for each returned value, with arguments
- * argc, argv, and callarg.
- * If it returns a non-zero value, further calls to it are not done, and
- * all future data from the server is ignored (there should be some
- * way to send it a quench..)
- */
-
-int mr_query_internal(int argc, char **argv,
-                     int (*callproc)(int, char **, void *), void *callarg)
-{
-  int status;
-  mr_params params_st;
-  mr_params *params = NULL;
-  mr_params *reply = NULL;
-  int stopcallbacks = 0;
+  int status, stopcallbacks = 0;
+  mr_params params, reply;
 
+  CHECK_CONNECTED;
   if (level)
     return MR_QUERY_NOT_REENTRANT;
 
-  CHECK_CONNECTED;
-  level++;
-
-  params = &params_st;
-  params->mr_version_no = sending_version_no;
-  params->mr_procno = MR_QUERY;
-  params->mr_argc = argc;
-  params->mr_argl = NULL;
-  params->mr_argv = argv;
+  params.u.mr_procno = MR_QUERY;
+  params.mr_argc = argc + 1;
+  params.mr_argl = NULL;
+  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);
 
-  if ((status = mr_do_call(params, &reply)))
+  level++;
+  if ((status = mr_do_call(&params, &reply)))
     goto punt;
 
-  while ((status = reply->mr_status) == MR_MORE_DATA)
+  while ((status = reply.u.mr_status) == MR_MORE_DATA)
     {
-      if (!stopcallbacks && callproc)
-       stopcallbacks = (*callproc)(reply->mr_argc, reply->mr_argv, callarg);
+      if (!stopcallbacks)
+       stopcallbacks = (*callproc)(reply.mr_argc, reply.mr_argv, callarg);
       mr_destroy_reply(reply);
-      reply = NULL;
-
-      initialize_operation(_mr_recv_op, mr_start_recv, &reply, NULL);
-      queue_operation(_mr_conn, CON_INPUT, _mr_recv_op);
 
-      complete_operation(_mr_recv_op);
-      if (OP_STATUS(_mr_recv_op) != OP_COMPLETE)
+      if (mr_receive(_mr_conn, &reply) != MR_SUCCESS)
        {
          mr_disconnect();
          status = MR_ABORTED;
          goto punt_1;
        }
     }
+
 punt:
   mr_destroy_reply(reply);
 punt_1:
   level--;
+  free(params.mr_argv);
+
   return status;
 }