Fixed small error (which should manifest anyway)

[eval.git] / submit / submitd.h

diff --git a/submit/submitd.h b/submit/submitd.h
index 6078eb995d7d95bb145d30a28275ad313515a188..f2b72ff9cfbc817690b56c41fb4ab9d0ed76a988 100644 (file)
--- a/submit/submitd.h
+++ b/submit/submitd.h
@@ -7,9 +7,9 @@
 #ifndef _SUBMITD_H
 #define _SUBMITD_H
 
-#include "lib/clists.h"
-#include "lib/ipaccess.h"
-#include "lib/fastbuf.h"
+#include "ucw/clists.h"
+#include "ucw/ipaccess.h"
+#include "ucw/fastbuf.h"
 
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
@@ -31,12 +31,12 @@ struct conn {
   // Set up by the master process
   cnode n;
   u32 ip;
-  byte *ip_string;                     // (xmalloced)
+  char *ip_string;                     // (xmalloced)
   pid_t pid;
   uns id;
   struct access_rule *rule;            // Rule matched by this connection
   int sk;                              // Client socket
-  byte *cert_name;                     // Client name from the certificate (NULL if no TLS) (xmalloced)
+  char *cert_name;                     // Client name from the certificate (NULL if no TLS) (xmalloced)
 
   // Used by the child process
   gnutls_session_t tls;                        // TLS session
@@ -46,12 +46,12 @@ struct conn {
   struct odes *reply;
   struct odes *task_status;
   int task_lock_fd;
-  byte *user;
+  char *user;
 };
 
 extern uns max_request_size, max_attachment_size, trace_commands;
 extern uns max_versions;
-extern byte *history_format;
+extern char *history_format;
 
 /* submitd.c */
 
@@ -66,7 +66,7 @@ int process_command(struct conn *c);
 
 struct task {
   cnode n;
-  byte *name;
+  char *name;
   uns open_data;       // Number of parts for open-data tasks
   uns max_size;                // Maximum size (0=use global default)
   clist parts;         // List of parts of this task (simp_nodes)
@@ -76,19 +76,19 @@ struct task {
 extern clist task_list;
 extern struct cf_section tasks_conf;
 
-struct task *task_find(byte *name);
-int part_exists_p(struct task *t, byte *name);
-int user_exists_p(byte *user);
-int ext_exists_p(struct task *t, byte *ext);
+struct task *task_find(char *name);
+int part_exists_p(struct task *t, char *name);
+int user_exists_p(char *user);
+int ext_exists_p(struct task *t, char *ext);
 
 void task_lock_status(struct conn *c);
 void task_unlock_status(struct conn *c, uns write_back);
 void task_load_status(struct conn *c);
 
 struct odes *task_status_find_task(struct conn *c, struct task *t, uns create);
-struct odes *task_status_find_part(struct odes *t, byte *part, uns create);
+struct odes *task_status_find_part(struct odes *t, char *part, uns create);
 
-void task_submit_part(byte *user, byte *task, byte *part, byte *ext, uns version, struct fastbuf *fb);
-void task_delete_part(byte *user, byte *task, byte *part, byte *ext, uns version);
+void task_submit_part(char *user, char *task, char *part, char *ext, uns version, struct fastbuf *fb);
+void task_delete_part(char *user, char *task, char *part, char *ext, uns version);
 
 #endif