diff options
author | wtc%netscape.com <devnull@localhost> | 2002-09-06 01:42:09 +0000 |
---|---|---|
committer | wtc%netscape.com <devnull@localhost> | 2002-09-06 01:42:09 +0000 |
commit | 428a7ee9383dffd5c58ff9c0f97135e8991a2f5c (patch) | |
tree | eb308175c8d6acd8c5683371257b30bdf4d0fc57 | |
parent | 4f1bdfc6b8e98244502f72058c855d62dc6eac59 (diff) | |
download | nspr-hg-428a7ee9383dffd5c58ff9c0f97135e8991a2f5c.tar.gz |
Bug 166716: do not assert in the unimplemented memory-mapped fileMOZILLA_1_2a_RELEASE
functions. It is sufficient for them to fail with the not implemented
error.
Modified Files: bmmap.c macio.c os2misc.c
Tag: NSPRPUB_PRE_4_2_CLIENT_BRANCH
-rw-r--r-- | pr/src/md/beos/bmmap.c | 3 | ||||
-rw-r--r-- | pr/src/md/mac/macio.c | 5 | ||||
-rw-r--r-- | pr/src/md/os2/os2misc.c | 5 |
3 files changed, 3 insertions, 10 deletions
diff --git a/pr/src/md/beos/bmmap.c b/pr/src/md/beos/bmmap.c index 2af102cc..27759693 100644 --- a/pr/src/md/beos/bmmap.c +++ b/pr/src/md/beos/bmmap.c @@ -37,6 +37,7 @@ PR_EXTERN(PRStatus) _PR_MD_CREATE_FILE_MAP(PRFileMap *fmap, PRInt64 size) { + PR_SetError( PR_NOT_IMPLEMENTED_ERROR, 0 ); return PR_FAILURE; } @@ -57,11 +58,13 @@ _PR_MD_MEM_MAP(PRFileMap *fmap, PRInt64 offset, PRUint32 len) PR_EXTERN(PRStatus) _PR_MD_MEM_UNMAP(void *addr, PRUint32 size) { + PR_SetError( PR_NOT_IMPLEMENTED_ERROR, 0 ); return PR_FAILURE; } PR_EXTERN(PRStatus) _PR_MD_CLOSE_FILE_MAP(PRFileMap *fmap) { + PR_SetError( PR_NOT_IMPLEMENTED_ERROR, 0 ); return PR_FAILURE; } diff --git a/pr/src/md/mac/macio.c b/pr/src/md/mac/macio.c index ef404db5..188929a3 100644 --- a/pr/src/md/mac/macio.c +++ b/pr/src/md/mac/macio.c @@ -1906,14 +1906,12 @@ PRStatus _MD_CreateFileMap(PRFileMap *fmap, PRInt64 size) { #pragma unused (fmap, size) - PR_ASSERT(!"Not implemented"); PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0); return PR_FAILURE; } PRInt32 _MD_GetMemMapAlignment(void) { - PR_ASSERT(!"Not implemented"); PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0); return -1; } @@ -1925,7 +1923,6 @@ void * _MD_MemMap( { #pragma unused (fmap, offset, len) - PR_ASSERT(!"Not implemented"); PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0); return NULL; } @@ -1934,7 +1931,6 @@ PRStatus _MD_MemUnmap(void *addr, PRUint32 len) { #pragma unused (addr, len) - PR_ASSERT(!"Not implemented"); PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0); return PR_FAILURE; } @@ -1943,7 +1939,6 @@ PRStatus _MD_CloseFileMap(PRFileMap *fmap) { #pragma unused (fmap) - PR_ASSERT(!"Not implemented"); PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0); return PR_FAILURE; } diff --git a/pr/src/md/os2/os2misc.c b/pr/src/md/os2/os2misc.c index c27b0614..250972af 100644 --- a/pr/src/md/os2/os2misc.c +++ b/pr/src/md/os2/os2misc.c @@ -452,14 +452,12 @@ _PR_MD_WAKEUP_CPUS( void ) PRStatus _MD_CreateFileMap(PRFileMap *fmap, PRInt64 size) { - PR_ASSERT(!"Not implemented"); PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0); return PR_FAILURE; } PRInt32 _MD_GetMemMapAlignment(void) { - PR_ASSERT(!"Not implemented"); PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0); return -1; } @@ -469,21 +467,18 @@ void * _MD_MemMap( PROffset64 offset, PRUint32 len) { - PR_ASSERT(!"Not implemented"); PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0); return NULL; } PRStatus _MD_MemUnmap(void *addr, PRUint32 len) { - PR_ASSERT(!"Not implemented"); PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0); return PR_FAILURE; } PRStatus _MD_CloseFileMap(PRFileMap *fmap) { - PR_ASSERT(!"Not implemented"); PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0); return PR_FAILURE; } |