Browse Source

[PATCH] Kill a bunch of pointer sign warnings for gcc4

- 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>
maint
Brian Gerst 20 years ago committed by Linus Torvalds
parent
commit
bf0f910d1d
  1. 4
      cache.h
  2. 2
      diff-cache.c
  3. 4
      diff-files.c
  4. 4
      http-pull.c
  5. 2
      ls-tree.c
  6. 2
      read-cache.c
  7. 2
      rpush.c
  8. 18
      sha1_file.c
  9. 2
      strbuf.h
  10. 6
      tar-tree.c

4
cache.h

@ -143,7 +143,7 @@ extern char *sha1_file_name(const unsigned char *sha1); @@ -143,7 +143,7 @@ extern char *sha1_file_name(const unsigned char *sha1);
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);

@ -167,7 +167,7 @@ extern int error(const char *err, ...); @@ -167,7 +167,7 @@ extern int error(const char *err, ...);
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);


2
diff-cache.c

@ -63,7 +63,7 @@ static int show_modified(struct cache_entry *old, @@ -63,7 +63,7 @@ static int show_modified(struct cache_entry *old,
{
unsigned int mode, oldmode;
unsigned char *sha1;
unsigned char old_sha1_hex[60];
char old_sha1_hex[60];

if (get_stat_data(new, &sha1, &mode) < 0) {
if (report_missing)

4
diff-files.c

@ -48,7 +48,7 @@ static void show_file(int pfx, struct cache_entry *ce) @@ -48,7 +48,7 @@ static void show_file(int pfx, struct cache_entry *ce)
}

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];
@ -64,7 +64,7 @@ static void show_modified(int oldmode, int mode, @@ -64,7 +64,7 @@ static void show_modified(int oldmode, int mode,

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;


4
http-pull.c

@ -24,7 +24,7 @@ static int zret; @@ -24,7 +24,7 @@ static int zret;

static size_t fwrite_sha1_file(void *ptr, size_t eltsize, size_t nmemb,
void *data) {
char expn[4096];
unsigned char expn[4096];
size_t size = eltsize * nmemb;
int posn = 0;
do {
@ -49,7 +49,7 @@ int fetch(unsigned char *sha1) @@ -49,7 +49,7 @@ int fetch(unsigned char *sha1)
{
char *hex = sha1_to_hex(sha1);
char *filename = sha1_file_name(sha1);
char real_sha1[20];
unsigned char real_sha1[20];
char *url;
char *posn;


2
ls-tree.c

@ -24,7 +24,7 @@ static void print_path_prefix(struct path_prefix *prefix) @@ -24,7 +24,7 @@ static void print_path_prefix(struct path_prefix *prefix)
}

static void list_recursive(void *buffer,
const unsigned char *type,
const char *type,
unsigned long size,
struct path_prefix *prefix)
{

2
read-cache.c

@ -344,7 +344,7 @@ unmap: @@ -344,7 +344,7 @@ unmap:
}

#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)

2
rpush.c

@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
void service(int fd_in, int fd_out) {
ssize_t size;
int posn;
char sha1[20];
char unsigned sha1[20];
unsigned long objsize;
void *buf;
do {

18
sha1_file.c

@ -313,13 +313,13 @@ void * unpack_sha1_file(void *map, unsigned long mapsize, char *type, unsigned l @@ -313,13 +313,13 @@ void * unpack_sha1_file(void *map, unsigned long mapsize, char *type, unsigned l
int ret, bytes;
z_stream stream;
char buffer[8192];
char *buf;
unsigned char *buf;

/* 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);
@ -359,7 +359,7 @@ void * read_sha1_file(const unsigned char *sha1, char *type, unsigned long *size @@ -359,7 +359,7 @@ void * read_sha1_file(const unsigned char *sha1, char *type, unsigned long *size
}

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)
{
@ -403,20 +403,20 @@ void *read_object_with_reference(const unsigned char *sha1, @@ -403,20 +403,20 @@ void *read_object_with_reference(const unsigned char *sha1,
}
}

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)
{
int size;
char *compressed;
unsigned char *compressed;
z_stream stream;
unsigned char sha1[20];
SHA_CTX c;
char *filename;
static char tmpfile[PATH_MAX];
char hdr[50];
unsigned char hdr[50];
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);
@ -516,8 +516,8 @@ int write_sha1_from_fd(const unsigned char *sha1, int fd) @@ -516,8 +516,8 @@ int write_sha1_from_fd(const unsigned char *sha1, int fd)
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 ret;
SHA_CTX c;


2
strbuf.h

@ -4,7 +4,7 @@ struct strbuf { @@ -4,7 +4,7 @@ struct strbuf {
int alloc;
int len;
int eof;
unsigned char *buf;
char *buf;
};

extern void strbuf_init(struct strbuf *);

6
tar-tree.c

@ -205,7 +205,7 @@ static void append_extended_header(char **p, const char *keyword, @@ -205,7 +205,7 @@ static void append_extended_header(char **p, const char *keyword,
append_char(p, '\n');
}

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 */
@ -238,7 +238,7 @@ static void write_extended_header(const char *headerfilename, int is_dir, @@ -238,7 +238,7 @@ static void write_extended_header(const char *headerfilename, int is_dir,
free(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;
@ -253,7 +253,7 @@ static void write_global_extended_header(const char *sha1) @@ -253,7 +253,7 @@ static void write_global_extended_header(const char *sha1)
}

/* 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)
{

Loading…
Cancel
Save