diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-26 13:09:46 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-26 13:09:46 +0000 |
| commit | 7142e36d1f4ed5a45e089bb972db73bb3f91ad94 (patch) | |
| tree | d7b5557844d9d5e2b8e38d829f6d251594da509b /loader | |
| parent | c95db8d583d9f6a773865afe133340966334a86a (diff) | |
| download | mpv-7142e36d1f4ed5a45e089bb972db73bb3f91ad94.tar.bz2 mpv-7142e36d1f4ed5a45e089bb972db73bb3f91ad94.tar.xz | |
Remove useless fd parameter for mmap_anon
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21264 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/ext.c | 12 | ||||
| -rw-r--r-- | loader/ldt_keeper.c | 6 | ||||
| -rw-r--r-- | loader/ldt_keeper.h | 1 |
3 files changed, 4 insertions, 15 deletions
diff --git a/loader/ext.c b/loader/ext.c index e00491878c..b702cc1dd3 100644 --- a/loader/ext.c +++ b/loader/ext.c @@ -248,7 +248,7 @@ LPVOID FILE_dommap( int unix_handle, LPVOID start, if (unix_handle == -1) { - ret = mmap_anon( start, size_low, prot, flags, &fd, offset_low ); + ret = mmap_anon( start, size_low, prot, flags, offset_low ); } else { @@ -365,12 +365,10 @@ HANDLE WINAPI CreateFileMappingA(HANDLE handle, LPSECURITY_ATTRIBUTES lpAttr, mmap_access |=PROT_READ|PROT_WRITE; if(anon) - answer=mmap_anon(NULL, len, mmap_access, MAP_PRIVATE, &hFile, 0); + answer=mmap_anon(NULL, len, mmap_access, MAP_PRIVATE, 0); else answer=mmap(NULL, len, mmap_access, MAP_PRIVATE, hFile, 0); - if(anon && hFile != -1) - close(hFile); if(answer!=(LPVOID)-1) { if(fm==0) @@ -395,8 +393,6 @@ HANDLE WINAPI CreateFileMappingA(HANDLE handle, LPSECURITY_ATTRIBUTES lpAttr, fm->name=NULL; fm->mapping_size=len; - if(anon && hFile != -1) - close(hFile); return (HANDLE)answer; } return (HANDLE)0; @@ -495,11 +491,9 @@ LPVOID WINAPI VirtualAlloc(LPVOID address, DWORD size, DWORD type, DWORD protec } answer=mmap_anon(address, size, PROT_READ | PROT_WRITE | PROT_EXEC, - MAP_PRIVATE, &fd, 0); + MAP_PRIVATE, 0); // answer=FILE_dommap(-1, address, 0, size, 0, 0, // PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE); - if (fd != -1) - close(fd); if (answer != (void *)-1 && address && answer != address) { /* It is dangerous to try mmap() with MAP_FIXED since it does not diff --git a/loader/ldt_keeper.c b/loader/ldt_keeper.c index 504d449a33..fe270b6ba9 100644 --- a/loader/ldt_keeper.c +++ b/loader/ldt_keeper.c @@ -196,12 +196,10 @@ ldt_fs_t* Setup_LDT_Keeper(void) return NULL; fs_seg= - ldt_fs->fs_seg = mmap_anon(NULL, getpagesize(), PROT_READ | PROT_WRITE, MAP_PRIVATE, &ldt_fs->fd, - 0); + ldt_fs->fs_seg = mmap_anon(NULL, getpagesize(), PROT_READ | PROT_WRITE, MAP_PRIVATE, 0); if (ldt_fs->fs_seg == (void*)-1) { perror("ERROR: Couldn't allocate memory for fs segment"); - close(ldt_fs->fd); free(ldt_fs); return NULL; } @@ -282,7 +280,5 @@ void Restore_LDT_Keeper(ldt_fs_t* ldt_fs) free(ldt_fs->prev_struct); munmap((char*)ldt_fs->fs_seg, getpagesize()); ldt_fs->fs_seg = 0; - if (ldt_fs->fd != -1) - close(ldt_fs->fd); free(ldt_fs); } diff --git a/loader/ldt_keeper.h b/loader/ldt_keeper.h index d36ebb892c..e2626e39b5 100644 --- a/loader/ldt_keeper.h +++ b/loader/ldt_keeper.h @@ -9,7 +9,6 @@ extern "C" typedef struct { void* fs_seg; char* prev_struct; - int fd; } ldt_fs_t; void Setup_FS_Segment(void); |