Skip to content

Commit

Permalink
Backported CORE-5831: Not user friendly output of gstat at encrypted …
Browse files Browse the repository at this point in the history
…database
  • Loading branch information
AlexPeshkoff committed May 23, 2018
1 parent 759bd79 commit e16ecb8
Showing 1 changed file with 6 additions and 26 deletions.
32 changes: 6 additions & 26 deletions src/utilities/gstat/ppg.cpp
Expand Up @@ -226,13 +226,7 @@ void PPG_print_header(const header_page* header, ULONG page,
temp[p[1]] = '\0';
uSvc->printf(false, "\tRoot file name:\t\t%s\n", temp);
break;
/*
case HDR_journal_server:
memcpy(temp, p + 2, p[1]);
temp[p[1]] = '\0';
uSvc->printf(false, "\tJournal server:\t\t%s\n", temp);
break;
*/

case HDR_file:
memcpy(temp, p + 2, p[1]);
temp[p[1]] = '\0';
Expand All @@ -243,30 +237,12 @@ void PPG_print_header(const header_page* header, ULONG page,
memcpy(&number, p + 2, sizeof(number));
uSvc->printf(false, "\tLast logical page:\t\t%ld\n", number);
break;
/*
case HDR_unlicensed:
memcpy(&number, p + 2, sizeof(number));
uSvc->printf(false, "\tUnlicensed accesses:\t\t%ld\n", number);
break;
*/

case HDR_sweep_interval:
memcpy(&number, p + 2, sizeof(number));
uSvc->printf(false, "\tSweep interval:\t\t%ld\n", number);
break;

/*
case HDR_log_name:
memcpy(temp, p + 2, p[1]);
temp[p[1]] = '\0';
uSvc->printf(false, "\tReplay logging file:\t\t%s\n", temp);
break;
case HDR_cache_file:
memcpy(temp, p + 2, p[1]);
temp[p[1]] = '\0';
uSvc->printf(false, "\tShared Cache file:\t\t%s\n", temp);
break;
*/
case HDR_difference_file:
memcpy(temp, p + 2, p[1]);
temp[p[1]] = '\0';
Expand All @@ -289,6 +265,10 @@ void PPG_print_header(const header_page* header, ULONG page,
uSvc->printf(false, "\tKey hash:\t%*.*s\n", p[1], p[1], p + 2);
break;

case HDR_crypt_checksum:
uSvc->printf(false, "\tCrypt checksum:\t%*.*s\n", p[1], p[1], p + 2);
break;

default:
if (*p > HDR_max)
uSvc->printf(false, "\tUnrecognized option %d, length %d\n", p[0], p[1]);
Expand Down

0 comments on commit e16ecb8

Please sign in to comment.