Fix prototype of com_create().

[adu.git] / adu.h

diff --git a/adu.h b/adu.h
index ea660dd7188e35e6f37c6a0ee812e08bf7d46c89..f8ef9c2ddf53af4a6c44ff9b3193487cbf8c9838 100644 (file)
--- a/adu.h
+++ b/adu.h
@@ -8,7 +8,7 @@
 
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <sys/wait.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h> /* time(), localtime() */
@@ -16,11 +16,7 @@
 #include <errno.h>
 #include <limits.h>
 #include <stdarg.h>
-#include <ctype.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <sys/un.h> /* needed by create_pf_socket */
+#include <inttypes.h>
 #include <string.h>
 #include <assert.h>
 #include <osl.h>
@@ -118,8 +114,8 @@
        } \
 }
 
-#define FOR_EACH_USER(ui) for (ui = uid_hash_table; ui && ui < uid_hash_table \
-               + uid_hash_table_size; ui++)
+/** Evaluates to 1 if x < y, to -1 if x > y and to 0 if x == y. */
+#define NUM_COMPARE(x, y) ((int)((x) < (y)) - (int)((x) > (y)))
 
 /** The columns of the directory table. */
 enum dir_table_columns {
@@ -178,12 +174,7 @@ enum search_uid_flags {
 };
 
 extern uint32_t num_uids;
-extern uint32_t uid_hash_table_size;
 extern struct osl_table *dir_table;
-extern struct user_info *uid_hash_table;
-extern uint64_t num_dirs;
-extern uint64_t num_files;
-extern uint64_t num_bytes;
 extern struct gengetopt_args_info conf;
 
 /* adu.c */
@@ -192,22 +183,16 @@ int open_dir_table(int create);
 void check_signals(void);
 void close_all_tables(void);
 char *get_uid_list_name(void);
-void create_hash_table(void);
+void create_hash_table(unsigned bits);
 int search_uid(uint32_t uid, enum search_uid_flags flags,
                struct user_info **ui_ptr);
+int for_each_admissible_user(int (*func)(struct user_info *, void *),
+               void *data);
+void sort_hash_table(int (*comp)(const void *, const void *));
 
 /* select.c */
 int com_select(void);
 
 /* create.h */
 int com_create(void);
-
-static inline int ui_used(struct user_info *ui)
-{
-       return ui->flags & UI_FL_SLOT_USED;
-}
-
-static inline int ui_admissible(struct user_info *ui)
-{
-       return ui->flags & UI_FL_ADMISSIBLE;
-}
+int com_interactive(void);