Connector/ODBC 3.51 commit: r94 - in trunk: myodbc3 myodbc3i

[jwinstead]

Modified:
   trunk/myodbc3/dll.c
   trunk/myodbc3/results.c
   trunk/myodbc3i/myodbc3i.c
Log:
Remove more unreachable code, fix an incorrect data type, and fix an
incorrect initialization. (Fixes warnings on Solaris 9, 64-bit.)


Modified: trunk/myodbc3/dll.c
===================================================================
--- trunk/myodbc3/dll.c	2006-09-11 23:13:19 UTC (rev 93)
+++ trunk/myodbc3/dll.c	2006-09-11 23:19:54 UTC (rev 94)
@@ -77,7 +77,6 @@
     thousands_sep=my_strdup(tmp->thousands_sep,MYF(0));
     thousands_sep_length=strlen(thousands_sep);
     setlocale(LC_NUMERIC,default_locale);
-    return;
   }
   /*
     If we are not using threads, we may get an SIGPIPE signal when a client

Modified: trunk/myodbc3/results.c
===================================================================
--- trunk/myodbc3/results.c	2006-09-11 23:13:19 UTC (rev 93)
+++ trunk/myodbc3/results.c	2006-09-11 23:19:54 UTC (rev 94)
@@ -801,7 +801,7 @@
                                 char *          value,
                                 uint            length )
 {
-    long tmp;
+    SQLLEN tmp;
     if ( !pcbValue )
         pcbValue= &tmp; /* Easier code */
 

Modified: trunk/myodbc3i/myodbc3i.c
===================================================================
--- trunk/myodbc3i/myodbc3i.c	2006-09-11 23:13:19 UTC (rev 93)
+++ trunk/myodbc3i/myodbc3i.c	2006-09-11 23:19:54 UTC (rev 94)
@@ -350,8 +350,6 @@
             fprintf( stderr, "[%s][%d][ERROR] Missing or invalid object type
specified.\n", __FILE__, __LINE__ );
             return 0;
     }
-
-    return 1;
 }
 
 int doQueryDriver()
@@ -519,8 +517,6 @@
             fprintf( stderr, "[%s][%d][ERROR] Missing or invalid object type
specified.\n", __FILE__, __LINE__ );
             return 0;
     }
-
-    return 1;
 }
 
 /*!
@@ -565,7 +561,7 @@
     char  *pszDriverInfo = NULL;
     char  szLoc[FILENAME_MAX];
     WORD  nLocLen;
-    DWORD nUsageCount = -1;
+    DWORD nUsageCount;
     int   nChar;
 
     if ( !pszAttributes )
@@ -658,8 +654,6 @@
             fprintf( stderr, "[%s][%d][ERROR] Missing or invalid object type
specified.\n", __FILE__, __LINE__ );
             return 0;
     }
-
-    return 1;
 }
 
 int doEditDriver()
@@ -715,8 +709,6 @@
             fprintf( stderr, "[%s][%d][ERROR] Missing or invalid object type
specified.\n", __FILE__, __LINE__ );
             return 0;
     }
-
-    return 1;
 }
 
 /*!