diffcore.h: drop extern from function declaration
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Jun 30, 2018 at 11:20 UTC
78d70d9b10796d5f0a8be3b6451378472dc0fa0e
1 file changed
+25
-25
diffcore.h
+25
-25
@@ -50,17 +50,17 @@ struct diff_filespec {
50
struct userdiff_driver *driver;
51
};
52
53
-extern struct diff_filespec *alloc_filespec(const char *);
54
-extern void free_filespec(struct diff_filespec *);
55
-extern void fill_filespec(struct diff_filespec *, const struct object_id *,
56
- int, unsigned short);
53
+struct diff_filespec *alloc_filespec(const char *);
54
+void free_filespec(struct diff_filespec *);
55
+void fill_filespec(struct diff_filespec *, const struct object_id *,
56
+ int, unsigned short);
57
58
#define CHECK_SIZE_ONLY 1
59
#define CHECK_BINARY 2
60
-extern int diff_populate_filespec(struct diff_filespec *, unsigned int);
61
-extern void diff_free_filespec_data(struct diff_filespec *);
62
-extern void diff_free_filespec_blob(struct diff_filespec *);
63
-extern int diff_filespec_is_binary(struct diff_filespec *);
60
+int diff_populate_filespec(struct diff_filespec *, unsigned int);
61
+void diff_free_filespec_data(struct diff_filespec *);
62
+void diff_free_filespec_blob(struct diff_filespec *);
63
+int diff_filespec_is_binary(struct diff_filespec *);
64
65
struct diff_filepair {
66
struct diff_filespec *one;
@@ -86,9 +86,9 @@ struct diff_filepair {
86
87
#define DIFF_PAIR_MODE_CHANGED(p) ((p)->one->mode != (p)->two->mode)
88
89
-extern void diff_free_filepair(struct diff_filepair *);
89
+void diff_free_filepair(struct diff_filepair *);
90
91
-extern int diff_unmodified_pair(struct diff_filepair *);
91
+int diff_unmodified_pair(struct diff_filepair *);
92
93
struct diff_queue_struct {
94
struct diff_filepair **queue;
@@ -102,16 +102,16 @@ struct diff_queue_struct {
102
} while (0)
103
104
extern struct diff_queue_struct diff_queued_diff;
105
-extern struct diff_filepair *diff_queue(struct diff_queue_struct *,
106
- struct diff_filespec *,
107
- struct diff_filespec *);
108
-extern void diff_q(struct diff_queue_struct *, struct diff_filepair *);
105
+struct diff_filepair *diff_queue(struct diff_queue_struct *,
106
+ struct diff_filespec *,
107
+ struct diff_filespec *);
108
+void diff_q(struct diff_queue_struct *, struct diff_filepair *);
109
110
-extern void diffcore_break(int);
111
-extern void diffcore_rename(struct diff_options *);
112
-extern void diffcore_merge_broken(void);
113
-extern void diffcore_pickaxe(struct diff_options *);
114
-extern void diffcore_order(const char *orderfile);
110
+void diffcore_break(int);
111
+void diffcore_rename(struct diff_options *);
112
+void diffcore_merge_broken(void);
113
+void diffcore_pickaxe(struct diff_options *);
114
+void diffcore_order(const char *orderfile);
115
116
/* low-level interface to diffcore_order */
117
struct obj_order {
@@ -138,11 +138,11 @@ void diff_debug_queue(const char *, struct diff_queue_struct *);
138
#define diff_debug_queue(a,b) do { /* nothing */ } while (0)
139
#endif
140
141
-extern int diffcore_count_changes(struct diff_filespec *src,
142
- struct diff_filespec *dst,
143
- void **src_count_p,
144
- void **dst_count_p,
145
- unsigned long *src_copied,
146
- unsigned long *literal_added);
141
+int diffcore_count_changes(struct diff_filespec *src,
142
+ struct diff_filespec *dst,
143
+ void **src_count_p,
144
+ void **dst_count_p,
145
+ unsigned long *src_copied,
146
+ unsigned long *literal_added);
147
148
#endif