undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] Remove map_sha1_file

Browse Source 
Remove map_sha1_file(), now unused.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Daniel Barkalow 2005-07-10 18:27:02 -04:00 committed by Linus Torvalds
parent a5eda52bfe
commit d5f1befca8
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cache.h
View File

@ -165,7 +165,6 @@ extern char *sha1_file_name(const unsigned char *sha1);
int safe_create_leading_directories(char *path); int safe_create_leading_directories(char *path);
/* Read and unpack a sha1 file into memory, write memory to a sha1 file */ /* Read and unpack a sha1 file into memory, write memory to a sha1 file */
extern void * map_sha1_file(const unsigned char *sha1, unsigned long *size);
extern int unpack_sha1_header(z_stream *stream, void *map, unsigned long mapsize, void *buffer, unsigned long size); extern int unpack_sha1_header(z_stream *stream, void *map, unsigned long mapsize, void *buffer, unsigned long size);
extern int parse_sha1_header(char *hdr, char *type, unsigned long *sizep); extern int parse_sha1_header(char *hdr, char *type, unsigned long *sizep);
extern int sha1_object_info(const unsigned char *, char *, unsigned long *); extern int sha1_object_info(const unsigned char *, char *, unsigned long *);

18
sha1_file.c
View File

@ -487,8 +487,7 @@ int check_sha1_signature(const unsigned char *sha1, void *map, unsigned long siz
} }
static void *map_sha1_file_internal(const unsigned char *sha1, static void *map_sha1_file_internal(const unsigned char *sha1,
unsigned long *size, unsigned long *size)
int say_error)
{ {
struct stat st; struct stat st;
void *map; void *map;
@ -496,8 +495,6 @@ static void *map_sha1_file_internal(const unsigned char *sha1,
char *filename = find_sha1_file(sha1, &st); char *filename = find_sha1_file(sha1, &st);
if (!filename) { if (!filename) {
if (say_error)
error("cannot map sha1 file %s", sha1_to_hex(sha1));
return NULL; return NULL;
} }
@ -511,8 +508,6 @@ static void *map_sha1_file_internal(const unsigned char *sha1,
break; break;
/* Fallthrough */ /* Fallthrough */
case 0: case 0:
if (say_error)
perror(filename);
return NULL; return NULL;
} }
@ -529,11 +524,6 @@ static void *map_sha1_file_internal(const unsigned char *sha1,
return map; return map;
} }
void *map_sha1_file(const unsigned char *sha1, unsigned long *size)
{
return map_sha1_file_internal(sha1, size, 1);
}
int unpack_sha1_header(z_stream *stream, void *map, unsigned long mapsize, void *buffer, unsigned long size) int unpack_sha1_header(z_stream *stream, void *map, unsigned long mapsize, void *buffer, unsigned long size)
{ {
/* Get the data stream */ /* Get the data stream */
@ -1007,7 +997,7 @@ int sha1_object_info(const unsigned char *sha1, char *type, unsigned long *sizep
z_stream stream; z_stream stream;
char hdr[128]; char hdr[128];
map = map_sha1_file_internal(sha1, &mapsize, 0); map = map_sha1_file_internal(sha1, &mapsize);
if (!map) { if (!map) {
struct pack_entry e; struct pack_entry e;
@ -1046,7 +1036,7 @@ void * read_sha1_file(const unsigned char *sha1, char *type, unsigned long *size
unsigned long mapsize; unsigned long mapsize;
void *map, *buf; void *map, *buf;
map = map_sha1_file_internal(sha1, &mapsize, 0); map = map_sha1_file_internal(sha1, &mapsize);
if (map) { if (map) {
buf = unpack_sha1_file(map, mapsize, type, size); buf = unpack_sha1_file(map, mapsize, type, size);
munmap(map, mapsize); munmap(map, mapsize);
@ -1226,7 +1216,7 @@ int write_sha1_to_fd(int fd, const unsigned char *sha1)
ssize_t size; ssize_t size;
unsigned long objsize; unsigned long objsize;
int posn = 0; int posn = 0;
char *buf = map_sha1_file_internal(sha1, &objsize, 0); char *buf = map_sha1_file_internal(sha1, &objsize);
z_stream stream; z_stream stream;
if (!buf) { if (!buf) {
unsigned char *unpacked; unsigned char *unpacked;