Code style cleanup. (No functional changes)

[moira.git] / lib / mr_access.c

diff --git a/lib/mr_access.c b/lib/mr_access.c
index c8633f1d67f1ee0a9f1722d6edc843cfca707f37..5c13d9ccb5220f021590e551babdefcb2629c3e5 100644 (file)
--- a/lib/mr_access.c
+++ b/lib/mr_access.c
@@ -20,45 +20,42 @@ static char *rcsid_sms_access_c = "$Header$";
 /*
  * Check access to a named query.
  */
-int mr_access(name, argc, argv)
-    char *name;                        /* Query name */
-    int argc;                  /* Arg count */
-    char **argv;               /* Args */
+int mr_access(char *name, int argc, char **argv)
 {
-    register char **nargv = (char **)malloc(sizeof(char *) * (argc+1));
-    register int status = 0;
-    nargv[0] = name;
-    memcpy((char *)(nargv+1), (char *)argv, sizeof(char *) * argc);
-    status = mr_access_internal(argc+1, nargv);
-    free(nargv);
-    return status;
+  register char **nargv = malloc(sizeof(char *) * (argc + 1));
+  register int status = 0;
+
+  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(argc, argv)
-    int argc;                  /* Arg count */
-    char **argv;               /* Args */
+int mr_access_internal(int argc, char **argv)
 {
-    int status;
-    mr_params params_st;
-    register mr_params *params = NULL;
-    mr_params *reply = NULL;
-    
-    CHECK_CONNECTED;
+  int status;
+  mr_params params_st;
+  register 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 = &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;
-       
-    if ((status = mr_do_call(params, &reply)) == 0)
-       status = reply->mr_status;
+  if ((status = mr_do_call(params, &reply)) == 0)
+    status = reply->mr_status;
 
-    mr_destroy_reply(reply);
+  mr_destroy_reply(reply);
 
-    return status;
+  return status;
 }