author | Junio C Hamano <gitster@pobox.com> | |
Fri, 25 Jun 2010 18:45:27 +0000 (11:45 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 25 Jun 2010 18:45:27 +0000 (11:45 -0700) |
* maint:
msvc: Fix some compiler warnings
Documentation: grep: fix asciidoc problem with --
msvc: Fix some "expr evaluates to function" compiler warnings
msvc: Fix some compiler warnings
Documentation: grep: fix asciidoc problem with --
msvc: Fix some "expr evaluates to function" compiler warnings
Documentation/git-grep.txt | patch | blob | history | |
block-sha1/sha1.c | patch | blob | history | |
builtin.h | patch | blob | history | |
builtin/notes.c | patch | blob | history | |
notes.h | patch | blob | history |
index 4b32322a67d9f3de8b555d3d9d03e7ddab14e0a7..912bddd7b67bb486a703814f116a73fa047e667c 100644 (file)
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
directory and its subdirectories.
diff --git a/block-sha1/sha1.c b/block-sha1/sha1.c
index d8934757a5e5e259f26c4a09f7ea5d10615df0c1..d880a5336ecbee175162a86a3336a783c79b0eb0 100644 (file)
--- a/block-sha1/sha1.c
+++ b/block-sha1/sha1.c
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;
/* Read the data into W and process blocks as they get full */
if (lenW) {
- int left = 64 - lenW;
+ unsigned int left = 64 - lenW;
if (len < left)
left = len;
memcpy(lenW + (char *)ctx->W, data, left);
int i;
/* Pad with a binary 1 (ie 0x80), then zeroes, then length */
- padlen[0] = htonl(ctx->size >> 29);
- padlen[1] = htonl(ctx->size << 3);
+ padlen[0] = htonl((uint32_t)(ctx->size >> 29));
+ padlen[1] = htonl((uint32_t)(ctx->size << 3));
i = ctx->size & 63;
blk_SHA1_Update(ctx, pad, 1+ (63 & (55 - i)));
diff --git a/builtin.h b/builtin.h
index b614d12b9f3464eff9ecfa90c2eb5ecf43a82b7e..1054c6e2950c3bc433841683ca4fcf7ce6501df3 100644 (file)
--- a/builtin.h
+++ b/builtin.h
struct notes_tree **trees;
const char *cmd;
int enabled;
- combine_notes_fn *combine;
+ combine_notes_fn combine;
struct string_list *refs;
int refs_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);
int copy_note_for_rewrite(struct notes_rewrite_cfg *c,
const unsigned char *from_obj, const unsigned char *to_obj);
diff --git a/builtin/notes.c b/builtin/notes.c
index 648033c27e75e9a19e9fd3a2fa21b2e26b19d5ac..f1f53a80e188327c0da21b046f0e8879caabc6af 100644 (file)
--- a/builtin/notes.c
+++ b/builtin/notes.c
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"))
return combine_notes_overwrite;
index cc2dff22a12f2f7e78d37fb316e70f0a1ebaa2cd..65fc3a66b2f575dd078cc390e7f5ea5cbebffc96 100644 (file)
--- a/notes.h
+++ b/notes.h
* combine_notes_concatenate(), which appends the contents of the new note to
* 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 */
int combine_notes_concatenate(unsigned char *cur_sha1, const unsigned char *new_sha1);
struct int_node *root;
struct non_note *first_non_note, *prev_non_note;
char *ref;
- combine_notes_fn *combine_notes;
+ combine_notes_fn combine_notes;
int initialized;
int dirty;
} default_notes_tree;