firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 19:23:03 +01:00
Code Issues

style

Browse Source
This commit is contained in:
stryqx 2003-10-07 10:43:20 +00:00
parent 6c10576cee
commit 674fa73b6a
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/extlib/fbudf/fbudf.cpp
View File

@ -537,7 +537,7 @@ FBUDF_API ISC_TIMESTAMP* getExactTimestamp(ISC_TIMESTAMP* rc)
(void)gettimeofday(&tv); (void)gettimeofday(&tv);
#endif #endif
tm times = *localtime(reinterpret_cast<const time_t *>(&tv.tv_sec)); tm times = *localtime(reinterpret_cast<const time_t*>(&tv.tv_sec));
#ifdef HAVE_PTHREAD_H #ifdef HAVE_PTHREAD_H
pthread_mutex_unlock(&loctimelock); // ctime critical section end pthread_mutex_unlock(&loctimelock); // ctime critical section end

28
src/jrd/jrd.cpp
View File

@ -762,7 +762,7 @@ ISC_STATUS GDS_ATTACH_DATABASE(ISC_STATUS* user_status,
attachment->att_charset = options.dpb_interp; attachment->att_charset = options.dpb_interp;
SLONG clock = time(NULL); SLONG clock = time(NULL);
struct tm times = *localtime(reinterpret_cast<const time_t *>(&clock)); struct tm times = *localtime(reinterpret_cast<const time_t*>(&clock));
isc_encode_timestamp(&times, &attachment->att_timestamp); isc_encode_timestamp(&times, &attachment->att_timestamp);
if (options.dpb_lc_messages) { if (options.dpb_lc_messages) {
@ -1001,7 +1001,7 @@ ISC_STATUS GDS_ATTACH_DATABASE(ISC_STATUS* user_status,
{ {
strcpy(local_role_name, options.dpb_role_name); strcpy(local_role_name, options.dpb_role_name);
len = strlen(local_role_name); len = strlen(local_role_name);
p1 = reinterpret_cast < UCHAR * >(options.dpb_role_name); p1 = reinterpret_cast<UCHAR*>(options.dpb_role_name);
for (cnt = 0; cnt < len; cnt++) for (cnt = 0; cnt < len; cnt++)
{ {
*p1++ = UPPER7(local_role_name[cnt]); *p1++ = UPPER7(local_role_name[cnt]);
@ -1701,7 +1701,7 @@ ISC_STATUS GDS_COMPILE(ISC_STATUS * user_status,
{ {
tdbb->tdbb_status_vector = user_status; tdbb->tdbb_status_vector = user_status;
request = CMP_compile2(tdbb, reinterpret_cast < UCHAR * >(blr), FALSE); request = CMP_compile2(tdbb, reinterpret_cast<UCHAR*>(blr), FALSE);
request->req_attachment = attachment; request->req_attachment = attachment;
request->req_request = attachment->att_requests; request->req_request = attachment->att_requests;
attachment->att_requests = request; attachment->att_requests = request;
@ -1930,7 +1930,7 @@ ISC_STATUS GDS_CREATE_DATABASE(ISC_STATUS* user_status,
attachment->att_charset = options.dpb_interp; attachment->att_charset = options.dpb_interp;
SLONG clock = time(NULL); SLONG clock = time(NULL);
struct tm times = *localtime(reinterpret_cast<const time_t *>(&clock)); struct tm times = *localtime(reinterpret_cast<const time_t*>(&clock));
isc_encode_timestamp(&times, &attachment->att_timestamp); isc_encode_timestamp(&times, &attachment->att_timestamp);
if (options.dpb_lc_messages) if (options.dpb_lc_messages)
@ -2710,10 +2710,10 @@ ISC_STATUS GDS_GET_SLICE(ISC_STATUS * user_status,
else else
*return_length = BLB_get_slice(tdbb, *return_length = BLB_get_slice(tdbb,
transaction, transaction,
reinterpret_cast < BID > (array_id), reinterpret_cast<BID>(array_id),
sdl, sdl,
param_length, param_length,
reinterpret_cast < long *>(param), reinterpret_cast<long*>(param),
slice_length, slice); slice_length, slice);
} }
catch (const std::exception&) catch (const std::exception&)
@ -2908,10 +2908,10 @@ ISC_STATUS GDS_PUT_SLICE(ISC_STATUS * user_status,
transaction = find_transaction(tdbb, *tra_handle, gds_segstr_wrong_db); transaction = find_transaction(tdbb, *tra_handle, gds_segstr_wrong_db);
BLB_put_slice(tdbb, BLB_put_slice(tdbb,
transaction, transaction,
reinterpret_cast < BID > (array_id), reinterpret_cast<BID>(array_id),
sdl, sdl,
param_length, param_length,
reinterpret_cast < long *>(param), slice_length, slice); reinterpret_cast<long*>(param), slice_length, slice);
} }
catch (const std::exception&) catch (const std::exception&)
{ {
@ -3041,7 +3041,7 @@ ISC_STATUS GDS_RECEIVE(ISC_STATUS * user_status,
#endif #endif
EXE_receive(tdbb, request, msg_type, msg_length, EXE_receive(tdbb, request, msg_type, msg_length,
reinterpret_cast < UCHAR * >(msg)); reinterpret_cast<UCHAR*>(msg));
check_autocommit(request, tdbb); check_autocommit(request, tdbb);
@ -3380,7 +3380,7 @@ ISC_STATUS GDS_SEND(ISC_STATUS * user_status,
ERR_post(gds_req_sync, 0); ERR_post(gds_req_sync, 0);
EXE_send(tdbb, request, msg_type, msg_length, EXE_send(tdbb, request, msg_type, msg_length,
reinterpret_cast < UCHAR * >(msg)); reinterpret_cast<UCHAR*>(msg));
check_autocommit(request, tdbb); check_autocommit(request, tdbb);
@ -3664,7 +3664,7 @@ ISC_STATUS GDS_START_AND_SEND(ISC_STATUS * user_status,
EXE_unwind(tdbb, request); EXE_unwind(tdbb, request);
EXE_start(tdbb, request, transaction); EXE_start(tdbb, request, transaction);
EXE_send(tdbb, request, msg_type, msg_length, EXE_send(tdbb, request, msg_type, msg_length,
reinterpret_cast < UCHAR * >(msg)); reinterpret_cast<UCHAR*>(msg));
check_autocommit(request, tdbb); check_autocommit(request, tdbb);
@ -5357,7 +5357,7 @@ static void get_options(UCHAR* dpb,
case isc_dpb_reserved: case isc_dpb_reserved:
single = single =
reinterpret_cast<UCHAR*>(get_string_parameter(&p, scratch, &buf_size)); reinterpret_cast<UCHAR*>(get_string_parameter(&p, scratch, &buf_size));
if (single && !strcmp(reinterpret_cast < char *>(single), "YES")) if (single && !strcmp(reinterpret_cast<char*>(single), "YES"))
options->dpb_single_user = TRUE; options->dpb_single_user = TRUE;
break; break;
@ -6666,9 +6666,9 @@ static bool verify_database_name(TEXT *name, ISC_STATUS *status)
status[0] = gds_arg_gds; status[0] = gds_arg_gds;
status[1] = gds_conf_access_denied; status[1] = gds_conf_access_denied;
status[2] = gds_arg_string; status[2] = gds_arg_string;
status[3] = reinterpret_cast <ISC_STATUS> ("database"); status[3] = reinterpret_cast<ISC_STATUS>("database");
status[4] = gds_arg_string; status[4] = gds_arg_string;
status[5] = reinterpret_cast <ISC_STATUS> (ERR_cstring(name)); status[5] = reinterpret_cast<ISC_STATUS>(ERR_cstring(name));
status[6] = gds_arg_end; status[6] = gds_arg_end;
return false; return false;
} }