svn commit: r284714 - stable/10/lib/libdpv

[Devin Teske]

Author: dteske
Date: Tue Jun 23 04:03:54 2015
New Revision: 284714
URL: https://svnweb.freebsd.org/changeset/base/284714

Log:
  MFC r283863:
  Fix a debug statement. Only the callback function (performing the
  incrementing of dpv_overall_oread) knows what its purpose is (and
  often times it was bytes, not lines).
  
  MFC r283975 (araujo):
  Clean up unused variable and silence clang warnings.

Modified:
  stable/10/lib/libdpv/dprompt.c
  stable/10/lib/libdpv/dpv.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libdpv/dprompt.c
==============================================================================
--- stable/10/lib/libdpv/dprompt.c	Tue Jun 23 03:56:05 2015	(r284713)
+++ stable/10/lib/libdpv/dprompt.c	Tue Jun 23 04:03:54 2015	(r284714)
@@ -391,7 +391,6 @@ dprompt_add_files(struct dpv_file_node *
 	enum dprompt_state dstate;
 	int estext_lsize;
 	int estext_rsize;
-	int estext_size;
 	int flabel_size;
 	int hlen;
 	int lsize;
@@ -559,13 +558,11 @@ dprompt_add_files(struct dpv_file_node *
 			bg_code = "\\Zr\\Z1"; /* Red */
 			estext_lsize = fail_lsize;
 			estext_rsize = fail_rsize;
-			estext_size = fail_size;
 			estext = fail;
 		} else { /* e.g., DPV_STATUS_DONE */
 			bg_code = "\\Zr\\Z2"; /* Green */
 			estext_lsize = done_lsize;
 			estext_rsize = done_rsize;
-			estext_size = done_size;
 			estext = done;
 		}
 		switch (dstate) {

Modified: stable/10/lib/libdpv/dpv.c
==============================================================================
--- stable/10/lib/libdpv/dpv.c	Tue Jun 23 03:56:05 2015	(r284713)
+++ stable/10/lib/libdpv/dpv.c	Tue Jun 23 04:03:54 2015	(r284714)
@@ -692,7 +692,7 @@ dpv(struct dpv_config *config, struct dp
 		if (!dpv_interrupt)
 			printf("\n");
 	} else
-		warnx("%s: %lli lines read", __func__, dpv_overall_read);
+		warnx("%s: %lli overall read", __func__, dpv_overall_read);
 
 	if (dpv_interrupt || dpv_abort)
 		return (-1);