diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2006-12-24 00:45:37 -0500 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-12-24 00:16:56 -0800 |
| commit | d6779124b90ef5c00697815b04c9f75fd3756586 (patch) | |
| tree | 782ce9b9c475328ebf55dbca35bc6492fae56cc9 | |
| parent | gitweb: Paginate commit/author/committer search output (diff) | |
| download | tgif-d6779124b90ef5c00697815b04c9f75fd3756586.tar.xz | |
Rename gitfakemmap to git_mmap.
This minor cleanup was suggested by Johannes Schindelin.
The mmap is still fake in the sense that we don't support PROT_WRITE
or MAP_SHARED with external modification at all, but that hasn't
stopped us from using mmap() thoughout the Git code.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | compat/mmap.c | 6 | ||||
| -rw-r--r-- | git-compat-util.h | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/compat/mmap.c b/compat/mmap.c index 0fd46e793d..bb34c7e95f 100644 --- a/compat/mmap.c +++ b/compat/mmap.c @@ -1,12 +1,12 @@ #include "../git-compat-util.h" -void *gitfakemmap(void *start, size_t length, int prot , int flags, int fd, off_t offset) +void *git_mmap(void *start, size_t length, int prot, int flags, int fd, off_t offset) { int n = 0; off_t current_offset = lseek(fd, 0, SEEK_CUR); if (start != NULL || !(flags & MAP_PRIVATE)) - die("Invalid usage of gitfakemmap."); + die("Invalid usage of mmap when built with NO_MMAP"); if (lseek(fd, offset, SEEK_SET) < 0) { errno = EINVAL; @@ -44,7 +44,7 @@ void *gitfakemmap(void *start, size_t length, int prot , int flags, int fd, off_ return start; } -int gitfakemunmap(void *start, size_t length) +int git_munmap(void *start, size_t length) { free(start); return 0; diff --git a/git-compat-util.h b/git-compat-util.h index f79365b362..5d9eb2615b 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -87,10 +87,10 @@ extern void set_warn_routine(void (*routine)(const char *warn, va_list params)); #define MAP_FAILED ((void*)-1) #endif -#define mmap gitfakemmap -#define munmap gitfakemunmap -extern void *gitfakemmap(void *start, size_t length, int prot , int flags, int fd, off_t offset); -extern int gitfakemunmap(void *start, size_t length); +#define mmap git_mmap +#define munmap git_munmap +extern void *git_mmap(void *start, size_t length, int prot, int flags, int fd, off_t offset); +extern int git_munmap(void *start, size_t length); #else /* NO_MMAP */ |