From 3096504c06db8c1ba2a40d3ff178970b3535bf1d Mon Sep 17 00:00:00 2001 From: Eitan Adler Date: Sun, 5 Feb 2012 01:21:02 -0500 Subject: [PATCH 1/2] Avoid a signed/unsigned compare later on when comparing with sizeof() --- telex-client/ssl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/telex-client/ssl.c b/telex-client/ssl.c index f8b857b..7a480e2 100644 --- a/telex-client/ssl.c +++ b/telex-client/ssl.c @@ -103,7 +103,7 @@ void ssl_done(struct telex_conf *conf) // page 11, PRK = state_secret, CTXinfo = uniq BIGNUM *telex_ssl_get_dh_key(Secret state_secret, BIGNUM *res) { - int i; + unsigned int i; char *uniq = "Telex PRG"; unsigned char buf[128]; unsigned char out[SHA256_DIGEST_LENGTH]; From 681ce9c3560722b8f0560ce24cbe2b09920e1fd8 Mon Sep 17 00:00:00 2001 From: Eitan Adler Date: Sun, 5 Feb 2012 01:21:27 -0500 Subject: [PATCH 2/2] An enum can never be less than zero and it is a programming error to use an invalid logger level. --- telex-client/logger.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/telex-client/logger.c b/telex-client/logger.c index c5176bc..8fa4f8d 100644 --- a/telex-client/logger.c +++ b/telex-client/logger.c @@ -20,11 +20,8 @@ int LogLogVA(enum LogLevel level, const char *loggerName, const char *logMessage { if (log_output_stream && level <= log_output_level) { char *levelName; - if (level < 0 || level >= sizeof(log_level_name)) { - levelName = "UNKNOWN"; - } else { - levelName = log_level_name[level]; - } + assert(level < sizeof(log_level_name)); + levelName = log_level_name[level]; struct timeval now; char timestamp[256];