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

sparse: Fix an "symbol 'merge_file' not decared" warning

Browse Source 
In order to fix the warning, we add a new "merge-file.h" header
containing the extern declaration of the merge_file() function,
and include the header in the source files that require the
declaration.

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ramsay Jones 2011-04-07 19:31:24 +01:00 committed by Junio C Hamano
parent c8f1444d9e
commit 1e0f8c41ac
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -525,6 +525,7 @@ LIB_H += list-objects.h
LIB_H += ll-merge.h LIB_H += ll-merge.h
LIB_H += log-tree.h LIB_H += log-tree.h
LIB_H += mailmap.h LIB_H += mailmap.h
LIB_H += merge-file.h
LIB_H += merge-recursive.h LIB_H += merge-recursive.h
LIB_H += notes.h LIB_H += notes.h
LIB_H += notes-cache.h LIB_H += notes-cache.h

3
builtin/merge-tree.c
View File

@ -3,6 +3,7 @@
#include "xdiff-interface.h" #include "xdiff-interface.h"
#include "blob.h" #include "blob.h"
#include "exec_cmd.h" #include "exec_cmd.h"
#include "merge-file.h"
static const char merge_tree_usage[] = "git merge-tree <base-tree> <branch1> <branch2>"; static const char merge_tree_usage[] = "git merge-tree <base-tree> <branch1> <branch2>";
static int resolve_directories = 1; static int resolve_directories = 1;
@ -54,8 +55,6 @@ static const char *explanation(struct merge_list *entry)
return "removed in remote"; return "removed in remote";
} }
extern void *merge_file(const char *, struct blob *, struct blob *, struct blob *, unsigned long *);
static void *result(struct merge_list *entry, unsigned long *size) static void *result(struct merge_list *entry, unsigned long *size)
{ {
enum object_type type; enum object_type type;

1
merge-file.c
View File

@ -3,6 +3,7 @@
#include "xdiff-interface.h" #include "xdiff-interface.h"
#include "ll-merge.h" #include "ll-merge.h"
#include "blob.h" #include "blob.h"
#include "merge-file.h"
static int fill_mmfile_blob(mmfile_t *f, struct blob *obj) static int fill_mmfile_blob(mmfile_t *f, struct blob *obj)
{ {

7
merge-file.h Normal file
View File

@ -0,0 +1,7 @@
#ifndef MERGE_FILE_H
#define MERGE_FILE_H
extern void *merge_file(const char *path, struct blob *base, struct blob *our,
struct blob *their, unsigned long *size);
#endif