about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorChristian Hesse2014-04-17 11:55:46 +0200
committerJason A. Donenfeld2014-04-17 12:55:09 +0200
commitb431282c91deea24916578395d88084261410968 (patch)
treedf28474b0af6dc9c3a7a4f768b1ab18871d0083a
parentgit: update to 1.9.2 (diff)
downloadcgit-b431282c91deea24916578395d88084261410968.tar.gz
cgit-b431282c91deea24916578395d88084261410968.zip
remove trailing whitespaces from source files
-rw-r--r--README2
-rw-r--r--cgitrc.5.txt2
-rw-r--r--filter.c2
-rwxr-xr-xfilters/html-converters/resources/markdown.pl36
-rw-r--r--ui-blob.c2
-rw-r--r--ui-summary.c4
6 files changed, 24 insertions, 24 deletions
diff --git a/README b/README index faf1851..917d74a 100644 --- a/README +++ b/README
@@ -95,5 +95,5 @@ Online presence
95* The cgit homepage is hosted by cgit at <http://git.zx2c4.com/cgit/about/> 95* The cgit homepage is hosted by cgit at <http://git.zx2c4.com/cgit/about/>
96 96
97* Patches, bug reports, discussions and support should go to the cgit 97* Patches, bug reports, discussions and support should go to the cgit
98 mailing list: <cgit@lists.zx2c4.com>. To sign up, visit 98 mailing list: <cgit@lists.zx2c4.com>. To sign up, visit
99 <http://lists.zx2c4.com/mailman/listinfo/cgit> 99 <http://lists.zx2c4.com/mailman/listinfo/cgit>
diff --git a/cgitrc.5.txt b/cgitrc.5.txt index cbaebca..b7570db 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt
@@ -603,7 +603,7 @@ specification with the relevant string; available values are:
603 This is called when the current filtering operation is 603 This is called when the current filtering operation is
604 completed. It must return an integer value. Usually 0 604 completed. It must return an integer value. Usually 0
605 indicates success. 605 indicates success.
606 606
607 Additionally, cgit exposes to the Lua the following built-in functions: 607 Additionally, cgit exposes to the Lua the following built-in functions:
608 608
609 'html(str)':: 609 'html(str)'::
diff --git a/filter.c b/filter.c index 90b9d68..270f009 100644 --- a/filter.c +++ b/filter.c
@@ -210,7 +210,7 @@ static inline int hook_lua_filter(lua_State *lua_state, void (*fn)(const char *t
210 str = lua_tostring(lua_state, 1); 210 str = lua_tostring(lua_state, 1);
211 if (!str) 211 if (!str)
212 return 0; 212 return 0;
213 213
214 save_filter_write = filter_write; 214 save_filter_write = filter_write;
215 save_filter = current_write_filter; 215 save_filter = current_write_filter;
216 unhook_write(); 216 unhook_write();
diff --git a/filters/html-converters/resources/markdown.pl b/filters/html-converters/resources/markdown.pl index d40b2d0..4c39808 100755 --- a/filters/html-converters/resources/markdown.pl +++ b/filters/html-converters/resources/markdown.pl
@@ -36,7 +36,7 @@ my $g_nested_brackets;
36$g_nested_brackets = qr{ 36$g_nested_brackets = qr{
37 (?> # Atomic matching 37 (?> # Atomic matching
38 [^\[\]]+ # Anything other than brackets 38 [^\[\]]+ # Anything other than brackets
39 | 39 |
40 \[ 40 \[
41 (??{ $g_nested_brackets }) # Recursive set of nested brackets 41 (??{ $g_nested_brackets }) # Recursive set of nested brackets
42 \] 42 \]
@@ -125,7 +125,7 @@ unless ($@) {
125 my $ctx = shift; 125 my $ctx = shift;
126 my $raw = 0; 126 my $raw = 0;
127 if (defined $ctx) { 127 if (defined $ctx) {
128 my $output = $ctx->stash('markdown_output'); 128 my $output = $ctx->stash('markdown_output');
129 if (defined $output && $output =~ m/^html/i) { 129 if (defined $output && $output =~ m/^html/i) {
130 $g_empty_element_suffix = ">"; 130 $g_empty_element_suffix = ">";
131 $ctx->stash('markdown_output', ''); 131 $ctx->stash('markdown_output', '');
@@ -160,7 +160,7 @@ unless ($@) {
160 my $text = shift; 160 my $text = shift;
161 my $ctx = shift; 161 my $ctx = shift;
162 if (defined $ctx) { 162 if (defined $ctx) {
163 my $output = $ctx->stash('markdown_output'); 163 my $output = $ctx->stash('markdown_output');
164 if (defined $output && $output eq 'html') { 164 if (defined $output && $output eq 'html') {
165 $g_empty_element_suffix = ">"; 165 $g_empty_element_suffix = ">";
166 } 166 }
@@ -647,7 +647,7 @@ sub _HashHTMLBlocks {
647 "\n\n" . $key . "\n\n"; 647 "\n\n" . $key . "\n\n";
648 }egmx; 648 }egmx;
649 # Special case just for <hr />. It was easier to make a special case than 649 # Special case just for <hr />. It was easier to make a special case than
650 # to make the other regex more complicated. 650 # to make the other regex more complicated.
651 $text =~ s{ 651 $text =~ s{
652 (?: 652 (?:
653 (?<=\n\n) # Starting after a blank line 653 (?<=\n\n) # Starting after a blank line
@@ -658,7 +658,7 @@ sub _HashHTMLBlocks {
658 [ ]{0,$less_than_tab} 658 [ ]{0,$less_than_tab}
659 <(hr) # start tag = $2 659 <(hr) # start tag = $2
660 \b # word break 660 \b # word break
661 ([^<>])*? # 661 ([^<>])*? #
662 /?> # the matching end tag 662 /?> # the matching end tag
663 [ \t]* 663 [ \t]*
664 (?=\n{2,}|\Z) # followed by a blank line or end of document 664 (?=\n{2,}|\Z) # followed by a blank line or end of document
@@ -998,7 +998,7 @@ sub _DoHeaders {
998 # Setext-style headers: 998 # Setext-style headers:
999 # Header 1 999 # Header 1
1000 # ======== 1000 # ========
1001 # 1001 #
1002 # Header 2 1002 # Header 2
1003 # -------- 1003 # --------
1004 # 1004 #
@@ -1193,7 +1193,7 @@ sub _ProcessListItems {
1193sub _DoCodeBlocks { 1193sub _DoCodeBlocks {
1194# 1194#
1195# Process Markdown `<pre><code>` blocks. 1195# Process Markdown `<pre><code>` blocks.
1196# 1196#
1197 1197
1198 my $text = shift; 1198 my $text = shift;
1199 1199
@@ -1227,26 +1227,26 @@ sub _DoCodeBlocks {
1227sub _DoCodeSpans { 1227sub _DoCodeSpans {
1228# 1228#
1229# * Backtick quotes are used for <code></code> spans. 1229# * Backtick quotes are used for <code></code> spans.
1230# 1230#
1231# * You can use multiple backticks as the delimiters if you want to 1231# * You can use multiple backticks as the delimiters if you want to
1232# include literal backticks in the code span. So, this input: 1232# include literal backticks in the code span. So, this input:
1233# 1233#
1234# Just type ``foo `bar` baz`` at the prompt. 1234# Just type ``foo `bar` baz`` at the prompt.
1235# 1235#
1236# Will translate to: 1236# Will translate to:
1237# 1237#
1238# <p>Just type <code>foo `bar` baz</code> at the prompt.</p> 1238# <p>Just type <code>foo `bar` baz</code> at the prompt.</p>
1239# 1239#
1240# There's no arbitrary limit to the number of backticks you 1240# There's no arbitrary limit to the number of backticks you
1241# can use as delimters. If you need three consecutive backticks 1241# can use as delimters. If you need three consecutive backticks
1242# in your code, use four for delimiters, etc. 1242# in your code, use four for delimiters, etc.
1243# 1243#
1244# * You can use spaces to get literal backticks at the edges: 1244# * You can use spaces to get literal backticks at the edges:
1245# 1245#
1246# ... type `` `bar` `` ... 1246# ... type `` `bar` `` ...
1247# 1247#
1248# Turns to: 1248# Turns to:
1249# 1249#
1250# ... type <code>`bar`</code> ... 1250# ... type <code>`bar`</code> ...
1251# 1251#
1252 1252
@@ -1287,7 +1287,7 @@ sub _EncodeCode {
1287 { 1287 {
1288 no warnings 'once'; 1288 no warnings 'once';
1289 if (defined($blosxom::version)) { 1289 if (defined($blosxom::version)) {
1290 s/\$/&#036;/g; 1290 s/\$/&#036;/g;
1291 } 1291 }
1292 } 1292 }
1293 1293
@@ -1693,8 +1693,8 @@ See the readme file for detailed release notes for this version.
1693 1693
1694=head1 COPYRIGHT AND LICENSE 1694=head1 COPYRIGHT AND LICENSE
1695 1695
1696Copyright (c) 2003-2004 John Gruber 1696Copyright (c) 2003-2004 John Gruber
1697<http://daringfireball.net/> 1697<http://daringfireball.net/>
1698All rights reserved. 1698All rights reserved.
1699 1699
1700Redistribution and use in source and binary forms, with or without 1700Redistribution and use in source and binary forms, with or without
diff --git a/ui-blob.c b/ui-blob.c index 9c99519..c2de8d6 100644 --- a/ui-blob.c +++ b/ui-blob.c
@@ -54,7 +54,7 @@ int cgit_ref_path_exists(const char *path, const char *ref, int file_only)
54 54
55 if (get_sha1(ref, sha1)) 55 if (get_sha1(ref, sha1))
56 return 0; 56 return 0;
57 if (sha1_object_info(sha1, &size) != OBJ_COMMIT) 57 if (sha1_object_info(sha1, &size) != OBJ_COMMIT)
58 return 0; 58 return 0;
59 read_tree_recursive(lookup_commit_reference(sha1)->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx); 59 read_tree_recursive(lookup_commit_reference(sha1)->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
60 return walk_tree_ctx.found_path; 60 return walk_tree_ctx.found_path;
diff --git a/ui-summary.c b/ui-summary.c index ddd8f1b..df99ce1 100644 --- a/ui-summary.c +++ b/ui-summary.c
@@ -112,7 +112,7 @@ static char* append_readme_path(const char *filename, const char *ref, const cha
112 full_path = xstrdup(path); 112 full_path = xstrdup(path);
113 } else 113 } else
114 full_path = fmtalloc("%s/%s", base_dir, path); 114 full_path = fmtalloc("%s/%s", base_dir, path);
115 115
116 if (!ref) { 116 if (!ref) {
117 resolved_base = realpath(base_dir, NULL); 117 resolved_base = realpath(base_dir, NULL);
118 resolved_full = realpath(full_path, NULL); 118 resolved_full = realpath(full_path, NULL);
@@ -136,7 +136,7 @@ void cgit_print_repo_readme(char *path)
136 136
137 if (ctx.repo->readme.nr == 0) 137 if (ctx.repo->readme.nr == 0)
138 return; 138 return;
139 139
140 filename = ctx.repo->readme.items[0].string; 140 filename = ctx.repo->readme.items[0].string;
141 ref = ctx.repo->readme.items[0].util; 141 ref = ctx.repo->readme.items[0].util;
142 142