summaryrefslogtreecommitdiffabout
authorLukas Fleischer <cgit@cryptocrack.de>2011-03-30 17:17:58 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2011-05-23 20:58:35 (UTC)
commitc9059710e7a1dbd47c22c412e0ba8f591105e3cf (patch) (unidiff)
treebd2839a7cd4bf2115dd9d0f946d546bddb173c0c
parentdc1a8eadd4c063fe6782fa99f9db41c46b85d048 (diff)
downloadcgit-c9059710e7a1dbd47c22c412e0ba8f591105e3cf.zip
cgit-c9059710e7a1dbd47c22c412e0ba8f591105e3cf.tar.gz
cgit-c9059710e7a1dbd47c22c412e0ba8f591105e3cf.tar.bz2
Remove unused variable from cgit_diff_tree().
Seen with "-Wunused-but-set-variable". Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--shared.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/shared.c b/shared.c
index 3926b4a..3778a5b 100644
--- a/shared.c
+++ b/shared.c
@@ -294,48 +294,47 @@ int cgit_diff_files(const unsigned char *old_sha1,
294 if (file1.size) 294 if (file1.size)
295 free(file1.ptr); 295 free(file1.ptr);
296 if (file2.size) 296 if (file2.size)
297 free(file2.ptr); 297 free(file2.ptr);
298 return 0; 298 return 0;
299} 299}
300 300
301void cgit_diff_tree(const unsigned char *old_sha1, 301void cgit_diff_tree(const unsigned char *old_sha1,
302 const unsigned char *new_sha1, 302 const unsigned char *new_sha1,
303 filepair_fn fn, const char *prefix, int ignorews) 303 filepair_fn fn, const char *prefix, int ignorews)
304{ 304{
305 struct diff_options opt; 305 struct diff_options opt;
306 int ret;
307 int prefixlen; 306 int prefixlen;
308 307
309 diff_setup(&opt); 308 diff_setup(&opt);
310 opt.output_format = DIFF_FORMAT_CALLBACK; 309 opt.output_format = DIFF_FORMAT_CALLBACK;
311 opt.detect_rename = 1; 310 opt.detect_rename = 1;
312 opt.rename_limit = ctx.cfg.renamelimit; 311 opt.rename_limit = ctx.cfg.renamelimit;
313 DIFF_OPT_SET(&opt, RECURSIVE); 312 DIFF_OPT_SET(&opt, RECURSIVE);
314 if (ignorews) 313 if (ignorews)
315 DIFF_XDL_SET(&opt, IGNORE_WHITESPACE); 314 DIFF_XDL_SET(&opt, IGNORE_WHITESPACE);
316 opt.format_callback = cgit_diff_tree_cb; 315 opt.format_callback = cgit_diff_tree_cb;
317 opt.format_callback_data = fn; 316 opt.format_callback_data = fn;
318 if (prefix) { 317 if (prefix) {
319 opt.nr_paths = 1; 318 opt.nr_paths = 1;
320 opt.paths = &prefix; 319 opt.paths = &prefix;
321 prefixlen = strlen(prefix); 320 prefixlen = strlen(prefix);
322 opt.pathlens = &prefixlen; 321 opt.pathlens = &prefixlen;
323 } 322 }
324 diff_setup_done(&opt); 323 diff_setup_done(&opt);
325 324
326 if (old_sha1 && !is_null_sha1(old_sha1)) 325 if (old_sha1 && !is_null_sha1(old_sha1))
327 ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); 326 diff_tree_sha1(old_sha1, new_sha1, "", &opt);
328 else 327 else
329 ret = diff_root_tree_sha1(new_sha1, "", &opt); 328 diff_root_tree_sha1(new_sha1, "", &opt);
330 diffcore_std(&opt); 329 diffcore_std(&opt);
331 diff_flush(&opt); 330 diff_flush(&opt);
332} 331}
333 332
334void cgit_diff_commit(struct commit *commit, filepair_fn fn, const char *prefix) 333void cgit_diff_commit(struct commit *commit, filepair_fn fn, const char *prefix)
335{ 334{
336 unsigned char *old_sha1 = NULL; 335 unsigned char *old_sha1 = NULL;
337 336
338 if (commit->parents) 337 if (commit->parents)
339 old_sha1 = commit->parents->item->object.sha1; 338 old_sha1 = commit->parents->item->object.sha1;
340 cgit_diff_tree(old_sha1, commit->object.sha1, fn, prefix, 339 cgit_diff_tree(old_sha1, commit->object.sha1, fn, prefix,
341 ctx.qry.ignorews); 340 ctx.qry.ignorews);