CVS update: php3/functions

Date: Tuesday December 15, 1998 @ 8:19 Author: rasmus Update of /repository/php3/functions In directory asf:/home/rasmus/php3/functions Modified Files: ifx.ec Log Message: These need to be on separate lines for silly Emacs to understand them Index: php3/functions/ifx.ec diff -c php3/functions/ifx.ec:1.34 php3/functions/ifx.ec:1.35 *** php3/functions/ifx.ec:1.34 Thu Nov 12 17:09:22 1998 --- php3/functions/ifx.ec Tue Dec 15 08:19:19 1998 *************** *** 801,807 **** } efree(hashed_details); Informix_GLOBAL(php3_ifx_module).default_link=return_value->value.lval; ! } /* }}} */ void php3_ifx_connect(INTERNAL_FUNCTION_PARAMETERS) --- 801,808 ---- } efree(hashed_details); Informix_GLOBAL(php3_ifx_module).default_link=return_value->value.lval; ! } ! /* }}} */ void php3_ifx_connect(INTERNAL_FUNCTION_PARAMETERS) *************** *** 885,891 **** php3_list_delete(id); RETURN_TRUE; ! } /* }}} */ /* ---------------------------------------------------------------------- ** int ifx_query(string $query, int $connid, --- 886,893 ---- php3_list_delete(id); RETURN_TRUE; ! } ! /* }}} */ /* ---------------------------------------------------------------------- ** int ifx_query(string $query, int $connid, *************** *** 1263,1269 **** RETURN_LONG(php3_list_insert(Ifx_Result,Informix_GLOBAL(php3_ifx_module).le_result)); ! } /* }}} */ /* ---------------------------------------------------------------------- --- 1265,1272 ---- RETURN_LONG(php3_list_insert(Ifx_Result,Informix_GLOBAL(php3_ifx_module).le_result)); ! } ! /* }}} */ /* ---------------------------------------------------------------------- *************** *** 1547,1553 **** } /* if select */ RETURN_LONG(php3_list_insert(Ifx_Result,Informix_GLOBAL(php3_ifx_module).le_result)); ! } /* }}} */ /* ---------------------------------------------------------------------- ** int ifx_do(int $resultid) --- 1550,1557 ---- } /* if select */ RETURN_LONG(php3_list_insert(Ifx_Result,Informix_GLOBAL(php3_ifx_module).le_result)); ! } ! /* }}} */ /* ---------------------------------------------------------------------- ** int ifx_do(int $resultid) *************** *** 1714,1720 **** RETURN_TRUE; ! } /* }}} */ --- 1718,1725 ---- RETURN_TRUE; ! } ! /* }}} */ *************** *** 1765,1771 **** * } */ RETURN_STRING(ifx_error(0),0); /* ifx_error returns emalloced string */ ! } /* }}} */ /* ---------------------------------------------------------------------- ** string ifx_errormsg([int errorcode]) --- 1770,1777 ---- * } */ RETURN_STRING(ifx_error(0),0); /* ifx_error returns emalloced string */ ! } ! /* }}} */ /* ---------------------------------------------------------------------- ** string ifx_errormsg([int errorcode]) *************** *** 1828,1834 **** free(ifx_errmsg); RETURN_STRING(returnmsg,0); /* do not dup, emalloced ! */ ! } /* }}} */ /* -------------------------------------------------------------- ** int ifx_affected_rows(int $resultid) --- 1834,1841 ---- free(ifx_errmsg); RETURN_STRING(returnmsg,0); /* do not dup, emalloced ! */ ! } ! /* }}} */ /* -------------------------------------------------------------- ** int ifx_affected_rows(int $resultid) *************** *** 1876,1882 **** return_value->value.lval = Ifx_Result->affected_rows; return_value->type = IS_LONG; ! } /* }}} */ /* ---------------------------------------------------------------------- ** array ifx_fetch_row(int $resultid, [mixed $position]) --- 1883,1890 ---- return_value->value.lval = Ifx_Result->affected_rows; return_value->type = IS_LONG; ! } ! /* }}} */ /* ---------------------------------------------------------------------- ** array ifx_fetch_row(int $resultid, [mixed $position]) *************** *** 2265,2271 **** } efree(nullstr); ! } /* }}} */ --- 2273,2280 ---- } efree(nullstr); ! } ! /* }}} */ *************** *** 2623,2629 **** efree(nullstr); RETURN_LONG(Ifx_Result->rowid); ! } /* }}} */ /* ---------------------------------------------------------------------- ** array ifx_fieldtypes(int $resultid) --- 2632,2639 ---- efree(nullstr); RETURN_LONG(Ifx_Result->rowid); ! } ! /* }}} */ /* ---------------------------------------------------------------------- ** array ifx_fieldtypes(int $resultid) *************** *** 2822,2828 **** } /* for() */ ! } /* }}} */ /* ---------------------------------------------------------------------- ** array ifx_fieldproperties(int $resultid) --- 2832,2839 ---- } /* for() */ ! } ! /* }}} */ /* ---------------------------------------------------------------------- ** array ifx_fieldproperties(int $resultid) *************** *** 3038,3044 **** } /* for() */ ! } /* }}} */ /* -------------------------------------------------------------- --- 3049,3056 ---- } /* for() */ ! } ! /* }}} */ /* -------------------------------------------------------------- *************** *** 3075,3081 **** return_value->value.lval = Ifx_Result->rowid; return_value->type = IS_LONG; ! } /* }}} */ /* ---------------------------------------------------------------------- ** int ifx_num_fields(int $resultid) --- 3087,3094 ---- return_value->value.lval = Ifx_Result->rowid; return_value->type = IS_LONG; ! } ! /* }}} */ /* ---------------------------------------------------------------------- ** int ifx_num_fields(int $resultid) *************** *** 3111,3117 **** return_value->value.lval = Ifx_Result->numcols; return_value->type = IS_LONG; ! } /* }}} */ --- 3124,3131 ---- return_value->value.lval = Ifx_Result->numcols; return_value->type = IS_LONG; ! } ! /* }}} */ *************** *** 3188,3194 **** php3_list_delete(result->value.lval); RETURN_TRUE; ! } /* }}} */ --- 3202,3209 ---- php3_list_delete(result->value.lval); RETURN_TRUE; ! } ! /* }}} */ *************** *** 3259,3265 **** RETURN_FALSE; } RETURN_LONG(id); ! } /* }}} */ /* ---------------------------------------------------------------------- * internal function --- 3274,3281 ---- RETURN_FALSE; } RETURN_LONG(id); ! } ! /* }}} */ /* ---------------------------------------------------------------------- * internal function *************** *** 3362,3368 **** } RETURN_LONG(newid); ! } /* }}} */ --- 3378,3385 ---- } RETURN_LONG(newid); ! } ! /* }}} */ *************** *** 3465,3471 **** RETURN_FALSE; } RETURN_TRUE; ! } /* }}} */ /* ---------------------------------------------------------------------- * internal function --- 3482,3489 ---- RETURN_FALSE; } RETURN_TRUE; ! } ! /* }}} */ /* ---------------------------------------------------------------------- * internal function *************** *** 3574,3580 **** RETURN_STRING(php3_intifx_null(),1); } RETURN_STRINGL(content,len,1); ! } /* }}} */ /* ---------------------------------------------------------------------- --- 3592,3599 ---- RETURN_STRING(php3_intifx_null(),1); } RETURN_STRINGL(content,len,1); ! } ! /* }}} */ /* ---------------------------------------------------------------------- *************** *** 3666,3672 **** RETURN_FALSE; } RETURN_TRUE; ! } /* }}} */ /* ---------------------------------------------------------------------- --- 3685,3692 ---- RETURN_FALSE; } RETURN_TRUE; ! } ! /* }}} */ /* ---------------------------------------------------------------------- *************** *** 3787,3793 **** Informix_GLOBAL(php3_ifx_module).blobinfile=pmode->value.lval; RETURN_TRUE; ! } /* }}} */ --- 3807,3814 ---- Informix_GLOBAL(php3_ifx_module).blobinfile=pmode->value.lval; RETURN_TRUE; ! } ! /* }}} */ *************** *** 3814,3820 **** Informix_GLOBAL(php3_ifx_module).textasvarchar=pmode->value.lval; RETURN_TRUE; ! } /* }}} */ --- 3835,3842 ---- Informix_GLOBAL(php3_ifx_module).textasvarchar=pmode->value.lval; RETURN_TRUE; ! } ! /* }}} */ *************** *** 3867,3873 **** Informix_GLOBAL(php3_ifx_module).nullformat=pmode->value.lval; RETURN_TRUE; ! } /* }}} */ /* ---------------------------------------------------------------------- --- 3889,3896 ---- Informix_GLOBAL(php3_ifx_module).nullformat=pmode->value.lval; RETURN_TRUE; ! } ! /* }}} */ /* ---------------------------------------------------------------------- *************** *** 3928,3934 **** RETURN_FALSE; } RETURN_LONG(id); ! } /* }}} */ /* ---------------------------------------------------------------------- * internal function --- 3951,3958 ---- RETURN_FALSE; } RETURN_LONG(id); ! } ! /* }}} */ /* ---------------------------------------------------------------------- * internal function *************** *** 3997,4003 **** RETURN_STRING("",1); } RETURN_STRINGL(content,len,1); ! } /* }}} */ /* ---------------------------------------------------------------------- --- 4021,4028 ---- RETURN_STRING("",1); } RETURN_STRINGL(content,len,1); ! } ! /* }}} */ /* ---------------------------------------------------------------------- *************** *** 4052,4058 **** RETURN_FALSE; } RETURN_TRUE; ! } /* }}} */ /* ---------------------------------------------------------------------- * internal function --- 4077,4084 ---- RETURN_FALSE; } RETURN_TRUE; ! } ! /* }}} */ /* ---------------------------------------------------------------------- * internal function *************** *** 4116,4122 **** RETURN_FALSE; } RETURN_TRUE; ! } /* }}} */ /* ---------------------------------------------------------------------- --- 4142,4149 ---- RETURN_FALSE; } RETURN_TRUE; ! } ! /* }}} */ /* ---------------------------------------------------------------------- *************** *** 4244,4250 **** RETURN_FALSE; } RETURN_LONG(id); ! } /* }}} */ /* ---------------------------------------------------------------------- * internal function --- 4271,4278 ---- RETURN_FALSE; } RETURN_LONG(id); ! } ! /* }}} */ /* ---------------------------------------------------------------------- * internal function *************** *** 4310,4316 **** RETURN_FALSE; } RETURN_TRUE; ! } /* }}} */ /* ---------------------------------------------------------------------- * internal function --- 4338,4345 ---- RETURN_FALSE; } RETURN_TRUE; ! } ! /* }}} */ /* ---------------------------------------------------------------------- * internal function *************** *** 4375,4381 **** RETURN_FALSE; } RETURN_TRUE; ! } /* }}} */ /* ---------------------------------------------------------------------- * internal function --- 4404,4411 ---- RETURN_FALSE; } RETURN_TRUE; ! } ! /* }}} */ /* ---------------------------------------------------------------------- * internal function *************** *** 4457,4463 **** create_mode|=LO_NOBUFFER; RETURN_LONG(php3_intifxus_open_slob(pbid->value.lval,create_mode,list)); ! } /* }}} */ /* ---------------------------------------------------------------------- --- 4487,4494 ---- create_mode|=LO_NOBUFFER; RETURN_LONG(php3_intifxus_open_slob(pbid->value.lval,create_mode,list)); ! } ! /* }}} */ /* ---------------------------------------------------------------------- *************** *** 4601,4607 **** RETURN_FALSE; } RETURN_LONG(lakt_seek_pos); ! } /* }}} */ --- 4632,4639 ---- RETURN_FALSE; } RETURN_LONG(lakt_seek_pos); ! } ! /* }}} */ *************** *** 4659,4665 **** RETURN_FALSE; } RETURN_LONG(lakt_seek_pos); ! } /* }}} */ --- 4691,4698 ---- RETURN_FALSE; } RETURN_LONG(lakt_seek_pos); ! } ! /* }}} */ *************** *** 4711,4717 **** } RETURN_STRINGL(buffer,nbytes,0); ! } /* }}} */ /* ---------------------------------------------------------------------- --- 4744,4751 ---- } RETURN_STRINGL(buffer,nbytes,0); ! } ! /* }}} */ /* ---------------------------------------------------------------------- *************** *** 4760,4766 **** } RETURN_LONG(nbytes); ! } /* }}} */ $endif; --- 4794,4801 ---- } RETURN_LONG(nbytes); ! } ! /* }}} */ $endif; -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net