git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Michał Kiedrowicz" <michal.kiedrowicz@gmail.com>
To: git@vger.kernel.org, michal.kiedrowicz@gmail.com
Cc: Jakub Narebski <jnareb@gmail.com>
Subject: [PATCH v4 1/8] gitweb: Use descriptive names in esc_html_hl_regions()
Date: Wed, 11 Apr 2012 23:18:37 +0200	[thread overview]
Message-ID: <1334179124-14258-2-git-send-email-michal.kiedrowicz@gmail.com> (raw)
In-Reply-To: <1334179124-14258-1-git-send-email-michal.kiedrowicz@gmail.com>

The $s->[0] and $s->[1] variables look a bit cryptic.  Let's rename them
to $begin and $end so that it's clear what they do.

Suggested-by: Jakub Narębski <jnareb@gmail.com>
Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com>
---
 gitweb/gitweb.perl |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index a8b5fad..1c54301 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -1738,12 +1738,15 @@ sub esc_html_hl_regions {
 	my $pos = 0;
 
 	for my $s (@sel) {
-		$out .= esc_html(substr($str, $pos, $s->[0] - $pos))
-			if ($s->[0] - $pos > 0);
-		$out .= $cgi->span({-class => $css_class},
-		                   esc_html(substr($str, $s->[0], $s->[1] - $s->[0])));
+		my ($begin, $end) = @$s;
 
-		$pos = $s->[1];
+		my $escaped = esc_html(substr($str, $begin, $end - $begin));
+
+		$out .= esc_html(substr($str, $pos, $begin - $pos))
+			if ($begin - $pos > 0);
+		$out .= $cgi->span({-class => $css_class}, $escaped);
+
+		$pos = $end;
 	}
 	$out .= esc_html(substr($str, $pos))
 		if ($pos < length($str));
-- 
1.7.8.4

  reply	other threads:[~2012-04-11 21:19 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-11 21:18 [PATCH v4 0/8] Highlight interesting parts of diff Michał Kiedrowicz
2012-04-11 21:18 ` Michał Kiedrowicz [this message]
2012-04-11 21:18 ` [PATCH v4 2/8] gitweb: esc_html_hl_regions(): Don't create empty <span> elements Michał Kiedrowicz
2012-04-11 21:18 ` [PATCH v4 3/8] gitweb: Pass esc_html_hl_regions() options to esc_html() Michał Kiedrowicz
2012-04-11 21:18 ` [PATCH v4 4/8] gitweb: Extract print_sidebyside_diff_lines() Michał Kiedrowicz
2012-04-11 21:18 ` [PATCH v4 5/8] gitweb: Use print_diff_chunk() for both side-by-side and inline diffs Michał Kiedrowicz
2012-04-11 21:18 ` [PATCH v4 6/8] gitweb: Push formatting diff lines to print_diff_chunk() Michał Kiedrowicz
2012-04-11 21:18 ` [PATCH v4 7/8] gitweb: Highlight interesting parts of diff Michał Kiedrowicz
2012-04-11 21:18 ` [PATCH v4 8/8] gitweb: Refinement highlightning in combined diffs Michał Kiedrowicz
2012-04-11 21:32 ` [PATCH v4 0/8] Highlight interesting parts of diff Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1334179124-14258-2-git-send-email-michal.kiedrowicz@gmail.com \
    --to=michal.kiedrowicz@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=jnareb@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).