X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=eggui.c;h=b369e863fbde01af7c4bdb55611eb4ce0dbe0ac8;hb=3cdf178c314af7b43428f523118d80ab17c6cfde;hp=80a1270d20b7348eccd7a1ab8a065bc7d0340a7c;hpb=d946a30d5eabd2dd3b5574fc818bb1740e5827bf;p=debian%2Fgcpegg diff --git a/eggui.c b/eggui.c index 80a1270..b369e86 100644 --- a/eggui.c +++ b/eggui.c @@ -57,11 +57,11 @@ #include "version.h" #ifndef NO_UI -static int32 inittm = 0; +static uint32 inittm = 0; #endif -extern int32 lastDataSent; -extern int32 time_latency, time_housekeeping; +extern uint32 lastDataSent; +extern uint32 time_latency, time_housekeeping; /* Initialize user interface, as needed. */ int32 UIInit(void) { @@ -112,10 +112,10 @@ int32 UIUpdate(int32 cres, CollectRecord *coll) { if (coll->sampct == 1) { line = 11; - move(line++, 5); printw("Samples per record: %3d", (int)coll->opts.samp_rec); - move(line++, 5); printw("Seconds per record: %3d", (int)coll->opts.sec_rec); - move(line++, 5); printw("Records per packet: %3d", (int)coll->opts.rec_pkt); - move(line++, 5); printw("Bits per trial: %3d", (int)coll->opts.trialsz); + move(line++, 5); printw("Samples per record: %3d", coll->opts.samp_rec); + move(line++, 5); printw("Seconds per record: %3d", coll->opts.sec_rec); + move(line++, 5); printw("Records per packet: %3d", coll->opts.rec_pkt); + move(line++, 5); printw("Bits per trial: %3d", coll->opts.trialsz); refresh(); } @@ -126,17 +126,20 @@ int32 UIUpdate(int32 cres, CollectRecord *coll) { printw("EGG %s ID %d REG %s %s", eggtable[0].name, eggtable[0].id, configuredREG->reg_name, Version); - tmstr = ctime(&inittm); tmstr[strlen(tmstr)-1] = 0; + time_t inittm_val = inittm; + tmstr = ctime(&inittm_val); tmstr[strlen(tmstr)-1] = 0; move(line++, 5); printw("Up since %25s", tmstr); move(line++, 5); now = getzulutime(NULL); - tmstr = ctime(&now); tmstr[strlen(tmstr)-1] = 0; + time_t now_val = now; + tmstr = ctime(&now_val); tmstr[strlen(tmstr)-1] = 0; printw("Last sample at %25s", tmstr); move(line++, 5); - tmstr = ctime(&lastDataSent); + time_t lastDataSent_val = lastDataSent; + tmstr = ctime(&lastDataSent_val); tmstr[strlen(tmstr)-1] = 0; printw("Last packet at %25s", lastDataSent == 0 ? "Never" : tmstr);