combine-diff: move the code to parse hunk-header into common library.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Apr 5, 2006 at 12:22 UTC
c1e335a43fb4c2f422b4d78693b2344114209632
3 files changed
+49
-46
combine-diff.c
-46
@@ -111,52 +111,6 @@ static char *grab_blob(const unsigned char *sha1, unsigned long *size)
111
return blob;
112
}
113
114
-static int parse_num(char **cp_p, unsigned int *num_p)
115
-{
116
- char *cp = *cp_p;
117
- unsigned int num = 0;
118
- int read_some;
119
-
120
- while ('0' <= *cp && *cp <= '9')
121
- num = num * 10 + *cp++ - '0';
122
- if (!(read_some = cp - *cp_p))
123
- return -1;
124
- *cp_p = cp;
125
- *num_p = num;
126
- return 0;
127
-}
128
-
129
-static int parse_hunk_header(char *line, int len,
130
- unsigned int *ob, unsigned int *on,
131
- unsigned int *nb, unsigned int *nn)
132
-{
133
- char *cp;
134
- cp = line + 4;
135
- if (parse_num(&cp, ob)) {
136
- bad_line:
137
- return error("malformed diff output: %s", line);
138
- }
139
- if (*cp == ',') {
140
- cp++;
141
- if (parse_num(&cp, on))
142
- goto bad_line;
143
- }
144
- else
145
- *on = 1;
146
- if (*cp++ != ' ' || *cp++ != '+')
147
- goto bad_line;
148
- if (parse_num(&cp, nb))
149
- goto bad_line;
150
- if (*cp == ',') {
151
- cp++;
152
- if (parse_num(&cp, nn))
153
- goto bad_line;
154
- }
155
- else
156
- *nn = 1;
157
- return -!!memcmp(cp, " @@", 3);
158
-}
159
-
114
static void append_lost(struct sline *sline, int n, const char *line, int len)
115
{
116
struct lline *lline;
xdiff-interface.c
+46
@@ -1,6 +1,52 @@
1
#include "cache.h"
2
#include "xdiff-interface.h"
3
4
+static int parse_num(char **cp_p, unsigned int *num_p)
5
+{
6
+ char *cp = *cp_p;
7
+ unsigned int num = 0;
8
+ int read_some;
9
+
10
+ while ('0' <= *cp && *cp <= '9')
11
+ num = num * 10 + *cp++ - '0';
12
+ if (!(read_some = cp - *cp_p))
13
+ return -1;
14
+ *cp_p = cp;
15
+ *num_p = num;
16
+ return 0;
17
+}
18
+
19
+int parse_hunk_header(char *line, int len,
20
+ unsigned int *ob, unsigned int *on,
21
+ unsigned int *nb, unsigned int *nn)
22
+{
23
+ char *cp;
24
+ cp = line + 4;
25
+ if (parse_num(&cp, ob)) {
26
+ bad_line:
27
+ return error("malformed diff output: %s", line);
28
+ }
29
+ if (*cp == ',') {
30
+ cp++;
31
+ if (parse_num(&cp, on))
32
+ goto bad_line;
33
+ }
34
+ else
35
+ *on = 1;
36
+ if (*cp++ != ' ' || *cp++ != '+')
37
+ goto bad_line;
38
+ if (parse_num(&cp, nb))
39
+ goto bad_line;
40
+ if (*cp == ',') {
41
+ cp++;
42
+ if (parse_num(&cp, nn))
43
+ goto bad_line;
44
+ }
45
+ else
46
+ *nn = 1;
47
+ return -!!memcmp(cp, " @@", 3);
48
+}
49
+
50
static void consume_one(void *priv_, char *s, unsigned long size)
51
{
52
struct xdiff_emit_state *priv = priv_;
xdiff-interface.h
+3
@@ -14,5 +14,8 @@ struct xdiff_emit_state {
14
};
15
16
int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf);
17
+int parse_hunk_header(char *line, int len,
18
+ unsigned int *ob, unsigned int *on,
19
+ unsigned int *nb, unsigned int *nn);
20
21
#endif