Skip to content

Commit

Permalink
[PATCH] Fix sparse warnings
Browse files Browse the repository at this point in the history
fix one 'should it be static?' warning and
two 'mixing declarations and code' warnings.

Signed-off-by: Alecs King <alecsk@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Alecs King authored and Junio C Hamano committed Aug 4, 2005
1 parent 20f6633 commit 635d37a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
4 changes: 1 addition & 3 deletions connect.c
Original file line number Diff line number Diff line change
Expand Up @@ -230,11 +230,9 @@ int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail,
if (src->peer_ref)
continue;
dst_peer = find_ref_by_name(dst, src->name);
if (dst_peer && dst_peer->peer_ref)
if ((dst_peer && dst_peer->peer_ref) || (!dst_peer && !all))
continue;
if (!dst_peer) {
if (!all)
continue;
/* Create a new one and link it */
int len = strlen(src->name) + 1;
dst_peer = xcalloc(1, sizeof(*dst_peer) + len);
Expand Down
2 changes: 1 addition & 1 deletion ssh-pull.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ static int fd_out;
static unsigned char remote_version = 0;
static unsigned char local_version = 1;

ssize_t force_write(int fd, void *buffer, size_t length)
static ssize_t force_write(int fd, void *buffer, size_t length)
{
ssize_t ret = 0;
while (ret < length) {
Expand Down
2 changes: 1 addition & 1 deletion tools/mailinfo.c
Original file line number Diff line number Diff line change
Expand Up @@ -152,13 +152,13 @@ static void cleanup_space(char *buf)

static void handle_rest(void)
{
FILE *out = cmitmsg;
char *sub = cleanup_subject(subject);
cleanup_space(name);
cleanup_space(date);
cleanup_space(email);
cleanup_space(sub);
printf("Author: %s\nEmail: %s\nSubject: %s\nDate: %s\n\n", name, email, sub, date);
FILE *out = cmitmsg;

do {
if (!memcmp("diff -", line, 6) ||
Expand Down

0 comments on commit 635d37a

Please sign in to comment.