FAQ
iliaa Fri Oct 3 09:03:40 2003 EDT

Modified files:
/php-src/ext/sybase php_sybase_db.c
Log:
Fixed bug #25744 (make ZTS build of ext/sybase compile)


Index: php-src/ext/sybase/php_sybase_db.c
diff -u php-src/ext/sybase/php_sybase_db.c:1.54 php-src/ext/sybase/php_sybase_db.c:1.55
--- php-src/ext/sybase/php_sybase_db.c:1.54 Thu Aug 28 17:00:24 2003
+++ php-src/ext/sybase/php_sybase_db.c Fri Oct 3 09:03:39 2003
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/

-/* $Id: php_sybase_db.c,v 1.54 2003/08/28 21:00:24 andrey Exp $ */
+/* $Id: php_sybase_db.c,v 1.55 2003/10/03 13:03:39 iliaa Exp $ */


#ifdef HAVE_CONFIG_H
@@ -144,6 +144,7 @@
int oserr,char *dberrstr,char *oserrstr)
{
if (severity >= php_sybase_module.min_error_severity) {
+ TSRMLS_FETCH();
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase error: %s (severity %d)",dberrstr,severity);
}
return INT_CANCEL;
@@ -155,6 +156,7 @@
char *procname,DBUSMALLINT line)
{
if (severity >= php_sybase_module.min_message_severity) {
+ TSRMLS_FETCH();
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase message: %s (severity %d)",msgtext,severity);
}
STR_FREE(php_sybase_module.server_message);

Search Discussions

  • Ilia Alshanetsky at Oct 3, 2003 at 6:05 pm
    iliaa Fri Oct 3 14:05:41 2003 EDT

    Modified files:
    /php-src/ext/sybase php_sybase_db.c
    Log:
    More ZTS stuff.


    Index: php-src/ext/sybase/php_sybase_db.c
    diff -u php-src/ext/sybase/php_sybase_db.c:1.55 php-src/ext/sybase/php_sybase_db.c:1.56
    --- php-src/ext/sybase/php_sybase_db.c:1.55 Fri Oct 3 09:03:39 2003
    +++ php-src/ext/sybase/php_sybase_db.c Fri Oct 3 14:05:41 2003
    @@ -20,7 +20,7 @@
    +----------------------------------------------------------------------+
    */

    -/* $Id: php_sybase_db.c,v 1.55 2003/10/03 13:03:39 iliaa Exp $ */
    +/* $Id: php_sybase_db.c,v 1.56 2003/10/03 18:05:41 iliaa Exp $ */


    #ifdef HAVE_CONFIG_H
    @@ -748,6 +748,7 @@
    Z_STRVAL_P(result) = res_buf;
    Z_TYPE_P(result) = IS_STRING;
    } else {
    + TSRMLS_FETCH();
    php_error_docref(NULL TSRMLS_CC, E_WARNING,"Sybase: column %d has unknown data type (%d)", offset, coltype(offset));
    ZVAL_FALSE(result);
    }
  • Ilia Alshanetsky at Oct 16, 2003 at 4:24 am
    iliaa Thu Oct 16 00:24:02 2003 EDT

    Modified files:
    /php-src/ext/sybase php_sybase_db.c
    Log:
    Do not strip trailing spaces.


    Index: php-src/ext/sybase/php_sybase_db.c
    diff -u php-src/ext/sybase/php_sybase_db.c:1.56 php-src/ext/sybase/php_sybase_db.c:1.57
    --- php-src/ext/sybase/php_sybase_db.c:1.56 Fri Oct 3 14:05:41 2003
    +++ php-src/ext/sybase/php_sybase_db.c Thu Oct 16 00:24:01 2003
    @@ -20,7 +20,7 @@
    +----------------------------------------------------------------------+
    */

    -/* $Id: php_sybase_db.c,v 1.56 2003/10/03 18:05:41 iliaa Exp $ */
    +/* $Id: php_sybase_db.c,v 1.57 2003/10/16 04:24:01 iliaa Exp $ */


    #ifdef HAVE_CONFIG_H
    @@ -734,7 +734,7 @@
    but i don't have sybase here to test
    991105 thies@thieso.net */
    dbconvert(NULL,coltype(offset),dbdata(sybase_ptr->link,offset), src_length,SYBCHAR,res_buf,res_length);
    -
    +#if ilia_0
    /* get rid of trailing spaces */
    p = res_buf + res_length;
    while (p >= res_buf && (*p == ' ' || *p == '\0')) {
    @@ -742,8 +742,7 @@
    }
    *(++p) = 0; /* put a trailing NULL */
    res_length = p - res_buf;
    -
    -
    +#endif
    Z_STRLEN_P(result) = res_length;
    Z_STRVAL_P(result) = res_buf;
    Z_TYPE_P(result) = IS_STRING;

Related Discussions

Discussion Navigation
viewthread | post
Discussion Overview
groupphp-cvs @
categoriesphp
postedOct 3, '03 at 1:03p
activeOct 16, '03 at 4:24a
posts3
users1
websitephp.net

1 user in discussion

Ilia Alshanetsky: 3 posts

People

Translate

site design / logo © 2019 Grokbase