Skip to content

Commit 647667a

Browse files
committed
Move static forward declarations away
1 parent a02973c commit 647667a

2 files changed

Lines changed: 8 additions & 9 deletions

File tree

ibase_query.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,12 @@ typedef struct {
5858
static int le_query;
5959

6060
static void _php_ibase_alloc_xsqlda_vars(XSQLDA *sqlda, ISC_SHORT *nullinds);
61+
static int _php_ibase_set_query_info(ibase_query *ib_query);
62+
static int _php_ibase_fetch_query_res(zval *from, ibase_query **ib_query);
63+
static int _php_ibase_alloc_ht_aliases(ibase_query *ib_query);
64+
static void _php_ibase_alloc_ht_ind(ibase_query *ib_query);
65+
static void _php_ibase_free_query_impl(INTERNAL_FUNCTION_PARAMETERS, int as_result);
66+
6167
static void _php_ibase_free_xsqlda(XSQLDA *sqlda) /* {{{ */
6268
{
6369
int i;
@@ -276,9 +282,7 @@ static int _php_ibase_prepare(ibase_query **new_query, ibase_db_link *link, /* {
276282
goto _php_ibase_alloc_query_error;
277283
}
278284

279-
280-
// TODO: Rename. It also sets statement_type
281-
if(_php_ibase_get_vars_count(ib_query)){
285+
if(_php_ibase_set_query_info(ib_query)){
282286
goto _php_ibase_alloc_query_error;
283287
}
284288

@@ -2049,7 +2053,7 @@ PHP_FUNCTION(ibase_param_info)
20492053
}
20502054
/* }}} */
20512055

2052-
static int _php_ibase_get_vars_count(ibase_query *ib_query)
2056+
static int _php_ibase_set_query_info(ibase_query *ib_query)
20532057
{
20542058
int rv = FAILURE;
20552059
// size_t buf_size = 128;

php_ibase_includes.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -263,11 +263,6 @@ extern "C" {
263263
#endif
264264

265265
void _php_ibase_insert_alias(HashTable *ht, const char *alias);
266-
static int _php_ibase_get_vars_count(ibase_query *ib_query);
267-
static int _php_ibase_fetch_query_res(zval *from, ibase_query **ib_query);
268-
static int _php_ibase_alloc_ht_aliases(ibase_query *ib_query);
269-
static void _php_ibase_alloc_ht_ind(ibase_query *ib_query);
270-
static void _php_ibase_free_query_impl(INTERNAL_FUNCTION_PARAMETERS, int as_result);
271266

272267
#ifdef __cplusplus
273268
}

0 commit comments

Comments
 (0)