From d47dc4760caa1870f197181998038d30316d6fbd Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Tue, 29 Mar 2011 08:33:44 +0000 Subject: Merged revisions 311799 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r311799 | tilghman | 2011-03-29 02:08:39 -0500 (Tue, 29 Mar 2011) | 7 lines Remove extraneous check from integer-type fields. (closes issue #19027) Reported by: mlehner Review: https://reviewboard.asterisk.org/r/1149/ ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@311806 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- cel/cel_odbc.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) (limited to 'cel') diff --git a/cel/cel_odbc.c b/cel/cel_odbc.c index 0a33fb4ad..cf970690b 100644 --- a/cel/cel_odbc.c +++ b/cel/cel_odbc.c @@ -571,9 +571,7 @@ static void odbc_log(const struct ast_event *event, void *userdata) } break; case SQL_INTEGER: - if (ast_strlen_zero(colptr)) { - continue; - } else { + { int integer = 0; if (strcasecmp(entry->name, "eventtype") == 0) { integer = (int) record.event_type; @@ -590,9 +588,7 @@ static void odbc_log(const struct ast_event *event, void *userdata) } break; case SQL_BIGINT: - if (ast_strlen_zero(colptr)) { - continue; - } else { + { long long integer = 0; if (strcasecmp(entry->name, "eventtype") == 0) { integer = (long long) record.event_type; @@ -609,9 +605,7 @@ static void odbc_log(const struct ast_event *event, void *userdata) } break; case SQL_SMALLINT: - if (ast_strlen_zero(colptr)) { - continue; - } else { + { short integer = 0; if (strcasecmp(entry->name, "eventtype") == 0) { integer = (short) record.event_type; @@ -628,9 +622,7 @@ static void odbc_log(const struct ast_event *event, void *userdata) } break; case SQL_TINYINT: - if (ast_strlen_zero(colptr)) { - continue; - } else { + { char integer = 0; if (strcasecmp(entry->name, "eventtype") == 0) { integer = (char) record.event_type; @@ -647,9 +639,7 @@ static void odbc_log(const struct ast_event *event, void *userdata) } break; case SQL_BIT: - if (ast_strlen_zero(colptr)) { - continue; - } else { + { char integer = 0; if (strcasecmp(entry->name, "eventtype") == 0) { integer = (char) record.event_type; @@ -669,9 +659,7 @@ static void odbc_log(const struct ast_event *event, void *userdata) break; case SQL_NUMERIC: case SQL_DECIMAL: - if (ast_strlen_zero(colptr)) { - continue; - } else { + { double number = 0.0; if (strcasecmp(entry->name, "eventtype") == 0) { number = (double)record.event_type; @@ -690,9 +678,7 @@ static void odbc_log(const struct ast_event *event, void *userdata) case SQL_FLOAT: case SQL_REAL: case SQL_DOUBLE: - if (ast_strlen_zero(colptr)) { - continue; - } else { + { double number = 0.0; if (strcasecmp(entry->name, "eventtype") == 0) { number = (double) record.event_type; -- cgit v1.2.3