Skip to content

Commit d32ebc7

Browse files
mlazdansmlazdans
committed
Tidy up
1 parent 6080b4f commit d32ebc7

4 files changed

Lines changed: 20 additions & 21 deletions

File tree

‎firebird_utils.cpp‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -171,13 +171,12 @@ extern "C" void fbu_release_statement(void *statement_ptr)
171171
if (statement) statement->release();
172172
}
173173

174-
extern "C" int fbu_insert_aliases(void *master_ptr, ISC_STATUS* st, ibase_query *ib_query, void *statement_ptr)
174+
extern "C" ISC_STATUS fbu_insert_aliases(void *master_ptr, ISC_STATUS* st, ibase_query *ib_query, void *statement_ptr)
175175
{
176176
Firebird::IMaster* master = (Firebird::IMaster*)master_ptr;
177177
Firebird::ThrowStatusWrapper status(master->getStatus());
178178
Firebird::IStatement* statement = (Firebird::IStatement *)statement_ptr;
179179
Firebird::IMessageMetadata* meta = NULL;
180-
ISC_STATUS res;
181180

182181
try {
183182
meta = statement->getOutputMetadata(&status);
@@ -192,7 +191,7 @@ extern "C" int fbu_insert_aliases(void *master_ptr, ISC_STATUS* st, ibase_query
192191

193192
meta->release();
194193
}
195-
catch (const Firebird::FbException& error)
194+
catch (Firebird::FbException&)
196195
{
197196
if (status.hasData()) {
198197
fbu_copy_status((const ISC_STATUS*)status.getErrors(), st, 20);
@@ -205,14 +204,13 @@ extern "C" int fbu_insert_aliases(void *master_ptr, ISC_STATUS* st, ibase_query
205204
return 0;
206205
}
207206

208-
extern "C" int fbu_insert_field_info(void *master_ptr, ISC_STATUS* st, int is_outvar, int num,
207+
extern "C" ISC_STATUS fbu_insert_field_info(void *master_ptr, ISC_STATUS* st, int is_outvar, unsigned int num,
209208
zval *into_array, void *statement_ptr)
210209
{
211210
Firebird::IMaster* master = (Firebird::IMaster*)master_ptr;
212211
Firebird::ThrowStatusWrapper status(master->getStatus());
213212
Firebird::IStatement* statement = (Firebird::IStatement *)statement_ptr;
214213
Firebird::IMessageMetadata* meta = NULL;
215-
ISC_STATUS res;
216214

217215
try {
218216
if(is_outvar) {
@@ -232,7 +230,7 @@ extern "C" int fbu_insert_field_info(void *master_ptr, ISC_STATUS* st, int is_ou
232230

233231
meta->release();
234232
}
235-
catch (const Firebird::FbException& error)
233+
catch (Firebird::FbException&)
236234
{
237235
if (status.hasData()) {
238236
fbu_copy_status((const ISC_STATUS*)status.getErrors(), st, 20);
@@ -283,7 +281,8 @@ extern "C" int fbu_string_to_numeric(const char *s, size_t slen, int scale, uint
283281
const char* p = s;
284282
const char *end = s + slen;
285283

286-
*sign = *exp = *res = 0;
284+
*sign = *exp = 0;
285+
*res = 0;
287286

288287
if (!slen) return STRNUM_PARSE_OK;
289288

‎firebird_utils.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ void fbu_decode_timestamp_tz(void *master_ptr, const ISC_TIMESTAMP_TZ* timestamp
5151
unsigned* year, unsigned* month, unsigned* day,
5252
unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions,
5353
unsigned timeZoneBufferLength, char* timeZoneBuffer);
54-
int fbu_insert_field_info(void *master_ptr, ISC_STATUS* st, int is_outvar, int num, zval *into_array, void *statement_ptr);
55-
int fbu_insert_aliases(void *master_ptr, ISC_STATUS* st, ibase_query *ib_query, void *statement_ptr);
54+
ISC_STATUS fbu_insert_field_info(void *master_ptr, ISC_STATUS* st, int is_outvar, unsigned int num, zval *into_array, void *statement_ptr);
55+
ISC_STATUS fbu_insert_aliases(void *master_ptr, ISC_STATUS* st, ibase_query *ib_query, void *statement_ptr);
5656
void fbu_release_statement(void *statement_ptr);
5757
#endif // FB_API_VER >= 4
5858

‎ibase_query.c‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -529,24 +529,24 @@ parse_datetime: {
529529

530530
switch (sqltype) {
531531
case SQL_TYPE_TIME:
532-
buf->val.tmval = fbu_encode_time(IBG(master_instance), obj->time->h, obj->time->i, obj->time->s, obj->time->us);
532+
buf->val.tmval = fbu_encode_time(IBG(master_instance), (unsigned)obj->time->h, (unsigned)obj->time->i, (unsigned)obj->time->s, (unsigned)obj->time->us);
533533
break;
534534
case SQL_TYPE_DATE:
535-
buf->val.dtval = fbu_encode_date(IBG(master_instance), obj->time->y, obj->time->m, obj->time->d);
535+
buf->val.dtval = fbu_encode_date(IBG(master_instance), (unsigned)obj->time->y, (unsigned)obj->time->m, (unsigned)obj->time->d);
536536
break;
537537
case SQL_TIMESTAMP:
538538
ISC_TIMESTAMP *ts = &buf->val.tsval;
539-
ts->timestamp_date = fbu_encode_date(IBG(master_instance), obj->time->y, obj->time->m, obj->time->d);
540-
ts->timestamp_time = fbu_encode_time(IBG(master_instance), obj->time->h, obj->time->i, obj->time->s, obj->time->us);
539+
ts->timestamp_date = fbu_encode_date(IBG(master_instance), (unsigned)obj->time->y, (unsigned)obj->time->m, (unsigned)obj->time->d);
540+
ts->timestamp_time = fbu_encode_time(IBG(master_instance), (unsigned)obj->time->h, (unsigned)obj->time->i, (unsigned)obj->time->s, (unsigned)obj->time->us);
541541
break;
542542
#if FB_API_VER >= 40
543543
case SQL_TIME_TZ:
544-
fbu_encode_time_tz(IBG(master_instance), &buf->val.tmval_tz, obj->time->h, obj->time->i, obj->time->s, obj->time->us, obj->time->tz_info->name);
544+
fbu_encode_time_tz(IBG(master_instance), &buf->val.tmval_tz, (unsigned)obj->time->h, (unsigned)obj->time->i, (unsigned)obj->time->s, (unsigned)obj->time->us, obj->time->tz_info->name);
545545
break;
546546
case SQL_TIMESTAMP_TZ:
547547
fbu_encode_timestamp_tz(IBG(master_instance), &buf->val.tsval_tz,
548-
obj->time->y, obj->time->m, obj->time->d,
549-
obj->time->h, obj->time->i, obj->time->s, obj->time->us,
548+
(unsigned)obj->time->y, (unsigned)obj->time->m, (unsigned)obj->time->d,
549+
(unsigned)obj->time->h, (unsigned)obj->time->i, (unsigned)obj->time->s, (unsigned)obj->time->us,
550550
obj->time->tz_info->name
551551
);
552552
break;
@@ -1553,7 +1553,7 @@ PHP_FUNCTION(ibase_num_fields)
15531553
}
15541554
/* }}} */
15551555

1556-
static void _php_ibase_field_info(zval *return_value, ibase_query *ib_query, int is_outvar, int num) /* {{{ */
1556+
static void _php_ibase_field_info(zval *return_value, ibase_query *ib_query, int is_outvar, zend_long num) /* {{{ */
15571557
{
15581558
unsigned short len;
15591559
char buf[16], *s = buf;
@@ -1595,7 +1595,7 @@ static void _php_ibase_field_info(zval *return_value, ibase_query *ib_query, int
15951595
RETURN_FALSE;
15961596
}
15971597

1598-
if(fbu_insert_field_info(IBG(master_instance), IB_STATUS, is_outvar, num, return_value, statement)){
1598+
if(fbu_insert_field_info(IBG(master_instance), IB_STATUS, is_outvar, (unsigned int)num, return_value, statement)){
15991599
fbu_release_statement(statement);
16001600
_php_ibase_error();
16011601
RETURN_FALSE;
@@ -1732,7 +1732,7 @@ PHP_FUNCTION(ibase_field_info)
17321732
return;
17331733
}
17341734

1735-
_php_ibase_field_info(return_value, ib_query, 1, (ISC_SHORT)field_arg);
1735+
_php_ibase_field_info(return_value, ib_query, 1, field_arg);
17361736
}
17371737
/* }}} */
17381738

@@ -1808,7 +1808,7 @@ static int _php_ibase_set_query_info(ibase_query *ib_query)
18081808
// Assume buf will be tagged with `isc_info_truncated` and later in parsing
18091809
// we will catch that. Until `isc_info_truncated` is reached assume pos +=
18101810
// 2, etc are safe.
1811-
if (isc_dsql_sql_info(IB_STATUS, &ib_query->stmt, sizeof(info_req), (ISC_SCHAR *)info_req, buf_size, (ISC_SCHAR *)buf)) {
1811+
if (isc_dsql_sql_info(IB_STATUS, &ib_query->stmt, sizeof(info_req), (ISC_SCHAR *)info_req, (short)buf_size, (ISC_SCHAR *)buf)) {
18121812
_php_ibase_error();
18131813
goto _php_ibase_parse_info_fail;
18141814
}

‎interbase.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1044,7 +1044,7 @@ int _php_ibase_attach_db(char **args, size_t *len, zend_long *largs, isc_db_hand
10441044
}
10451045
/* }}} */
10461046

1047-
static void _php_ibase_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) /* {{{ */
1047+
static void _php_ibase_connect(INTERNAL_FUNCTION_PARAMETERS, zend_long persistent) /* {{{ */
10481048
{
10491049
char *c, hash[16], *args[] = { NULL, NULL, NULL, NULL, NULL };
10501050
int i;

0 commit comments

Comments
 (0)