Code style cleanup. (No functional changes)

[moira.git] / update / client.c

diff --git a/update/client.c b/update/client.c
index 1d88e0c116fe485d1c72c7936462858d9f2c9ad2..30aaa1aefb1403b9e3173937d14852544d24a42c 100644 (file)
--- a/update/client.c
+++ b/update/client.c
@@ -62,125 +62,112 @@ CONNECTION conn;
  * PROBLEMS:
  *
  */
-static void
-initialize()
+static void initialize()
 {
-    static int initialized = 0;
+  static int initialized = 0;
 
-    if (!initialized) {
-       gdb_init();
-       initialized++;
+  if (!initialized)
+    {
+      gdb_init();
+      initialized++;
     }
 }
 
-send_auth(host_name)
-char *host_name;
+int send_auth(char *host_name)
 {
-    KTEXT_ST ticket_st;
-    KTEXT ticket = &ticket_st;
-    STRING data;
-    register int code;
-    int response;
-    int auth_version = 2;
-    
-    code = get_mr_update_ticket(host_name, ticket);
-    if (code) {
-       return(code);
-    }
-    STRING_DATA(data) = "AUTH_002";
-    MAX_STRING_SIZE(data) = 9;
-    code = send_object(conn, (char *)&data, STRING_T);
-    if (code) {
-       return(connection_errno(conn));
-    }
-    code = receive_object(conn, (char *)&response, INTEGER_T);
-    if (code) {
-       return(connection_errno(conn));
-    }
-    if (response) {
-       STRING_DATA(data) = "AUTH_001";
-       MAX_STRING_SIZE(data) = 9;
-       code = send_object(conn, (char *)&data, STRING_T);
-       if (code) {
-           return(connection_errno(conn));
-       }
-       code = receive_object(conn, (char *)&response, INTEGER_T);
-       if (code) {
-           return(connection_errno(conn));
-       }
-       if (response) {
-           return(response);
-       }
-       auth_version = 1;
-    }
-    STRING_DATA(data) = (char *)ticket->dat;
-    MAX_STRING_SIZE(data) = ticket->length;
-    code = send_object(conn, (char *)&data, STRING_T);
-    if (code) {
-       return(connection_errno(conn));
-    }
-    code = receive_object(conn, (char *)&response, INTEGER_T);
-    if (code) {
-       return(connection_errno(conn));
-    }
-    if (response) {
-       return(response);
+  KTEXT_ST ticket_st;
+  KTEXT ticket = &ticket_st;
+  STRING data;
+  register int code;
+  int response;
+  int auth_version = 2;
+
+  code = get_mr_update_ticket(host_name, ticket);
+  if (code)
+    return code;
+  STRING_DATA(data) = "AUTH_002";
+  MAX_STRING_SIZE(data) = 9;
+  code = send_object(conn, (char *)&data, STRING_T);
+  if (code)
+    return connection_errno(conn);
+  code = receive_object(conn, (char *)&response, INTEGER_T);
+  if (code)
+    return connection_errno(conn);
+  if (response)
+    {
+      STRING_DATA(data) = "AUTH_001";
+      MAX_STRING_SIZE(data) = 9;
+      code = send_object(conn, (char *)&data, STRING_T);
+      if (code)
+       return connection_errno(conn);
+      code = receive_object(conn, (char *)&response, INTEGER_T);
+      if (code)
+       return connection_errno(conn);
+      if (response)
+       return response;
+      auth_version = 1;
     }
-    
-    if (auth_version == 2) {
-       des_key_schedule sched;
-       C_Block enonce;
-
-       code = receive_object(conn, (char *)&data, STRING_T);
-       if (code) {
-           return(connection_errno(conn));
-       }
-       des_key_sched(session, sched);
-       des_ecb_encrypt(STRING_DATA(data), enonce, sched, 1);
-       STRING_DATA(data) = enonce;
-       code = send_object(conn, (char *)&data, STRING_T);
-       if (code) {
-           return(connection_errno(conn));
-       }
-       code = receive_object(conn, (char *)&response, INTEGER_T);
-       if (code) {
-           return(connection_errno(conn));
-       }
-       if (response) {
-           return(response);
-       }
+  STRING_DATA(data) = (char *)ticket->dat;
+  MAX_STRING_SIZE(data) = ticket->length;
+  code = send_object(conn, (char *)&data, STRING_T);
+  if (code)
+    return connection_errno(conn);
+  code = receive_object(conn, (char *)&response, INTEGER_T);
+  if (code)
+    return connection_errno(conn);
+  if (response)
+    return response;
+
+  if (auth_version == 2)
+    {
+      des_key_schedule sched;
+      C_Block enonce;
+
+      code = receive_object(conn, (char *)&data, STRING_T);
+      if (code)
+       return connection_errno(conn);
+      des_key_sched(session, sched);
+      des_ecb_encrypt(STRING_DATA(data), enonce, sched, 1);
+      STRING_DATA(data) = enonce;
+      code = send_object(conn, (char *)&data, STRING_T);
+      if (code)
+       return connection_errno(conn);
+      code = receive_object(conn, (char *)&response, INTEGER_T);
+      if (code)
+       return connection_errno(conn);
+      if (response)
+       return response;
     }
 
-    return(MR_SUCCESS);
+  return MR_SUCCESS;
 }
 
-execute(path)
-    char *path;
+int execute(char *path)
 {
-    int response;
-    STRING data;
-    register int code;
-    
-    string_alloc(&data, BUFSIZ);
-    sprintf(STRING_DATA(data), "EXEC_002 %s", path);
-    code = send_object(conn, (char *)&data, STRING_T);
-    if (code)
-       return(connection_errno(conn));
-    code = receive_object(conn, (char *)&response, INTEGER_T);
-    if (code)
-       return(connection_errno(conn));
-    if (response)
-      return(response);
-    return(MR_SUCCESS);
+  int response;
+  STRING data;
+  register int code;
+
+  string_alloc(&data, BUFSIZ);
+  sprintf(STRING_DATA(data), "EXEC_002 %s", path);
+  code = send_object(conn, (char *)&data, STRING_T);
+  if (code)
+    return connection_errno(conn);
+  code = receive_object(conn, (char *)&response, INTEGER_T);
+  if (code)
+    return connection_errno(conn);
+  if (response)
+    return response;
+  return MR_SUCCESS;
 }
 
-send_quit()
+send_quit(void)
 {
-    STRING str;
-    if (!conn)
-       return;
-    string_alloc(&str, 5);
-    (void) strcpy(STRING_DATA(str), "quit");
-    (void) send_object(conn, (char *)&str, STRING_T);
-    string_free(&str);
+  STRING str;
+  if (!conn)
+    return;
+  string_alloc(&str, 5);
+  strcpy(STRING_DATA(str), "quit");
+  send_object(conn, (char *)&str, STRING_T);
+  string_free(&str);
 }