From 913ac2617f9e85278ee6309af0a0fbd636641971 Mon Sep 17 00:00:00 2001 From: nemu Date: Tue, 5 Feb 2008 06:32:35 +0000 Subject: [PATCH] "nicer" output --- src/msr2msr.cpp | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/src/msr2msr.cpp b/src/msr2msr.cpp index bd0ad18f..025a3284 100644 --- a/src/msr2msr.cpp +++ b/src/msr2msr.cpp @@ -135,7 +135,36 @@ void msr2msr_param(char *str, int &tag) tokens = line.Tokenize(" \t"); unsigned int noTokens = tokens->GetEntries(); if (noTokens == 4) { - strcat(str, " none"); + for (unsigned int i=0; i<4; i++) + ostr[i] = dynamic_cast(tokens->At(i)); + // number + sprintf(sstr, "%10s", ostr[0]->GetString().Data()); + // name + strcat(sstr, " "); + strcat(sstr, ostr[1]->GetString().Data()); + memset(spaces, 0, sizeof(spaces)); + memset(spaces, ' ', 12-strlen(ostr[1]->GetString().Data())); + strcat(sstr, spaces); + // value + strcat(sstr, ostr[2]->GetString().Data()); + if (strlen(ostr[2]->GetString().Data()) < 10) { + memset(spaces, 0, sizeof(spaces)); + memset(spaces, ' ', 10-strlen(ostr[2]->GetString().Data())); + strcat(sstr, spaces); + } else { + strcat(sstr, " "); + } + // step + strcat(sstr, ostr[3]->GetString().Data()); + if (strlen(ostr[3]->GetString().Data()) < 12) { + memset(spaces, 0, sizeof(spaces)); + memset(spaces, ' ', 12-strlen(ostr[3]->GetString().Data())); + strcat(sstr, spaces); + } else { + strcat(sstr, " "); + } + strcat(sstr, "none"); + strcpy(str, sstr); } else if (noTokens == 6) { for (unsigned int i=0; i<6; i++) ostr[i] = dynamic_cast(tokens->At(i)); @@ -149,7 +178,7 @@ void msr2msr_param(char *str, int &tag) strcat(sstr, spaces); // value strcat(sstr, ostr[2]->GetString().Data()); - if (strlen(ostr[2]->GetString().Data()) < 10) { + if (strlen(ostr[2]->GetString().Data()) < 10) { memset(spaces, 0, sizeof(spaces)); memset(spaces, ' ', 10-strlen(ostr[2]->GetString().Data())); strcat(sstr, spaces);