From 2fee336b52cb217e8b2bf0973229cd50bf06aeee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Wed, 29 Jan 2003 15:09:18 +0000 Subject: [PATCH] Removed the load_driver_symbols() call, since it doesn't seem to have any effect anyway. Now passes the flags parameter on to the Query. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2597 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../file_systems/bfs/kernel_interface.cpp | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp b/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp index 8c14cbb1e0..60ef2dd39f 100644 --- a/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp +++ b/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp @@ -231,16 +231,6 @@ bfs_mount(nspace_id nsid, const char *device, ulong flags, void *parms, { FUNCTION(); -#ifndef USER - // If you can't build the file system because of this line, you can either - // add the prototype: - // extern int load_driver_symbols(const char *driver_name); - // to your KernelExport.h include (since it's missing there in some releases - // of BeOS R5), or just comment out the line, it won't do any harm and is - // used only for debugging purposes. - load_driver_symbols(BFS_NAME); -#endif - Volume *volume = new Volume(nsid); if (volume == NULL) return B_NO_MEMORY; @@ -2004,28 +1994,28 @@ bfs_open_query(void *_ns, const char *queryString, ulong flags, port_id port, PRINT(("query = \"%s\", flags = %lu, port_id = %ld, token = %ld\n", queryString, flags, port, token)); Volume *volume = (Volume *)_ns; - + Expression *expression = new Expression((char *)queryString); if (expression == NULL) RETURN_ERROR(B_NO_MEMORY); - + if (expression->InitCheck() < B_OK) { FATAL(("Could not parse query, stopped at: \"%s\"\n", expression->Position())); delete expression; RETURN_ERROR(B_BAD_VALUE); } - Query *query = new Query(volume, expression); + Query *query = new Query(volume, expression, flags); if (query == NULL) { delete expression; RETURN_ERROR(B_NO_MEMORY); } - + if (flags & B_LIVE_QUERY) query->SetLiveMode(port, token); *cookie = (void *)query; - + return B_OK; }