cvs: php4(PHP_4_2_0) /ext/fbsql php_fbsql.c

kalowsky Tue Sep 3 23:56:18 2002 EDT Modified files: (Branch: PHP_4_2_0) /php4/ext/fbsql php_fbsql.c Log: No C++ comments Index: php4/ext/fbsql/php_fbsql.c diff -u php4/ext/fbsql/php_fbsql.c:1.76 php4/ext/fbsql/php_fbsql.c:1.76.2.1 --- php4/ext/fbsql/php_fbsql.c:1.76 Thu Feb 28 03:26:06 2002 +++ php4/ext/fbsql/php_fbsql.c Tue Sep 3 23:56:18 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_fbsql.c,v 1.76 2002/02/28 08:26:06 sebastian Exp $ */ +/* $Id: php_fbsql.c,v 1.76.2.1 2002/09/04 03:56:18 kalowsky Exp $ */ /* TODO: * @@ -155,16 +155,16 @@ #define FBSQL_LOCK_DEFERRED 0 #define FBSQL_LOCK_OPTIMISTIC 1 -#define FBSQL_LOCK_PESSIMISTIC 2 // default +#define FBSQL_LOCK_PESSIMISTIC 2 /* default */ #define FBSQL_ISO_READ_UNCOMMITTED 0 #define FBSQL_ISO_READ_COMMITTED 1 #define FBSQL_ISO_REPEATABLE_READ 2 -#define FBSQL_ISO_SERIALIZABLE 3 // default +#define FBSQL_ISO_SERIALIZABLE 3 /* default */ #define FBSQL_ISO_VERSIONED 4 -#define FBSQL_LOB_DIRECT 0 // default -#define FBSQL_LOB_HANDLE 1 // default +#define FBSQL_LOB_DIRECT 0 /* default */ +#define FBSQL_LOB_HANDLE 1 /* default */ /* {{{ fbsql_functions[] @@ -230,7 +230,7 @@ PHP_FE(fbsql_warnings, NULL) PHP_FE(fbsql_get_autostart_info, NULL) -// PHP_FE(fbsql_set_autostart_info, NULL) +/* PHP_FE(fbsql_set_autostart_info, NULL) */ /* Aliases: */ PHP_FALIAS(fbsql, fbsql_db_query, NULL) @@ -962,10 +962,10 @@ convert_to_string_ex(lob_data); switch (lob_type) { - case 0 : // BLOB + case 0 : /* BLOB */ lobHandle = fbcdcWriteBLOB(phpLink->connection, Z_STRVAL_PP(lob_data), Z_STRLEN_PP(lob_data)); break; - case 1 : // CLOB + case 1 : /* CLOB */ lobHandle = fbcdcWriteCLOB(phpLink->connection, Z_STRVAL_PP(lob_data)); break; } @@ -2384,7 +2384,7 @@ case FB_BLOB: { if (*((unsigned char*) data) == '\1') - { // Direct + { /* Direct */ *length = ((FBCBlobDirect *)data)->blobSize; *value = estrndup((char *)((FBCBlobDirect *)data)->blobData, *length); } @@ -3473,13 +3473,16 @@ for (i=0; i<fbaCount(asInfo->infoLines); i++) { FBArray* infoLine = fbaObjectAtIndex(asInfo->infoLines, i); -// if (fbaCount(infoLine) == 2) { -// fbaObjectAtIndex(infoLine, 0); -// fbaObjectAtIndex(infoLine, 1); -// } -// else { +/* + if (fbaCount(infoLine) == 2) { + fbaObjectAtIndex(infoLine, 0); + fbaObjectAtIndex(infoLine, 1); + } + else { +*/ add_index_string(return_value, i, fbaObjectAtIndex(infoLine, 0), 1); -// } +/* } + */ } }