From d57a56407b3230672d9320d25d11fc2ec58e359f Mon Sep 17 00:00:00 2001 From: Matt Johnston <matt@ucc.asn.au> Date: Sun, 26 Mar 2006 09:26:43 +0000 Subject: [PATCH] A few more fixups, make sure that variable declarations are the first thing in a function --HG-- extra : convert_revision : 5e475ab869513f9ce5baff42838a656f99300487 --- cli-chansession.c | 4 ++-- random.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cli-chansession.c b/cli-chansession.c index 1dad6071..fee8a223 100644 --- a/cli-chansession.c +++ b/cli-chansession.c @@ -168,10 +168,10 @@ static void put_termcodes() { unsigned int value; unsigned int mapcode; - TRACE(("enter put_termcodes")) - unsigned int bufpos1, bufpos2; + TRACE(("enter put_termcodes")) + if (tcgetattr(STDIN_FILENO, &tio) == -1) { dropbear_log(LOG_WARNING, "Failed reading termmodes"); buf_putint(ses.writepayload, 1); /* Just the terminator */ diff --git a/random.c b/random.c index 5953a437..c836de98 100644 --- a/random.c +++ b/random.c @@ -134,7 +134,7 @@ void seedrandom() { hash_state hs; /* initialise so that things won't warn about - * hashing an undefined buffer */ + * hashing an undefined buffer */ if (!donerandinit) { m_burn(hashpool, sizeof(hashpool)); } @@ -157,17 +157,17 @@ void seedrandom() { * the random pools for fork()ed processes. */ void reseedrandom() { - pid_t pid; - struct timeval tv; + pid_t pid; + hash_state hs; + struct timeval tv; if (!donerandinit) { dropbear_exit("seedrandom not done"); } - pid = getpid(); - gettimeofday(&tv, NULL); + pid = getpid(); + gettimeofday(&tv, NULL); - hash_state hs; sha1_init(&hs); sha1_process(&hs, (void*)hashpool, sizeof(hashpool)); sha1_process(&hs, (void*)&pid, sizeof(pid)); -- GitLab