- Raw hashes should be unsigned char.
- String functions want signed char.
- Hash and compress functions want unsigned char.
Signed-off By: Brian Gerst <bgerst@didntduck.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
extern void * map_sha1_file(const unsigned char *sha1, unsigned long *size);
extern void * unpack_sha1_file(void *map, unsigned long mapsize, char *type, unsigned long *size);
extern void * read_sha1_file(const unsigned char *sha1, char *type, unsigned long *size);
extern void * map_sha1_file(const unsigned char *sha1, unsigned long *size);
extern void * unpack_sha1_file(void *map, unsigned long mapsize, char *type, unsigned long *size);
extern void * read_sha1_file(const unsigned char *sha1, char *type, unsigned long *size);
-extern int write_sha1_file(char *buf, unsigned long len, const char *type, unsigned char *return_sha1);
+extern int write_sha1_file(void *buf, unsigned long len, const char *type, unsigned char *return_sha1);
extern int check_sha1_signature(unsigned char *sha1, void *buf, unsigned long size, const char *type);
extern int check_sha1_signature(unsigned char *sha1, void *buf, unsigned long size, const char *type);
extern int cache_name_compare(const char *name1, int len1, const char *name2, int len2);
extern void *read_object_with_reference(const unsigned char *sha1,
extern int cache_name_compare(const char *name1, int len1, const char *name2, int len2);
extern void *read_object_with_reference(const unsigned char *sha1,
- const unsigned char *required_type,
+ const char *required_type,
unsigned long *size,
unsigned char *sha1_ret);
unsigned long *size,
unsigned char *sha1_ret);
{
unsigned int mode, oldmode;
unsigned char *sha1;
{
unsigned int mode, oldmode;
unsigned char *sha1;
- unsigned char old_sha1_hex[60];
if (get_stat_data(new, &sha1, &mode) < 0) {
if (report_missing)
if (get_stat_data(new, &sha1, &mode) < 0) {
if (report_missing)
}
static void show_modified(int oldmode, int mode,
}
static void show_modified(int oldmode, int mode,
- const char *old_sha1, const char *sha1,
+ const unsigned char *old_sha1, const unsigned char *sha1,
char *path)
{
char old_sha1_hex[41];
char *path)
{
char old_sha1_hex[41];
int main(int argc, char **argv)
{
int main(int argc, char **argv)
{
- static const char null_sha1[20] = { 0, };
+ static const unsigned char null_sha1[20] = { 0, };
int entries = read_cache();
int i;
int entries = read_cache();
int i;
static size_t fwrite_sha1_file(void *ptr, size_t eltsize, size_t nmemb,
void *data) {
static size_t fwrite_sha1_file(void *ptr, size_t eltsize, size_t nmemb,
void *data) {
+ unsigned char expn[4096];
size_t size = eltsize * nmemb;
int posn = 0;
do {
size_t size = eltsize * nmemb;
int posn = 0;
do {
{
char *hex = sha1_to_hex(sha1);
char *filename = sha1_file_name(sha1);
{
char *hex = sha1_to_hex(sha1);
char *filename = sha1_file_name(sha1);
+ unsigned char real_sha1[20];
}
static void list_recursive(void *buffer,
}
static void list_recursive(void *buffer,
- const unsigned char *type,
unsigned long size,
struct path_prefix *prefix)
{
unsigned long size,
struct path_prefix *prefix)
{
}
#define WRITE_BUFFER_SIZE 8192
}
#define WRITE_BUFFER_SIZE 8192
-static char write_buffer[WRITE_BUFFER_SIZE];
+static unsigned char write_buffer[WRITE_BUFFER_SIZE];
static unsigned long write_buffer_len;
static int ce_write(SHA_CTX *context, int fd, void *data, unsigned int len)
static unsigned long write_buffer_len;
static int ce_write(SHA_CTX *context, int fd, void *data, unsigned int len)
void service(int fd_in, int fd_out) {
ssize_t size;
int posn;
void service(int fd_in, int fd_out) {
ssize_t size;
int posn;
+ char unsigned sha1[20];
unsigned long objsize;
void *buf;
do {
unsigned long objsize;
void *buf;
do {
int ret, bytes;
z_stream stream;
char buffer[8192];
int ret, bytes;
z_stream stream;
char buffer[8192];
/* Get the data stream */
memset(&stream, 0, sizeof(stream));
stream.next_in = map;
stream.avail_in = mapsize;
/* Get the data stream */
memset(&stream, 0, sizeof(stream));
stream.next_in = map;
stream.avail_in = mapsize;
- stream.next_out = buffer;
+ stream.next_out = (unsigned char *)buffer;
stream.avail_out = sizeof(buffer);
inflateInit(&stream);
stream.avail_out = sizeof(buffer);
inflateInit(&stream);
}
void *read_object_with_reference(const unsigned char *sha1,
}
void *read_object_with_reference(const unsigned char *sha1,
- const unsigned char *required_type,
+ const char *required_type,
unsigned long *size,
unsigned char *actual_sha1_return)
{
unsigned long *size,
unsigned char *actual_sha1_return)
{
-int write_sha1_file(char *buf, unsigned long len, const char *type, unsigned char *returnsha1)
+int write_sha1_file(void *buf, unsigned long len, const char *type, unsigned char *returnsha1)
+ unsigned char *compressed;
z_stream stream;
unsigned char sha1[20];
SHA_CTX c;
char *filename;
static char tmpfile[PATH_MAX];
z_stream stream;
unsigned char sha1[20];
SHA_CTX c;
char *filename;
static char tmpfile[PATH_MAX];
int fd, hdrlen, ret;
/* Generate the header */
int fd, hdrlen, ret;
/* Generate the header */
- hdrlen = sprintf(hdr, "%s %lu", type, len)+1;
+ hdrlen = sprintf((char *)hdr, "%s %lu", type, len)+1;
/* Sha1.. */
SHA1_Init(&c);
/* Sha1.. */
SHA1_Init(&c);
int local;
z_stream stream;
unsigned char real_sha1[20];
int local;
z_stream stream;
unsigned char real_sha1[20];
- char buf[4096];
- char discard[4096];
+ unsigned char buf[4096];
+ unsigned char discard[4096];
int alloc;
int len;
int eof;
int alloc;
int len;
int eof;
};
extern void strbuf_init(struct strbuf *);
};
extern void strbuf_init(struct strbuf *);
-static void write_header(const char *, char, const char *, struct path_prefix *,
+static void write_header(const unsigned char *, char, const char *, struct path_prefix *,
const char *, unsigned int, void *, unsigned long);
/* stores a pax extended header directly in the block buffer */
const char *, unsigned int, void *, unsigned long);
/* stores a pax extended header directly in the block buffer */
-static void write_global_extended_header(const char *sha1)
+static void write_global_extended_header(const unsigned char *sha1)
{
char *p;
unsigned int size;
{
char *p;
unsigned int size;
}
/* stores a ustar header directly in the block buffer */
}
/* stores a ustar header directly in the block buffer */
-static void write_header(const char *sha1, char typeflag, const char *basepath,
+static void write_header(const unsigned char *sha1, char typeflag, const char *basepath,
struct path_prefix *prefix, const char *path,
unsigned int mode, void *buffer, unsigned long size)
{
struct path_prefix *prefix, const char *path,
unsigned int mode, void *buffer, unsigned long size)
{