cvs: php4 /ext/mssql php_mssql.c
| From: | Frank M. Kromann | Date: | Tue, 19 Mar 2002 23:00:19 +0000 |
| Subject: | cvs: php4 /ext/mssql php_mssql.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-10444@lists.php.net to get a copy of this message | ||
fmk Tue Mar 19 18:00:19 2002 EDT
Modified files:
/php4/ext/mssql php_mssql.c
Log:
Minor change to allocated lengths for dates
Index: php4/ext/mssql/php_mssql.c
diff -u php4/ext/mssql/php_mssql.c:1.79 php4/ext/mssql/php_mssql.c:1.80
--- php4/ext/mssql/php_mssql.c:1.79 Tue Mar 12 15:17:49 2002
+++ php4/ext/mssql/php_mssql.c Tue Mar 19 18:00:17 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mssql.c,v 1.79 2002/03/12 20:17:49 andi Exp $ */
+/* $Id: php_mssql.c,v 1.80 2002/03/19 23:00:17 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -800,7 +800,6 @@
DBDATEREC dateinfo;
int res_length = dbdatlen(mssql_ptr->link,offset);
-
if ((column_type != SQLDATETIME) || MS_SQL_G(datetimeconvert)) {
if (column_type == SQLDATETIM4) res_length += 14;
@@ -808,14 +807,11 @@
res_buf = (unsigned char *) emalloc(res_length + 1);
res_length = dbconvert(NULL,coltype(offset),dbdata(mssql_ptr->link,offset), res_length,
SQLCHAR,res_buf,-1);
-
} else {
-
dbdatecrack(mssql_ptr->link, &dateinfo, (DBDATETIME *)
dbdata(mssql_ptr->link,offset));
- res_length = 20;
+ res_length = 19;
res_buf = (unsigned char *) emalloc(res_length + 1);
-
sprintf(res_buf, "%d-%02d-%02d %02d:%02d:%02d" , dateinfo.year, dateinfo.month,
dateinfo.day, dateinfo.hour, dateinfo.minute, dateinfo.second);
}
@@ -866,12 +862,10 @@
res_length = dbconvert(NULL,coltype(offset),dbdata(mssql_ptr->link,offset), res_length,
SQLCHAR,res_buf,-1);
} else {
-
dbdatecrack(mssql_ptr->link, &dateinfo, (DBDATETIME *)
dbdata(mssql_ptr->link,offset));
- res_length = 20;
+ res_length = 19;
res_buf = (unsigned char *) emalloc(res_length + 1);
-
sprintf(res_buf, "%d-%02d-%02d %02d:%02d:%02d" , dateinfo.year, dateinfo.month,
dateinfo.day, dateinfo.hour, dateinfo.minute, dateinfo.second);
}