make OS/2 VFS functions static (CVS 5376)
FossilOrigin-Name: b40d9496d03b16a25c164bbb694860539f77cbc3
This commit is contained in:
pweilbacher
parent
c8c0f8fc85
commit
7f6358b4f5
14
manifest
14
manifest
@ -1,5 +1,5 @@
|
||||
C Fix\sa\sbug\sin\swhere.c\sintroduced\sby\scheck-in\s(5373).\s(CVS\s5375)
|
||||
D 2008-07-08T19:45:02
|
||||
C make\sOS/2\sVFS\sfunctions\sstatic\s(CVS\s5376)
|
||||
D 2008-07-08T19:46:24
|
||||
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
|
||||
F Makefile.in 325dfac0a0dd1cb4d975f1ace6453157892e6042
|
||||
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
|
||||
@ -130,7 +130,7 @@ F src/mutex_w32.c f0d21ff1f6981e5aedc56796adf3a347423ef736
|
||||
F src/os.c 292b3b4a49fe5bf6cf2f1cf0af186ebd334e80b8
|
||||
F src/os.h ef8abeb9afc694b82dbd169a91c9b7e26db3c892
|
||||
F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60
|
||||
F src/os_os2.c 38fd8cfb1c122c39e451d9f3e779c602283dba33
|
||||
F src/os_os2.c 7ca541fc04fa3be98b1f3d2a5b6d6daa425f8b60
|
||||
F src/os_unix.c 3d19f0491e0b32e5b757c7e6f310f2f6d3aea3f4
|
||||
F src/os_win.c 2bf2f8cd700299564cc236262c2668e1e02c626a
|
||||
F src/pager.c 2cd554d474cfa0228ece30645fe7bb7d1f6824c7
|
||||
@ -600,7 +600,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
|
||||
F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
|
||||
F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
|
||||
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
|
||||
P 8ed04b1e26a55306e4baf3e93fb084514134d603
|
||||
R bea4bf84c30b7b87b32a902e7322dcf0
|
||||
U drh
|
||||
Z 3a2fb73c3ed74c4bfec70edda5223524
|
||||
P 1ed98f9e617fb422efc37c4a3a5c5f0702467868
|
||||
R 6e4e70358db42b8f8dcd50ec7b7d6dda
|
||||
U pweilbacher
|
||||
Z 63744f7f09cac2a3e40c86fea6a789dd
|
||||
|
||||
@ -1 +1 @@
|
||||
1ed98f9e617fb422efc37c4a3a5c5f0702467868
|
||||
b40d9496d03b16a25c164bbb694860539f77cbc3
|
||||
36
src/os_os2.c
36
src/os_os2.c
@ -12,7 +12,7 @@
|
||||
**
|
||||
** This file contains code that is specific to OS/2.
|
||||
**
|
||||
** $Id: os_os2.c,v 1.47 2008/06/26 10:41:19 danielk1977 Exp $
|
||||
** $Id: os_os2.c,v 1.48 2008/07/08 19:46:24 pweilbacher Exp $
|
||||
*/
|
||||
|
||||
#include "sqliteInt.h"
|
||||
@ -79,7 +79,7 @@ struct os2File {
|
||||
/*
|
||||
** Close a file.
|
||||
*/
|
||||
int os2Close( sqlite3_file *id ){
|
||||
static int os2Close( sqlite3_file *id ){
|
||||
APIRET rc = NO_ERROR;
|
||||
os2File *pFile;
|
||||
if( id && (pFile = (os2File*)id) != 0 ){
|
||||
@ -103,7 +103,7 @@ int os2Close( sqlite3_file *id ){
|
||||
** bytes were read successfully and SQLITE_IOERR if anything goes
|
||||
** wrong.
|
||||
*/
|
||||
int os2Read(
|
||||
static int os2Read(
|
||||
sqlite3_file *id, /* File to read from */
|
||||
void *pBuf, /* Write content into this buffer */
|
||||
int amt, /* Number of bytes to read */
|
||||
@ -133,7 +133,7 @@ int os2Read(
|
||||
** Write data from a buffer into a file. Return SQLITE_OK on success
|
||||
** or some other error code on failure.
|
||||
*/
|
||||
int os2Write(
|
||||
static int os2Write(
|
||||
sqlite3_file *id, /* File to write into */
|
||||
const void *pBuf, /* The bytes to be written */
|
||||
int amt, /* Number of bytes to write */
|
||||
@ -165,7 +165,7 @@ int os2Write(
|
||||
/*
|
||||
** Truncate an open file to a specified size
|
||||
*/
|
||||
int os2Truncate( sqlite3_file *id, i64 nByte ){
|
||||
static int os2Truncate( sqlite3_file *id, i64 nByte ){
|
||||
APIRET rc = NO_ERROR;
|
||||
os2File *pFile = (os2File*)id;
|
||||
OSTRACE3( "TRUNCATE %d %lld\n", pFile->h, nByte );
|
||||
@ -186,7 +186,7 @@ int sqlite3_fullsync_count = 0;
|
||||
/*
|
||||
** Make sure all writes to a particular file are committed to disk.
|
||||
*/
|
||||
int os2Sync( sqlite3_file *id, int flags ){
|
||||
static int os2Sync( sqlite3_file *id, int flags ){
|
||||
os2File *pFile = (os2File*)id;
|
||||
OSTRACE3( "SYNC %d lock=%d\n", pFile->h, pFile->locktype );
|
||||
#ifdef SQLITE_TEST
|
||||
@ -201,7 +201,7 @@ int os2Sync( sqlite3_file *id, int flags ){
|
||||
/*
|
||||
** Determine the current size of a file in bytes
|
||||
*/
|
||||
int os2FileSize( sqlite3_file *id, sqlite3_int64 *pSize ){
|
||||
static int os2FileSize( sqlite3_file *id, sqlite3_int64 *pSize ){
|
||||
APIRET rc = NO_ERROR;
|
||||
FILESTATUS3 fsts3FileInfo;
|
||||
memset(&fsts3FileInfo, 0, sizeof(fsts3FileInfo));
|
||||
@ -278,7 +278,7 @@ static int unlockReadLock( os2File *id ){
|
||||
** It is not possible to lower the locking level one step at a time. You
|
||||
** must go straight to locking level 0.
|
||||
*/
|
||||
int os2Lock( sqlite3_file *id, int locktype ){
|
||||
static int os2Lock( sqlite3_file *id, int locktype ){
|
||||
int rc = SQLITE_OK; /* Return code from subroutines */
|
||||
APIRET res = NO_ERROR; /* Result of an OS/2 lock call */
|
||||
int newLocktype; /* Set pFile->locktype to this value before exiting */
|
||||
@ -414,7 +414,7 @@ int os2Lock( sqlite3_file *id, int locktype ){
|
||||
** file by this or any other process. If such a lock is held, return
|
||||
** non-zero, otherwise zero.
|
||||
*/
|
||||
int os2CheckReservedLock( sqlite3_file *id, int *pOut ){
|
||||
static int os2CheckReservedLock( sqlite3_file *id, int *pOut ){
|
||||
int r = 0;
|
||||
os2File *pFile = (os2File*)id;
|
||||
assert( pFile!=0 );
|
||||
@ -460,7 +460,7 @@ int os2CheckReservedLock( sqlite3_file *id, int *pOut ){
|
||||
** is NO_LOCK. If the second argument is SHARED_LOCK then this routine
|
||||
** might return SQLITE_IOERR;
|
||||
*/
|
||||
int os2Unlock( sqlite3_file *id, int locktype ){
|
||||
static int os2Unlock( sqlite3_file *id, int locktype ){
|
||||
int type;
|
||||
os2File *pFile = (os2File*)id;
|
||||
APIRET rc = SQLITE_OK;
|
||||
@ -553,7 +553,7 @@ static int os2DeviceCharacteristics(sqlite3_file *id){
|
||||
** into UCS-2 and then from UCS-2 to the current codepage.
|
||||
** The returned char pointer has to be freed.
|
||||
*/
|
||||
char *convertUtf8PathToCp(const char *in)
|
||||
static char *convertUtf8PathToCp(const char *in)
|
||||
{
|
||||
UconvObject uconv;
|
||||
UniChar ucsUtf8Cp[12],
|
||||
@ -583,7 +583,7 @@ char *convertUtf8PathToCp(const char *in)
|
||||
** string into UCS-2 and then from UCS-2 to the codepage of UTF-8.
|
||||
** The returned char pointer has to be freed.
|
||||
*/
|
||||
char *convertCpPathToUtf8(const char *in)
|
||||
static char *convertCpPathToUtf8(const char *in)
|
||||
{
|
||||
UconvObject uconv;
|
||||
UniChar ucsUtf8Cp[12],
|
||||
@ -799,7 +799,7 @@ static int os2Open(
|
||||
/*
|
||||
** Delete the named file.
|
||||
*/
|
||||
int os2Delete(
|
||||
static int os2Delete(
|
||||
sqlite3_vfs *pVfs, /* Not used on os2 */
|
||||
const char *zFilename, /* Name of file to delete */
|
||||
int syncDir /* Not used on os2 */
|
||||
@ -898,7 +898,7 @@ static void *os2DlOpen(sqlite3_vfs *pVfs, const char *zFilename){
|
||||
static void os2DlError(sqlite3_vfs *pVfs, int nBuf, char *zBufOut){
|
||||
/* no-op */
|
||||
}
|
||||
void *os2DlSym(sqlite3_vfs *pVfs, void *pHandle, const char *zSymbol){
|
||||
static void *os2DlSym(sqlite3_vfs *pVfs, void *pHandle, const char *zSymbol){
|
||||
PFN pfn;
|
||||
APIRET rc;
|
||||
rc = DosQueryProcAddr((HMODULE)pHandle, 0L, zSymbol, &pfn);
|
||||
@ -912,7 +912,7 @@ void *os2DlSym(sqlite3_vfs *pVfs, void *pHandle, const char *zSymbol){
|
||||
}
|
||||
return rc != NO_ERROR ? 0 : (void*)pfn;
|
||||
}
|
||||
void os2DlClose(sqlite3_vfs *pVfs, void *pHandle){
|
||||
static void os2DlClose(sqlite3_vfs *pVfs, void *pHandle){
|
||||
DosFreeModule((HMODULE)pHandle);
|
||||
}
|
||||
#else /* if SQLITE_OMIT_LOAD_EXTENSION is defined: */
|
||||
@ -1071,10 +1071,10 @@ int sqlite3_os_init(void){
|
||||
os2GetLastError /* xGetLastError */
|
||||
};
|
||||
sqlite3_vfs_register(&os2Vfs, 1);
|
||||
return SQLITE_OK;
|
||||
return SQLITE_OK;
|
||||
}
|
||||
int sqlite3_os_end(void){
|
||||
return SQLITE_OK;
|
||||
int sqlite3_os_end(void){
|
||||
return SQLITE_OK;
|
||||
}
|
||||
|
||||
#endif /* SQLITE_OS_OS2 */
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user