Skip to content

Commit 2946f6a

Browse files
mlazdansmlazdans
committed
Change prefix so that it does not collide with firebird prefix
1 parent d0899f4 commit 2946f6a

4 files changed

Lines changed: 26 additions & 25 deletions

File tree

‎firebird_utils.cpp‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
| license@php.net so we can mail you a copy immediately. |
1212
+----------------------------------------------------------------------+
1313
| Author: Simonov Denis <sim-mail@list.ru> |
14+
| Author: Martins Lazdans <marrtins@dqdp.net> |
1415
+----------------------------------------------------------------------+
1516
*/
1617

@@ -25,28 +26,28 @@
2526
#include "php_ibase_includes.h"
2627

2728
/* Returns the client version. 0 bytes are minor version, 1 bytes are major version. */
28-
extern "C" unsigned fb_get_client_version(void *master_ptr)
29+
extern "C" unsigned fbu_get_client_version(void *master_ptr)
2930
{
3031
Firebird::IMaster* master = (Firebird::IMaster*)master_ptr;
3132
Firebird::IUtil* util = master->getUtilInterface();
3233
return util->getClientVersion();
3334
}
3435

35-
extern "C" ISC_TIME fb_encode_time(void *master_ptr, unsigned hours, unsigned minutes, unsigned seconds, unsigned fractions)
36+
extern "C" ISC_TIME fbu_encode_time(void *master_ptr, unsigned hours, unsigned minutes, unsigned seconds, unsigned fractions)
3637
{
3738
Firebird::IMaster* master = (Firebird::IMaster*)master_ptr;
3839
Firebird::IUtil* util = master->getUtilInterface();
3940
return util->encodeTime(hours, minutes, seconds, fractions);
4041
}
4142

42-
extern "C" ISC_DATE fb_encode_date(void *master_ptr, unsigned year, unsigned month, unsigned day)
43+
extern "C" ISC_DATE fbu_encode_date(void *master_ptr, unsigned year, unsigned month, unsigned day)
4344
{
4445
Firebird::IMaster* master = (Firebird::IMaster*)master_ptr;
4546
Firebird::IUtil* util = master->getUtilInterface();
4647
return util->encodeDate(year, month, day);
4748
}
4849

