Command line printer manipulation client, and build goo.

[moira.git] / server / query.h

diff --git a/server/query.h b/server/query.h
index 097d7f5e4f3f725381c29263759725358ef24874..7a663def6cde24622761f188a13270466211a50e 100644 (file)
--- a/server/query.h
+++ b/server/query.h
@@ -8,7 +8,7 @@
  */
 
 /* Query Types */
-enum query_type {RETRIEVE, UPDATE, APPEND, DELETE, SPECIAL};
+enum query_type {MR_Q_RETRIEVE, MR_Q_UPDATE, MR_Q_APPEND, MR_Q_DELETE, MR_Q_SPECIAL};
 
 /* Query Definition Structure */
 struct query
@@ -65,16 +65,6 @@ struct valobj
   int error;
 };
 
-
-/* prototypes from cache.dc */
-void flush_cache(void);
-int name_to_id(char *name, enum tables type, int *id);
-int id_to_name(int id, enum tables type, char **name);
-int cache_entry(char *name, enum tables type, int id);
-void flush_name(char *name, enum tables type);
-void cache_commit(void);
-void cache_abort(void);
-
 /* prototypes from increment.dc */
 void incremental_before(enum tables table, char *qualx, char **argv);
 void incremental_clear_before(void);
@@ -84,9 +74,11 @@ void incremental_clear_after(void);
 /* prototypes from qrtn.dc */
 int check_query_access(struct query *q, char *argv[], client *cl);
 int set_next_object_id(char *objectx, enum tables table, int limit);
+int name_to_id(char *name, enum tables type, int *id);
+int id_to_name(int id, enum tables type, char **name);
 
 /* prototypes from qsubs.c */
-void list_queries(int (*action)(int, char *[], void *),
+void list_queries(client *cl, int (*action)(int, char *[], void *),
                  void *actarg);
 void help_query(struct query *q, int (*action)(int, char *[], void *),
                void *actarg);