[PATCH] Fix sparse warnings
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>maint
parent
20f6633112
commit
635d37afff
|
@ -230,11 +230,9 @@ int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail,
|
||||||
if (src->peer_ref)
|
if (src->peer_ref)
|
||||||
continue;
|
continue;
|
||||||
dst_peer = find_ref_by_name(dst, src->name);
|
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;
|
continue;
|
||||||
if (!dst_peer) {
|
if (!dst_peer) {
|
||||||
if (!all)
|
|
||||||
continue;
|
|
||||||
/* Create a new one and link it */
|
/* Create a new one and link it */
|
||||||
int len = strlen(src->name) + 1;
|
int len = strlen(src->name) + 1;
|
||||||
dst_peer = xcalloc(1, sizeof(*dst_peer) + len);
|
dst_peer = xcalloc(1, sizeof(*dst_peer) + len);
|
||||||
|
|
|
@ -10,7 +10,7 @@ static int fd_out;
|
||||||
static unsigned char remote_version = 0;
|
static unsigned char remote_version = 0;
|
||||||
static unsigned char local_version = 1;
|
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;
|
ssize_t ret = 0;
|
||||||
while (ret < length) {
|
while (ret < length) {
|
||||||
|
|
|
@ -152,13 +152,13 @@ static void cleanup_space(char *buf)
|
||||||
|
|
||||||
static void handle_rest(void)
|
static void handle_rest(void)
|
||||||
{
|
{
|
||||||
|
FILE *out = cmitmsg;
|
||||||
char *sub = cleanup_subject(subject);
|
char *sub = cleanup_subject(subject);
|
||||||
cleanup_space(name);
|
cleanup_space(name);
|
||||||
cleanup_space(date);
|
cleanup_space(date);
|
||||||
cleanup_space(email);
|
cleanup_space(email);
|
||||||
cleanup_space(sub);
|
cleanup_space(sub);
|
||||||
printf("Author: %s\nEmail: %s\nSubject: %s\nDate: %s\n\n", name, email, sub, date);
|
printf("Author: %s\nEmail: %s\nSubject: %s\nDate: %s\n\n", name, email, sub, date);
|
||||||
FILE *out = cmitmsg;
|
|
||||||
|
|
||||||
do {
|
do {
|
||||||
if (!memcmp("diff -", line, 6) ||
|
if (!memcmp("diff -", line, 6) ||
|
||||||
|
|
Loading…
Reference in New Issue