Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed the load_driver_symbols() call, since it doesn't seem to have any

Browse Source 
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
This commit is contained in:
Axel Dörfler 2003-01-29 15:09:18 +00:00
parent f60043082d
commit 2fee336b52
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
View File

@ -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;
}