[1/3] femon: Share common code

Commit Message

Jean Delvare June 3, 2013, 3:17 p.m. UTC

The status flags are printed the same in standard output mode and
human readable output mode, so use common code.
---
 util/femon/femon.c |   20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

Patch

--- dvb-apps-3ee111da5b3a.orig/util/femon/femon.c	2013-06-02 13:56:18.936297146 +0200
+++ dvb-apps-3ee111da5b3a/util/femon/femon.c	2013-06-02 13:59:03.383299584 +0200
@@ -94,25 +94,21 @@  int check_frontend (struct dvbfe_handle
 		}
 
 
+		printf ("status %c%c%c%c%c | ",
+			fe_info.signal ? 'S' : ' ',
+			fe_info.carrier ? 'C' : ' ',
+			fe_info.viterbi ? 'V' : ' ',
+			fe_info.sync ? 'Y' : ' ',
+			fe_info.lock ? 'L' : ' ');
 
 		if (human_readable) {
-                       printf ("status %c%c%c%c%c | signal %3u%% | snr %3u%% | ber %d | unc %d | ",
-				fe_info.signal ? 'S' : ' ',
-				fe_info.carrier ? 'C' : ' ',
-				fe_info.viterbi ? 'V' : ' ',
-				fe_info.sync ? 'Y' : ' ',
-				fe_info.lock ? 'L' : ' ',
+			printf ("signal %3u%% | snr %3u%% | ber %d | unc %d | ",
 				(fe_info.signal_strength * 100) / 0xffff,
 				(fe_info.snr * 100) / 0xffff,
 				fe_info.ber,
 				fe_info.ucblocks);
 		} else {
-			printf ("status %c%c%c%c%c | signal %04x | snr %04x | ber %08x | unc %08x | ",
-				fe_info.signal ? 'S' : ' ',
-				fe_info.carrier ? 'C' : ' ',
-				fe_info.viterbi ? 'V' : ' ',
-				fe_info.sync ? 'Y' : ' ',
-				fe_info.lock ? 'L' : ' ',
+			printf ("signal %04x | snr %04x | ber %08x | unc %08x | ",
 				fe_info.signal_strength,
 				fe_info.snr,
 				fe_info.ber,