diff options
| author | Lukas Fleischer <cgit@cryptocrack.de> | 2013-08-27 10:40:51 +0200 | 
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2013-09-14 19:31:50 +0200 | 
| commit | d181d6593f827a524b9a7ebc860fa53410fddea2 (patch) | |
| tree | 8f2f1f7627c9be8e19d3a5255763f052c07559bb | |
| parent | 2da46fe5aa7f18839238c37d9bcb63657f89be26 (diff) | |
ui-shared: Drop filepair_cb_raw() and helper
Remove filepair_cb_raw() and all related functions. These are no longer
needed. We now use Git's internal functions for raw diff formatting
everywhere.
Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
| -rw-r--r-- | ui-shared.c | 72 | ||||
| -rw-r--r-- | ui-shared.h | 1 | 
2 files changed, 0 insertions, 73 deletions
| diff --git a/ui-shared.c b/ui-shared.c index 1e19421..7ab2ab1 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -950,75 +950,3 @@ void cgit_print_snapshot_links(const char *repo, const char *head,  	}  	strbuf_release(&filename);  } - -static void print_line_raw(char *line, int len) -{ -	char c = line[len-1]; - -	line[len-1] = '\0'; -	htmlf("%s\n", line); -	line[len-1] = c; -} - -static void header_raw(unsigned char *sha1, char *path1, int mode1, -		       unsigned char *sha2, char *path2, int mode2) -{ -	char *abbrev1, *abbrev2; -	int subproject; - -	subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); -	htmlf("diff --git a/%s b/%s\n", path1, path2); - -	if (mode1 == 0) -		htmlf("new file mode %.6o\n", mode2); - -	if (mode2 == 0) -		htmlf("deleted file mode %.6o\n", mode1); - -	if (!subproject) { -		abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV)); -		abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV)); -		htmlf("index %s..%s", abbrev1, abbrev2); -		free(abbrev1); -		free(abbrev2); -		if (mode1 != 0 && mode2 != 0) { -			htmlf(" %.6o", mode1); -			if (mode2 != mode1) -				htmlf("..%.6o", mode2); -		} - -		if (is_null_sha1(sha1)) { -			path1 = "dev/null"; -			htmlf("\n--- /%s\n", path1); -		} else -			htmlf("\n--- a/%s\n", path1); - -		if (is_null_sha1(sha2)) { -			path2 = "dev/null"; -			htmlf("+++ /%s\n", path2); -		} else -			htmlf("+++ b/%s\n", path2); -	} -} - -void filepair_cb_raw(struct diff_filepair *pair) -{ -	unsigned long old_size = 0; -	unsigned long new_size = 0; -	int binary = 0; - -	header_raw(pair->one->sha1, pair->one->path, pair->one->mode, -		   pair->two->sha1, pair->two->path, pair->two->mode); -	if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { -		if (S_ISGITLINK(pair->one->mode)) -			print_line_raw(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); -		if (S_ISGITLINK(pair->two->mode)) -			print_line_raw(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); -		return; -	} -	if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, -			    &new_size, &binary, 0, 0, print_line_raw)) -		html("Error running diff"); -	if (binary) -		html("Binary files differ\n"); -} diff --git a/ui-shared.h b/ui-shared.h index a337dce..5987e77 100644 --- a/ui-shared.h +++ b/ui-shared.h @@ -67,5 +67,4 @@ extern void cgit_print_snapshot_links(const char *repo, const char *head,  				      const char *hex, int snapshots);  extern void cgit_add_hidden_formfields(int incl_head, int incl_search,  				       const char *page); -extern void filepair_cb_raw(struct diff_filepair *pair);  #endif /* UI_SHARED_H */ | 
