Mercurial > vim

comparison src/xdiff/xemit.c @ 14708:0e336b7d2090 v8.1.0366

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0366: pieces of the xdiff code are not used commit https://github.com/vim/vim/commit/007921611b04d8fca5ad0b1d4e7b0461b47cd435 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Sep 10 22:18:52 2018 +0200 patch 8.1.0366: pieces of the xdiff code are not used Problem: Pieces of the xdiff code are not used. Solution: Add "#if 0" to omit unused code.
author Christian Brabandt <cb@256bit.org>
date Mon, 10 Sep 2018 22:30:06 +0200
parents 150274bc6f5c
children 9c94cfe5dd31
comparison
equal deleted inserted replaced
14707:5cb5b079ad90 14708:0e336b7d2090
93 93
94 return lxch; 94 return lxch;
95 } 95 }
96 96
97 97
98 #if 0
98 static long def_ff(const char *rec, long len, char *buf, long sz, void *priv UNUSED) 99 static long def_ff(const char *rec, long len, char *buf, long sz, void *priv UNUSED)
99 { 100 {
100 if (len > 0 && 101 if (len > 0 &&
101 (isalpha((unsigned char)*rec) || /* identifier? */ 102 (isalpha((unsigned char)*rec) || /* identifier? */
102 *rec == '_' || /* also identifier? */ 103 *rec == '_' || /* also identifier? */
108 memcpy(buf, rec, len); 109 memcpy(buf, rec, len);
109 return len; 110 return len;
110 } 111 }
111 return -1; 112 return -1;
112 } 113 }
113 114 #endif
115
116 #if 0
114 static long match_func_rec(xdfile_t *xdf, xdemitconf_t const *xecfg, long ri, 117 static long match_func_rec(xdfile_t *xdf, xdemitconf_t const *xecfg, long ri,
115 char *buf, long sz) 118 char *buf, long sz)
116 { 119 {
117 const char *rec; 120 const char *rec;
118 long len = xdl_get_rec(xdf, ri, &rec); 121 long len = xdl_get_rec(xdf, ri, &rec);
119 if (!xecfg->find_func) 122 if (!xecfg->find_func)
120 return def_ff(rec, len, buf, sz, xecfg->find_func_priv); 123 return def_ff(rec, len, buf, sz, xecfg->find_func_priv);
121 return xecfg->find_func(rec, len, buf, sz, xecfg->find_func_priv); 124 return xecfg->find_func(rec, len, buf, sz, xecfg->find_func_priv);
122 } 125 }
123 126 #endif
127
128 #if 0
124 static int is_func_rec(xdfile_t *xdf, xdemitconf_t const *xecfg, long ri) 129 static int is_func_rec(xdfile_t *xdf, xdemitconf_t const *xecfg, long ri)
125 { 130 {
126 char dummy[1]; 131 char dummy[1];
127 return match_func_rec(xdf, xecfg, ri, dummy, sizeof(dummy)) >= 0; 132 return match_func_rec(xdf, xecfg, ri, dummy, sizeof(dummy)) >= 0;
128 } 133 }
134 #endif
129 135
130 struct func_line { 136 struct func_line {
131 long len; 137 long len;
132 char buf[80]; 138 char buf[80];
133 }; 139 };
134 140
141 #if 0
135 static long get_func_line(xdfenv_t *xe, xdemitconf_t const *xecfg, 142 static long get_func_line(xdfenv_t *xe, xdemitconf_t const *xecfg,
136 struct func_line *func_line, long start, long limit) 143 struct func_line *func_line, long start, long limit)
137 { 144 {
138 long l, size, step = (start > limit) ? -1 : 1; 145 long l, size, step = (start > limit) ? -1 : 1;
139 char *buf, dummy[1]; 146 char *buf, dummy[1];
149 return l; 156 return l;
150 } 157 }
151 } 158 }
152 return -1; 159 return -1;
153 } 160 }
154 161 #endif
162
163 #if 0
155 static int is_empty_rec(xdfile_t *xdf, long ri) 164 static int is_empty_rec(xdfile_t *xdf, long ri)
156 { 165 {
157 const char *rec; 166 const char *rec;
158 long len = xdl_get_rec(xdf, ri, &rec); 167 long len = xdl_get_rec(xdf, ri, &rec);
159 168
161 rec++; 170 rec++;
162 len--; 171 len--;
163 } 172 }
164 return !len; 173 return !len;
165 } 174 }
175 #endif
166 176
167 int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb, 177 int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
168 xdemitconf_t const *xecfg) { 178 xdemitconf_t const *xecfg) {
169 long s1, s2, e1, e2, lctx; 179 long s1, s2, e1, e2, lctx;
170 xdchange_t *xch, *xche; 180 xdchange_t *xch, *xche;
181 #if 0
171 long funclineprev = -1; 182 long funclineprev = -1;
183 #endif
172 struct func_line func_line; 184 struct func_line func_line;
173 185
174 func_line.len = 0; 186 func_line.len = 0;
175 187
176 for (xch = xscr; xch; xch = xche->next) { 188 for (xch = xscr; xch; xch = xche->next) {
179 break; 191 break;
180 192
181 s1 = XDL_MAX(xch->i1 - xecfg->ctxlen, 0); 193 s1 = XDL_MAX(xch->i1 - xecfg->ctxlen, 0);
182 s2 = XDL_MAX(xch->i2 - xecfg->ctxlen, 0); 194 s2 = XDL_MAX(xch->i2 - xecfg->ctxlen, 0);
183 195
196 #if 0
184 if (xecfg->flags & XDL_EMIT_FUNCCONTEXT) { 197 if (xecfg->flags & XDL_EMIT_FUNCCONTEXT) {
185 long fs1, i1 = xch->i1; 198 long fs1, i1 = xch->i1;
186 199
187 /* Appended chunk? */ 200 /* Appended chunk? */
188 if (i1 >= xe->xdf1.nrec) { 201 if (i1 >= xe->xdf1.nrec) {
216 s1 = fs1; 229 s1 = fs1;
217 } 230 }
218 } 231 }
219 232
220 post_context_calculation: 233 post_context_calculation:
234 #endif
221 lctx = xecfg->ctxlen; 235 lctx = xecfg->ctxlen;
222 lctx = XDL_MIN(lctx, xe->xdf1.nrec - (xche->i1 + xche->chg1)); 236 lctx = XDL_MIN(lctx, xe->xdf1.nrec - (xche->i1 + xche->chg1));
223 lctx = XDL_MIN(lctx, xe->xdf2.nrec - (xche->i2 + xche->chg2)); 237 lctx = XDL_MIN(lctx, xe->xdf2.nrec - (xche->i2 + xche->chg2));
224 238
225 e1 = xche->i1 + xche->chg1 + lctx; 239 e1 = xche->i1 + xche->chg1 + lctx;
226 e2 = xche->i2 + xche->chg2 + lctx; 240 e2 = xche->i2 + xche->chg2 + lctx;
227 241
242 #if 0
228 if (xecfg->flags & XDL_EMIT_FUNCCONTEXT) { 243 if (xecfg->flags & XDL_EMIT_FUNCCONTEXT) {
229 long fe1 = get_func_line(xe, xecfg, NULL, 244 long fe1 = get_func_line(xe, xecfg, NULL,
230 xche->i1 + xche->chg1, 245 xche->i1 + xche->chg1,
231 xe->xdf1.nrec); 246 xe->xdf1.nrec);
232 while (fe1 > 0 && is_empty_rec(&xe->xdf1, fe1 - 1)) 247 while (fe1 > 0 && is_empty_rec(&xe->xdf1, fe1 - 1))
251 xche = xche->next; 266 xche = xche->next;
252 goto post_context_calculation; 267 goto post_context_calculation;
253 } 268 }
254 } 269 }
255 } 270 }
271 #endif
256 272
257 /* 273 /*
258 * Emit current hunk header. 274 * Emit current hunk header.
259 */ 275 */
260 276
277 #if 0
261 if (xecfg->flags & XDL_EMIT_FUNCNAMES) { 278 if (xecfg->flags & XDL_EMIT_FUNCNAMES) {
262 get_func_line(xe, xecfg, &func_line, 279 get_func_line(xe, xecfg, &func_line,
263 s1 - 1, funclineprev); 280 s1 - 1, funclineprev);
264 funclineprev = s1 - 1; 281 funclineprev = s1 - 1;
265 } 282 }
283 #endif
266 if (xdl_emit_hunk_hdr(s1 + 1, e1 - s1, s2 + 1, e2 - s2, 284 if (xdl_emit_hunk_hdr(s1 + 1, e1 - s1, s2 + 1, e2 - s2,
267 func_line.buf, func_line.len, ecb) < 0) 285 func_line.buf, func_line.len, ecb) < 0)
268 return -1; 286 return -1;
269 287
270 /* 288 /*