[asterisk-commits] tilghman: trunk r311806 - in /trunk: ./ cel/cel_odbc.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Mar 29 03:33:44 2011
New Revision: 311806

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=311806
Log:
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/
........

Modified:
    trunk/   (props changed)
    trunk/cel/cel_odbc.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/cel/cel_odbc.c
URL: http://svnview.digium.com/svn/asterisk/trunk/cel/cel_odbc.c?view=diff&rev=311806&r1=311805&r2=311806
==============================================================================
--- trunk/cel/cel_odbc.c (original)
+++ trunk/cel/cel_odbc.c Tue Mar 29 03:33:44 2011
@@ -571,9 +571,7 @@
 					}
 					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 @@
 					}
 					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 @@
 					}
 					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 @@
 					}
 					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 @@
 					}
 					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 @@
 					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 @@
 				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;