firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-24 06:03:02 +01:00
Code Issues

Fix fb_lock_print compilation

Browse Source
This commit is contained in:
hvlad 2009-12-06 09:36:52 +00:00
parent 162cb26a66
commit 9473425cb2
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lock/print.cpp
View File

@ -448,7 +448,7 @@ int CLIB_ROUTINE main( int argc, char *argv[])
exit(FINI_OK); exit(FINI_OK);
} }
ISC_STATUS_ARRAY status_vector; Firebird::Arg::StatusVector statusVector;
sh_mem shmem_data; sh_mem shmem_data;
Firebird::AutoPtr<UCHAR, Firebird::ArrayDelete<UCHAR> > buffer; Firebird::AutoPtr<UCHAR, Firebird::ArrayDelete<UCHAR> > buffer;
@ -456,13 +456,13 @@ int CLIB_ROUTINE main( int argc, char *argv[])
if (db_file) if (db_file)
{ {
LOCK_header = (lhb*) ISC_map_file(status_vector, filename.c_str(), LOCK_header = (lhb*) ISC_map_file(statusVector, filename.c_str(),
prt_lock_init, NULL, 0, &shmem_data); prt_lock_init, NULL, 0, &shmem_data);
if (!LOCK_header) if (!LOCK_header)
{ {
FPRINTF(outfile, "Unable to access lock table.\n"); FPRINTF(outfile, "Unable to access lock table.\n");
gds__print_status(status_vector); gds__print_status(statusVector.value());
exit(FINI_OK); exit(FINI_OK);
} }
@ -507,7 +507,7 @@ int CLIB_ROUTINE main( int argc, char *argv[])
Firebird::PathName extName; Firebird::PathName extName;
sh_mem extData; sh_mem extData;
extName.printf("%s.ext%d", filename.c_str(), extent); extName.printf("%s.ext%d", filename.c_str(), extent);
UCHAR* ext = (UCHAR*) ISC_map_file(status_vector, extName.c_str(), UCHAR* ext = (UCHAR*) ISC_map_file(statusVector, extName.c_str(),
prt_lock_init, NULL, 0, &extData); prt_lock_init, NULL, 0, &extData);
if (! ext) if (! ext)
{ {
@ -515,7 +515,7 @@ int CLIB_ROUTINE main( int argc, char *argv[])
exit(FINI_OK); exit(FINI_OK);
} }
memcpy(((UCHAR*) buffer) + extent * extentSize, ext, extentSize); memcpy(((UCHAR*) buffer) + extent * extentSize, ext, extentSize);
ISC_unmap_file(status_vector, &extData); ISC_unmap_file(statusVector, &extData);
} }
LOCK_header = (lhb*)(UCHAR*) buffer; LOCK_header = (lhb*)(UCHAR*) buffer;
@ -523,7 +523,7 @@ int CLIB_ROUTINE main( int argc, char *argv[])
if (LOCK_header->lhb_length > shmem_data.sh_mem_length_mapped) if (LOCK_header->lhb_length > shmem_data.sh_mem_length_mapped)
{ {
const ULONG length = LOCK_header->lhb_length; const ULONG length = LOCK_header->lhb_length;
LOCK_header = (lhb*) ISC_remap_file(status_vector, &shmem_data, length, false); LOCK_header = (lhb*) ISC_remap_file(statusVector, &shmem_data, length, false);
} }
#endif #endif
@ -799,7 +799,7 @@ int CLIB_ROUTINE main( int argc, char *argv[])
if (db_file) if (db_file)
{ {
ISC_unmap_file(status_vector, &shmem_data); ISC_unmap_file(statusVector, &shmem_data);
} }
return FINI_OK; return FINI_OK;