Attachment #264309 for bug #357025

View | Details | Raw Unified | Return to bug 357025
Collapse All | Expand All





static void adodb_init_zval(zval *v, char *s)
{
	ZVAL_STRING(v, s, 0);
	v->value.str.val = s;
	v->value.str.len = strlen(s);
	v->is_ref = 0;
	v->refcount = 1;
}

/* {{{ PHP_MINIT_FUNCTION

long		error;
unsigned long save_error_reporting;
zval		**fields;
#if !defined(BYREF_FORCE)
	zend_fcall_info fci;
	
	fci.size = sizeof(fci);
	fci.function_table = EG(function_table);
	fci.function_name = &adodb_zvals[zval_ocifetch];
	fci.symbol_table = NULL;
	/* fci.object_pp = NULL; */
	fci.retval_ptr_ptr = &retval;
	fci.param_count = 2;
	fci.params = &params[1];
	fci.no_separation = 0;
#endif


Return to bug 357025

Lines 159-169 Link Here

(-)adodb-504/adodb.c (-15 / +11 lines)
159		159
160	static void adodb_init_zval(zval v, char s)	160	static void adodb_init_zval(zval v, char s)
161	{	161	{
162	v->type = IS_STRING;	162	ZVAL_STRING(v, s, 0);
163	v->value.str.val = s;
164	v->value.str.len = strlen(s);
165	v->is_ref = 0;
166	v->refcount = 1;
167	}	163	}
168		164
169	/* {{{ PHP_MINIT_FUNCTION	165	/* {{{ PHP_MINIT_FUNCTION
Lines 270-286 Link Here
270	long error;	266	long error;
271	unsigned long save_error_reporting;	267	unsigned long save_error_reporting;
272	zval **fields;	268	zval **fields;
273	#if !defined(BYREF_FORCE)	269	#if !defined(BYREF_FORCE)
274	zend_fcall_info fci;	270	zend_fcall_info fci;
275		271
276	fci.size = sizeof(fci);	272	fci.size = sizeof(fci);
277	fci.function_table = EG(function_table);	273	fci.function_table = EG(function_table);
278	fci.function_name = &adodb_zvals[zval_ocifetch];	274	fci.function_name = &adodb_zvals[zval_ocifetch];
279	fci.symbol_table = NULL;	275	fci.symbol_table = NULL;
280	fci.object_pp = NULL;	276	/* fci.object_pp = NULL; */
281	fci.retval_ptr_ptr = &retval;	277	fci.retval_ptr_ptr = &retval;
282	fci.param_count = 2;	278	fci.param_count = 2;
283	fci.params = &params[1];	279	fci.params = &params[1];
284	fci.no_separation = 0;	280	fci.no_separation = 0;
285	#endif	281	#endif
286		282