49-
static void fb_copy_status(const ISC_STATUS* from, ISC_STATUS* to, size_t maxLength)
50+
static void fbu_copy_status(const ISC_STATUS* from, ISC_STATUS* to, size_t maxLength)
5051
{
5152
for(size_t i=0; i < maxLength; ++i) {
5253
memcpy(to + i, from + i, sizeof(ISC_STATUS));
@@ -57,7 +58,7 @@ static void fb_copy_status(const ISC_STATUS* from, ISC_STATUS* to, size_t maxLen
5758
}
5859

5960
/* Decodes a time with time zone into its time components. */
60-
extern "C" void fb_decode_time_tz(void *master_ptr, const ISC_TIME_TZ* timeTz, unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions,
61+
extern "C" void fbu_decode_time_tz(void *master_ptr, const ISC_TIME_TZ* timeTz, unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions,
6162
unsigned timeZoneBufferLength, char* timeZoneBuffer)
6263
{
6364
Firebird::IMaster* master = (Firebird::IMaster*)master_ptr;
@@ -69,7 +70,7 @@ extern "C" void fb_decode_time_tz(void *master_ptr, const ISC_TIME_TZ* timeTz, u
6970
}
7071

7172
/* Decodes a timestamp with time zone into its date and time components */
72-
extern "C" void fb_decode_timestamp_tz(void *master_ptr, const ISC_TIMESTAMP_TZ* timestampTz,
73+
extern "C" void fbu_decode_timestamp_tz(void *master_ptr, const ISC_TIMESTAMP_TZ* timestampTz,
7374
unsigned* year, unsigned* month, unsigned* day,
7475
unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions,
7576
unsigned timeZoneBufferLength, char* timeZoneBuffer)
@@ -83,7 +84,7 @@ extern "C" void fb_decode_timestamp_tz(void *master_ptr, const ISC_TIMESTAMP_TZ*
8384
timeZoneBufferLength, timeZoneBuffer);
8485
}
8586

86-
extern "C" int fb_insert_aliases(void *master_ptr, ISC_STATUS* st, ibase_query *ib_query, void *statement_ptr)
87+
extern "C" int fbu_insert_aliases(void *master_ptr, ISC_STATUS* st, ibase_query *ib_query, void *statement_ptr)
8788
{
8889
Firebird::IMaster* master = (Firebird::IMaster*)master_ptr;
8990
Firebird::ThrowStatusWrapper status(master->getStatus());
@@ -105,15 +106,15 @@ extern "C" int fb_insert_aliases(void *master_ptr, ISC_STATUS* st, ibase_query *
105106
catch (const Firebird::FbException& error)
106107
{
107108
if (status.hasData()) {
108-
fb_copy_status((const ISC_STATUS*)status.getErrors(), st, 20);
109+
fbu_copy_status((const ISC_STATUS*)status.getErrors(), st, 20);
109110
return st[1];
110111
}
111112
}
112113

113114
return 0;
114115
}
115116

116-
extern "C" int fb_insert_field_info(void *master_ptr, ISC_STATUS* st, int is_outvar, int num,
117+
extern "C" int fbu_insert_field_info(void *master_ptr, ISC_STATUS* st, int is_outvar, int num,
117118
zval *into_array, void *statement_ptr)
118119
{
119120
Firebird::IMaster* master = (Firebird::IMaster*)master_ptr;
@@ -141,7 +142,7 @@ extern "C" int fb_insert_field_info(void *master_ptr, ISC_STATUS* st, int is_out
141142
catch (const Firebird::FbException& error)
142143
{
143144
if (status.hasData()) {
144-
fb_copy_status((const ISC_STATUS*)status.getErrors(), st, 20);
145+
fbu_copy_status((const ISC_STATUS*)status.getErrors(), st, 20);
145146
return st[1];
146147
}
147148
}

‎firebird_utils.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,20 @@
2626
extern "C" {
2727
#endif
2828

29-
unsigned fb_get_client_version(void *master_ptr);
30-
ISC_TIME fb_encode_time(void *master_ptr, unsigned hours, unsigned minutes, unsigned seconds, unsigned fractions);
31-
ISC_DATE fb_encode_date(void *master_ptr, unsigned year, unsigned month, unsigned day);
29+
unsigned fbu_get_client_version(void *master_ptr);
30+
ISC_TIME fbu_encode_time(void *master_ptr, unsigned hours, unsigned minutes, unsigned seconds, unsigned fractions);
31+
ISC_DATE fbu_encode_date(void *master_ptr, unsigned year, unsigned month, unsigned day);
3232

33-
void fb_decode_time_tz(void *master_ptr, const ISC_TIME_TZ* timeTz, unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions,
33+
void fbu_decode_time_tz(void *master_ptr, const ISC_TIME_TZ* timeTz, unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions,
3434
unsigned timeZoneBufferLength, char* timeZoneBuffer);
3535

36-
void fb_decode_timestamp_tz(void *master_ptr, const ISC_TIMESTAMP_TZ* timestampTz,
36+
void fbu_decode_timestamp_tz(void *master_ptr, const ISC_TIMESTAMP_TZ* timestampTz,
3737
unsigned* year, unsigned* month, unsigned* day,
3838
unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions,
3939
unsigned timeZoneBufferLength, char* timeZoneBuffer);
4040

41-
int fb_insert_aliases(void *master_ptr, ISC_STATUS* st, ibase_query *ib_query, void *statement_ptr);
42-
int fb_insert_field_info(void *master_ptr, ISC_STATUS* st, int is_outvar, int num, zval *into_array, void *statement_ptr);
41+
int fbu_insert_aliases(void *master_ptr, ISC_STATUS* st, ibase_query *ib_query, void *statement_ptr);
42+
int fbu_insert_field_info(void *master_ptr, ISC_STATUS* st, int is_outvar, int num, zval *into_array, void *statement_ptr);
4343

4444
#ifdef __cplusplus
4545
}

‎ibase_query.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1330,15 +1330,15 @@ static int _php_ibase_var_zval(zval *val, void *data, int type, int len, /* {{{
13301330

13311331
if((type & ~1) == SQL_TIME_TZ){
13321332
format = INI_STR("ibase.timeformat");
1333-
fb_decode_time_tz(IBG(master_instance), (ISC_TIME_TZ *) data, &hours, &minutes, &seconds, &fractions, sizeof(timeZoneBuffer), timeZoneBuffer);
1334-
ISC_TIME time = fb_encode_time(IBG(master_instance), hours, minutes, seconds, fractions);
1333+
fbu_decode_time_tz(IBG(master_instance), (ISC_TIME_TZ *) data, &hours, &minutes, &seconds, &fractions, sizeof(timeZoneBuffer), timeZoneBuffer);
1334+
ISC_TIME time = fbu_encode_time(IBG(master_instance), hours, minutes, seconds, fractions);
13351335
isc_decode_sql_time(&time, &t);
13361336
} else {
13371337
format = INI_STR("ibase.timestampformat");
1338-
fb_decode_timestamp_tz(IBG(master_instance), (ISC_TIMESTAMP_TZ *) data, &year, &month, &day, &hours, &minutes, &seconds, &fractions, sizeof(timeZoneBuffer), timeZoneBuffer);
1338+
fbu_decode_timestamp_tz(IBG(master_instance), (ISC_TIMESTAMP_TZ *) data, &year, &month, &day, &hours, &minutes, &seconds, &fractions, sizeof(timeZoneBuffer), timeZoneBuffer);
13391339
ISC_TIMESTAMP ts;
1340-
ts.timestamp_date = fb_encode_date(IBG(master_instance), year, month, day);
1341-
ts.timestamp_time = fb_encode_time(IBG(master_instance), hours, minutes, seconds, fractions);
1340+
ts.timestamp_date = fbu_encode_date(IBG(master_instance), year, month, day);
1341+
ts.timestamp_time = fbu_encode_time(IBG(master_instance), hours, minutes, seconds, fractions);
13421342
isc_decode_timestamp(&ts, &t);
13431343
}
13441344

@@ -1868,7 +1868,7 @@ static void _php_ibase_field_info(zval *return_value, ibase_query *ib_query, int
18681868
RETURN_FALSE;
18691869
}
18701870

1871-
if(fb_insert_field_info(IBG(master_instance), IB_STATUS, is_outvar, num, return_value, statement)){
1871+
if(fbu_insert_field_info(IBG(master_instance), IB_STATUS, is_outvar, num, return_value, statement)){
18721872
_php_ibase_error();
18731873
RETURN_FALSE;
18741874
}
@@ -2168,7 +2168,7 @@ static int _php_ibase_alloc_ht_aliases(ibase_query *ib_query)
21682168
return FAILURE;
21692169
}
21702170

2171-
if(fb_insert_aliases(IBG(master_instance), IB_STATUS, ib_query, statement)){
2171+
if(fbu_insert_aliases(IBG(master_instance), IB_STATUS, ib_query, statement)){
21722172
return FAILURE;
21732173
}
21742174
} else {

‎interbase.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -841,7 +841,7 @@ static PHP_GINIT_FUNCTION(ibase)
841841

842842
if (ibase_globals->get_master_interface) {
843843
ibase_globals->master_instance = ((fb_get_master_interface_t)(ibase_globals->get_master_interface))();
844-
ibase_globals->client_version = fb_get_client_version(ibase_globals->master_instance);
844+
ibase_globals->client_version = fbu_get_client_version(ibase_globals->master_instance);
845845
ibase_globals->client_major_version = (ibase_globals->client_version >> 8) & 0xFF;
846846
ibase_globals->client_minor_version = ibase_globals->client_version & 0xFF;
847847
} else {

0 commit comments

Comments
 (0)