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

Merge branch 'maint'

Browse Source 
* maint:
  msvc: Fix some compiler warnings
  Documentation: grep: fix asciidoc problem with --
  msvc: Fix some "expr evaluates to function" compiler warnings
This commit is contained in:
Junio C Hamano 2010-06-25 11:45:27 -07:00
commit f526d120f6
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-grep.txt
View File

@ -183,7 +183,7 @@ OPTIONS
Examples Examples
-------- --------
git grep 'time_t' -- '*.[ch]':: git grep 'time_t' \-- '*.[ch]'::
Looks for `time_t` in all tracked .c and .h files in the working Looks for `time_t` in all tracked .c and .h files in the working
directory and its subdirectories. directory and its subdirectories.

8
block-sha1/sha1.c
View File

@ -236,13 +236,13 @@ void blk_SHA1_Init(blk_SHA_CTX *ctx)
void blk_SHA1_Update(blk_SHA_CTX *ctx, const void *data, unsigned long len) void blk_SHA1_Update(blk_SHA_CTX *ctx, const void *data, unsigned long len)
{ {
int lenW = ctx->size & 63; unsigned int lenW = ctx->size & 63;
ctx->size += len; ctx->size += len;
/* Read the data into W and process blocks as they get full */ /* Read the data into W and process blocks as they get full */
if (lenW) { if (lenW) {
int left = 64 - lenW; unsigned int left = 64 - lenW;
if (len < left) if (len < left)
left = len; left = len;
memcpy(lenW + (char *)ctx->W, data, left); memcpy(lenW + (char *)ctx->W, data, left);
@ -269,8 +269,8 @@ void blk_SHA1_Final(unsigned char hashout[20], blk_SHA_CTX *ctx)
int i; int i;
/* Pad with a binary 1 (ie 0x80), then zeroes, then length */ /* Pad with a binary 1 (ie 0x80), then zeroes, then length */
padlen[0] = htonl(ctx->size >> 29); padlen[0] = htonl((uint32_t)(ctx->size >> 29));
padlen[1] = htonl(ctx->size << 3); padlen[1] = htonl((uint32_t)(ctx->size << 3));
i = ctx->size & 63; i = ctx->size & 63;
blk_SHA1_Update(ctx, pad, 1+ (63 & (55 - i))); blk_SHA1_Update(ctx, pad, 1+ (63 & (55 - i)));

4
builtin.h
View File

@ -23,13 +23,13 @@ struct notes_rewrite_cfg {
struct notes_tree **trees; struct notes_tree **trees;
const char *cmd; const char *cmd;
int enabled; int enabled;
combine_notes_fn *combine; combine_notes_fn combine;
struct string_list *refs; struct string_list *refs;
int refs_from_env; int refs_from_env;
int mode_from_env; int mode_from_env;
}; };
combine_notes_fn *parse_combine_notes_fn(const char *v); combine_notes_fn parse_combine_notes_fn(const char *v);
struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd); struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd);
int copy_note_for_rewrite(struct notes_rewrite_cfg *c, int copy_note_for_rewrite(struct notes_rewrite_cfg *c,
const unsigned char *from_obj, const unsigned char *to_obj); const unsigned char *from_obj, const unsigned char *to_obj);

2
builtin/notes.c
View File

@ -313,7 +313,7 @@ int commit_notes(struct notes_tree *t, const char *msg)
return 0; return 0;
} }
combine_notes_fn *parse_combine_notes_fn(const char *v) combine_notes_fn parse_combine_notes_fn(const char *v)
{ {
if (!strcasecmp(v, "overwrite")) if (!strcasecmp(v, "overwrite"))
return combine_notes_overwrite; return combine_notes_overwrite;

4
notes.h
View File

@ -18,7 +18,7 @@
* combine_notes_concatenate(), which appends the contents of the new note to * combine_notes_concatenate(), which appends the contents of the new note to
* the contents of the existing note. * the contents of the existing note.
*/ */
typedef int combine_notes_fn(unsigned char *cur_sha1, const unsigned char *new_sha1); typedef int (*combine_notes_fn)(unsigned char *cur_sha1, const unsigned char *new_sha1);
/* Common notes combinators */ /* Common notes combinators */
int combine_notes_concatenate(unsigned char *cur_sha1, const unsigned char *new_sha1); int combine_notes_concatenate(unsigned char *cur_sha1, const unsigned char *new_sha1);
@ -38,7 +38,7 @@ extern struct notes_tree {
struct int_node *root; struct int_node *root;
struct non_note *first_non_note, *prev_non_note; struct non_note *first_non_note, *prev_non_note;
char *ref; char *ref;
combine_notes_fn *combine_notes; combine_notes_fn combine_notes;
int initialized; int initialized;
int dirty; int dirty;
} default_notes_tree; } default_notes_tree;