citrun

commit a0b62ac008e8fa25fc011315f9c251cbb77dc13a
parent c15d70662c68b57e6df17671031bf24e288b0add
Author: Kyle Milz <kyle@0x30.net>
Date:   Fri,  5 Aug 2016 00:03:04 -0600

Test: remove uneeded read_string

Diffstat:
M
Test/Viewer.pm
 | 
12
+++---------

1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/Test/Viewer.pm b/Test/Viewer.pm
@@ -34,12 +34,12 @@ sub accept {
 	($self->{maj}, $self->{min}) = read_unpack($sock, 2, "C2");
 	($self->{num_tus}, $self->{lines_total}) = read_unpack($sock, 8, "L2");
 	@{ $self->{pids} } =	read_unpack($sock, 12, "L3");
-	$self->{progname} =	read_string($sock);
-	$self->{cwd} =		read_string($sock);
+	$self->{progname} =	read_all($sock, read_unpack($sock, 2, "S"));
+	$self->{cwd} =		read_all($sock, read_unpack($sock, 2, "S"));
 
 	my @tus;
 	for (1..$self->{num_tus}) {
-		my $file_name = read_string($sock);
+		my $file_name = read_all($sock, read_unpack($sock, 2, "S"));
 		my ($num_lines, $inst_sites) = read_unpack($sock, 8, "L2");
 
 		# Keep this in order so it's easy to fetch dynamic data.
@@ -119,12 +119,6 @@ sub cmp_dynamic_data {
 	return $data;
 }
 
-sub read_string {
-	my ($client) = @_;
-	my $sz = unpack("S", read_all($client, 2));
-	return read_all($client, $sz);
-}
-
 sub read_unpack {
 	my ($sock, $bytes_total, $unpack_fmt) = @_;
 	return unpack($unpack_fmt, read_all($sock, $bytes_total));