subject:"\[PHP\-CVS\] cvs\: php\-src \/ext\/mssql php_mssql.c php

[PHP-CVS] cvs: php-src /ext/mssql php_mssql.c php_mssql.h

2009-05-26 Thread Felipe Pena

felipe  Tue May 26 12:26:50 2009 UTC

  Modified files:  
/php-src/ext/mssql  php_mssql.c php_mssql.h 
  Log:
  - Fix compile warning  nuke unused variables
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mssql/php_mssql.c?r1=1.191r2=1.192diff_format=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.191 php-src/ext/mssql/php_mssql.c:1.192
--- php-src/ext/mssql/php_mssql.c:1.191 Tue Mar 10 23:39:27 2009
+++ php-src/ext/mssql/php_mssql.c   Tue May 26 12:26:49 2009
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_mssql.c,v 1.191 2009/03/10 23:39:27 helly Exp $ */
+/* $Id: php_mssql.c,v 1.192 2009/05/26 12:26:49 felipe Exp $ */
 
 #ifdef COMPILE_DL_MSSQL
 #define HAVE_MSSQL 1
@@ -967,8 +967,6 @@
case SQLVARBINARY:
case SQLBINARY:
case SQLIMAGE: {
-   DBBINARY *bin;
-   unsigned char *res_buf;
int res_length = dbdatlen(mssql_ptr-link, offset);
 
if (!res_length) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mssql/php_mssql.h?r1=1.50r2=1.51diff_format=u
Index: php-src/ext/mssql/php_mssql.h
diff -u php-src/ext/mssql/php_mssql.h:1.50 php-src/ext/mssql/php_mssql.h:1.51
--- php-src/ext/mssql/php_mssql.h:1.50  Tue Mar 10 23:39:27 2009
+++ php-src/ext/mssql/php_mssql.h   Tue May 26 12:26:49 2009
@@ -17,7 +17,7 @@
  */
 
 
-/* $Id: php_mssql.h,v 1.50 2009/03/10 23:39:27 helly Exp $ */
+/* $Id: php_mssql.h,v 1.51 2009/05/26 12:26:49 felipe Exp $ */
 
 #ifndef PHP_MSSQL_H
 #define PHP_MSSQL_H
@@ -61,7 +61,9 @@
 #define DBMSGHANDLE(a, b) dbmsghandle(b)
 #define DBSETOPT(a, b, c) dbsetopt(a, b, c, -1)
 #define NO_MORE_RPC_RESULTS 3
+#ifndef dbfreelogin
 #define dbfreelogin dbloginfree
+#endif
 #define dbrpcexec dbrpcsend
 typedef unsigned char  *LPBYTE;
 typedef float   DBFLT4;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/mssql php_mssql.c php_mssql.h

2005-12-05 Thread Jani Taskinen

sniper  Mon Dec  5 20:25:15 2005 EDT

  Modified files:  
/php-src/ext/mssql  php_mssql.c php_mssql.h 
  Log:
  nuke php3 legacy
  
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.160r2=1.161ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.160 php-src/ext/mssql/php_mssql.c:1.161
--- php-src/ext/mssql/php_mssql.c:1.160 Mon Dec  5 18:31:04 2005
+++ php-src/ext/mssql/php_mssql.c   Mon Dec  5 20:25:13 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_mssql.c,v 1.160 2005/12/05 23:31:04 sniper Exp $ */
+/* $Id: php_mssql.c,v 1.161 2005/12/06 01:25:13 sniper Exp $ */
 
 #ifdef COMPILE_DL_MSSQL
 #define HAVE_MSSQL 1
@@ -47,7 +47,7 @@
 
 static void _mssql_bind_hash_dtor(void *data);
 
-function_entry mssql_functions[] = {
+zend_function_entry mssql_functions[] = {
PHP_FE(mssql_connect,   NULL)
PHP_FE(mssql_pconnect,  NULL)
PHP_FE(mssql_close, NULL)
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.h?r1=1.42r2=1.43ty=u
Index: php-src/ext/mssql/php_mssql.h
diff -u php-src/ext/mssql/php_mssql.h:1.42 php-src/ext/mssql/php_mssql.h:1.43
--- php-src/ext/mssql/php_mssql.h:1.42  Mon Aug  8 17:32:18 2005
+++ php-src/ext/mssql/php_mssql.h   Mon Dec  5 20:25:13 2005
@@ -17,7 +17,7 @@
  */
 
 
-/* $Id: php_mssql.h,v 1.42 2005/08/08 21:32:18 fmk Exp $ */
+/* $Id: php_mssql.h,v 1.43 2005/12/06 01:25:13 sniper Exp $ */
 
 #ifndef PHP_MSSQL_H
 #define PHP_MSSQL_H
@@ -162,7 +162,7 @@
long cfg_min_error_severity, cfg_min_message_severity;
long connect_timeout, timeout;
zend_bool compatability_mode;
-   void (*get_column_content)(mssql_link *mssql_ptr,int offset,pval 
*result,int column_type  TSRMLS_DC);
+   void (*get_column_content)(mssql_link *mssql_ptr,int offset,zval 
*result,int column_type  TSRMLS_DC);
long textsize, textlimit, batchsize;
zend_bool datetimeconvert;
HashTable *resource_list, *resource_plist;
@@ -180,7 +180,7 @@
 } mssql_field;
 
 typedef struct mssql_result {
-   pval **data;
+   zval **data;
mssql_field *fields;
mssql_link *mssql_ptr;
mssql_statement * statement;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/mssql php_mssql.c php_mssql.h

2005-08-08 Thread Frank M. Kromann

fmk Mon Aug  8 17:32:21 2005 EDT

  Modified files:  
/php-src/ext/mssql  php_mssql.c php_mssql.h 
  Log:
  Fix #32010. Leak in mssql_fetch_batch().
  
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.149r2=1.150ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.149 php-src/ext/mssql/php_mssql.c:1.150
--- php-src/ext/mssql/php_mssql.c:1.149 Wed Aug  3 10:07:28 2005
+++ php-src/ext/mssql/php_mssql.c   Mon Aug  8 17:32:18 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_mssql.c,v 1.149 2005/08/03 14:07:28 sniper Exp $ */
+/* $Id: php_mssql.c,v 1.150 2005/08/08 21:32:18 fmk Exp $ */
 
 #ifdef COMPILE_DL_MSSQL
 #define HAVE_MSSQL 1
@@ -994,34 +994,39 @@

if (statement-binds != NULL) { /*  Maybe a 
non-parameter sp*/
if (zend_hash_find(statement-binds, parameter, 
strlen(parameter), (void**)bind)==SUCCESS) {
-   switch (type) {
-   case SQLBIT:
-   case SQLINT1:
-   case SQLINT2:
-   case SQLINT4:
-   
convert_to_long_ex(bind-zval);
-   /* FIXME this works 
only on little endian machine !!! */
-   Z_LVAL_P(bind-zval) = 
*((int *)(dbretdata(mssql_ptr-link,i)));
-   break;
-   
-   case SQLFLT4:
-   case SQLFLT8:
-   case SQLFLTN:
-   case SQLMONEY4:
-   case SQLMONEY:
-   case SQLMONEYN:
-   
convert_to_double_ex(bind-zval);
-   Z_DVAL_P(bind-zval) = 
*((double *)(dbretdata(mssql_ptr-link,i)));
-   break;
-
-   case SQLCHAR:
-   case SQLVARCHAR:
-   case SQLTEXT:
-   
convert_to_string_ex(bind-zval);
-   Z_STRLEN_P(bind-zval) 
= dbretlen(mssql_ptr-link,i);
-   Z_STRVAL_P(bind-zval) 
= estrndup(dbretdata(mssql_ptr-link,i),Z_STRLEN_P(bind-zval));
-   break;
-   /* TODO binary */
+   if (!dbretlen(mssql_ptr-link,i)) {
+   ZVAL_NULL(bind-zval);
+   }
+   else {
+   switch (type) {
+   case SQLBIT:
+   case SQLINT1:
+   case SQLINT2:
+   case SQLINT4:
+   
convert_to_long_ex(bind-zval);
+   /* FIXME this 
works only on little endian machine !!! */
+   
Z_LVAL_P(bind-zval) = *((int *)(dbretdata(mssql_ptr-link,i)));
+   break;
+   
+   case SQLFLT4:
+   case SQLFLT8:
+   case SQLFLTN:
+   case SQLMONEY4:
+   case SQLMONEY:
+   case SQLMONEYN:
+   
convert_to_double_ex(bind-zval);
+   
Z_DVAL_P(bind-zval) = *((double *)(dbretdata(mssql_ptr-link,i)));
+   break;
+   
+   case SQLCHAR:
+   case

[PHP-CVS] cvs: php-src /ext/mssql php_mssql.c php_mssql.h

2004-06-03 Thread Sara Golemon

pollita Thu Jun  3 21:03:38 2004 EDT

  Modified files:  
/php-src/ext/mssql  php_mssql.c php_mssql.h 
  Log:
  MFB BugFix# 28626 You can't #ifdef check a typedef.  Just give it another name since 
it's only used once anyway.
  
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.134r2=1.135ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.134 php-src/ext/mssql/php_mssql.c:1.135
--- php-src/ext/mssql/php_mssql.c:1.134 Tue Apr 20 19:30:51 2004
+++ php-src/ext/mssql/php_mssql.c   Thu Jun  3 21:03:38 2004
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_mssql.c,v 1.134 2004/04/20 23:30:51 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.135 2004/06/04 01:03:38 pollita Exp $ */
 
 #ifdef COMPILE_DL_MSSQL
 #define HAVE_MSSQL 1
@@ -340,7 +340,7 @@
dbsetlogintime(MS_SQL_G(connect_timeout));
if (MS_SQL_G(timeout)  0) MS_SQL_G(timeout) = 60;
dbsettime(MS_SQL_G(timeout));
-   dbsetmaxprocs((SHORT)MS_SQL_G(max_procs));
+   dbsetmaxprocs((TDS_SHORT)MS_SQL_G(max_procs));
 
return SUCCESS;
 }
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.h?r1=1.36r2=1.37ty=u
Index: php-src/ext/mssql/php_mssql.h
diff -u php-src/ext/mssql/php_mssql.h:1.36 php-src/ext/mssql/php_mssql.h:1.37
--- php-src/ext/mssql/php_mssql.h:1.36  Tue Apr 20 19:37:08 2004
+++ php-src/ext/mssql/php_mssql.h   Thu Jun  3 21:03:38 2004
@@ -17,7 +17,7 @@
  */
 
 
-/* $Id: php_mssql.h,v 1.36 2004/04/20 23:37:08 fmk Exp $ */
+/* $Id: php_mssql.h,v 1.37 2004/06/04 01:03:38 pollita Exp $ */
 
 #ifndef PHP_MSSQL_H
 #define PHP_MSSQL_H
@@ -37,9 +37,7 @@
 #include sqldb.h
 
 #if HAVE_FREETDS
-#ifndef SHORT
-typedef short SHORT;
-#endif
+typedef short TDS_SHORT;
 #define SQLTEXT SYBTEXT
 #define SQLCHAR SYBCHAR
 #define SQLVARCHAR SYBVARCHAR

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/mssql php_mssql.c php_mssql.h

2003-07-23 Thread Ilia Alshanetsky

iliaa   Wed Jul 23 12:53:26 2003 EDT

  Modified files:  
/php-src/ext/mssql  php_mssql.c php_mssql.h 
  Log:
  Fixed bug #24752 (Unhandled uniqueidentifier field type)
  Original Patch By: s.sonnenberg[at]coolspot.de
  
  
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.115 php-src/ext/mssql/php_mssql.c:1.116
--- php-src/ext/mssql/php_mssql.c:1.115 Thu Jul  3 12:53:04 2003
+++ php-src/ext/mssql/php_mssql.c   Wed Jul 23 12:53:26 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_mssql.c,v 1.115 2003/07/03 16:53:04 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.116 2003/07/23 16:53:26 iliaa Exp $ */
 
 #ifdef COMPILE_DL_MSSQL
 #define HAVE_MSSQL 1
@@ -800,6 +800,15 @@
Z_DVAL_P(result) = (double) floatcol8(offset);
Z_TYPE_P(result) = IS_DOUBLE;
break;
+#ifdef SQLUNIQUE
+   case SQLUNIQUE: {
+   char *data = charcol(offset);
+
+   /* uniqueidentifier is a 16-byte binary number */
+   ZVAL_STRINGL(result, data, 16, 1);
+   }
+   break;
+#endif
case SQLVARBINARY:
case SQLBINARY:
case SQLIMAGE: {
@@ -1468,6 +1477,11 @@
case SQLIMAGE:
return image;
break;
+#ifdef SQLUNIQUE
+   case SQLUNIQUE:
+   return uniqueidentifier;
+   break;
+#endif
default:
return unknown;
break;
Index: php-src/ext/mssql/php_mssql.h
diff -u php-src/ext/mssql/php_mssql.h:1.33 php-src/ext/mssql/php_mssql.h:1.34
--- php-src/ext/mssql/php_mssql.h:1.33  Fri Jun 13 23:34:42 2003
+++ php-src/ext/mssql/php_mssql.h   Wed Jul 23 12:53:26 2003
@@ -17,7 +17,7 @@
  */
 
 
-/* $Id: php_mssql.h,v 1.33 2003/06/14 03:34:42 fmk Exp $ */
+/* $Id: php_mssql.h,v 1.34 2003/07/23 16:53:26 iliaa Exp $ */
 
 #ifndef PHP_MSSQL_H
 #define PHP_MSSQL_H
@@ -59,6 +59,9 @@
 #define SQLIMAGE SYBIMAGE
 #define SQLBINARY SYBBINARY
 #define SQLVARBINARY SYBVARBINARY
+#ifdef SQLUNIQUE /* FreeTSD 0.61+ */
+#define SQLUNIQUE SYBUNIQUE
+#endif
 #define DBERRHANDLE(a, b) dberrhandle(b)
 #define DBMSGHANDLE(a, b) dbmsghandle(b)
 #define DBSETOPT(a, b, c) dbsetopt(a, b, c, -1)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/mssql php_mssql.c php_mssql.h

[PHP-CVS] cvs: php-src /ext/mssql php_mssql.c php_mssql.h

[PHP-CVS] cvs: php-src /ext/mssql php_mssql.c php_mssql.h

[PHP-CVS] cvs: php-src /ext/mssql php_mssql.c php_mssql.h

[PHP-CVS] cvs: php-src /ext/mssql php_mssql.c php_mssql.h

5 matches

Site Navigation

Mail list logo

Footer information