From 07f4bed38216d5e556f3a6dc775c73964d084a6f Mon Sep 17 00:00:00 2001 From: robocop Date: Tue, 2 May 2006 00:04:12 +0000 Subject: [PATCH] I don't want another "interprete", so I rename "defered" to "deferred". --- src/dsql/utld.cpp | 2 ++ src/dudley/ddl.h | 2 +- src/gpre/gpre.h | 2 +- src/gpre/sqe.cpp | 12 ++++++------ src/remote/interface.cpp | 32 ++++++++++++++++---------------- src/remote/protocol.h | 2 +- src/remote/remote.h | 6 +++--- src/remote/server.cpp | 2 +- 8 files changed, 31 insertions(+), 29 deletions(-) diff --git a/src/dsql/utld.cpp b/src/dsql/utld.cpp index ec0096f759..14c7298da7 100644 --- a/src/dsql/utld.cpp +++ b/src/dsql/utld.cpp @@ -86,7 +86,9 @@ SCHAR* UTLD_skip_sql_info(SCHAR* info) { if (*info != isc_info_sql_select && *info != isc_info_sql_bind) + { return 0; + } info++; diff --git a/src/dudley/ddl.h b/src/dudley/ddl.h index 23efb38a59..c3efff2bc9 100644 --- a/src/dudley/ddl.h +++ b/src/dudley/ddl.h @@ -330,7 +330,7 @@ enum nod_t { nod_label, nod_leave, nod_loop, nod_max, nod_min, nod_count, nod_total, nod_average, nod_list, - nod_defered, nod_between, nod_missing, + nod_deferred, nod_between, nod_missing, nod_field_name, nod_name, nod_starts, nod_from, nod_fid, nod_concatenate, nod_abort, nod_null, nod_user_name, diff --git a/src/gpre/gpre.h b/src/gpre/gpre.h index e2fc3faed8..3e5c17aa34 100644 --- a/src/gpre/gpre.h +++ b/src/gpre/gpre.h @@ -228,7 +228,7 @@ typedef enum nod_t { nod_label, nod_leave, nod_loop, nod_max, nod_min, nod_count, nod_total, nod_average, nod_list, - nod_defered, nod_missing, nod_between, + nod_deferred, nod_missing, nod_between, nod_union, nod_map, nod_starting, nod_like, nod_agg_count, nod_agg_max, nod_agg_min, nod_agg_total, nod_agg_average, diff --git a/src/gpre/sqe.cpp b/src/gpre/sqe.cpp index dfe42dff19..d45e7b99af 100644 --- a/src/gpre/sqe.cpp +++ b/src/gpre/sqe.cpp @@ -362,7 +362,7 @@ GPRE_NOD SQE_field(gpre_req* request, } -// Note: We *always* want to make a defered name block - to handle +// Note: We *always* want to make a deferred name block - to handle // scoping of alias names in subselects properly, when we haven't // seen the list of relations (& aliases for them). This occurs // during the select list, but by the time we see the having, group, @@ -374,10 +374,10 @@ GPRE_NOD SQE_field(gpre_req* request, // 1994-October-03 David Schnepper // -// if the request is null, make a defered name block +// if the request is null, make a deferred name block if (!request || !request->req_contexts || request->req_in_select_list) { - node = MSC_node(nod_defered, 3); + node = MSC_node(nod_deferred, 3); node->nod_count = 0; TOK f_token = (TOK) MSC_alloc(TOK_LEN); node->nod_arg[0] = (GPRE_NOD) f_token; @@ -814,7 +814,7 @@ void SQE_post_field( GPRE_NOD input, gpre_fld* field) case nod_field: case nod_literal: - case nod_defered: + case nod_deferred: case nod_array: return; @@ -976,7 +976,7 @@ bool SQE_resolve(GPRE_NOD node, return result; // ** End date/time/timestamp support * - case nod_defered: + case nod_deferred: break; default: @@ -1034,7 +1034,7 @@ bool SQE_resolve(GPRE_NOD node, reference->ref_slice = (slc*) slice_action; // donot reinit if this is a nod_deffered type - if (node->nod_type != nod_defered) + if (node->nod_type != nod_deferred) node->nod_count = 0; diff --git a/src/remote/interface.cpp b/src/remote/interface.cpp index bee70493dc..b2710f307e 100644 --- a/src/remote/interface.cpp +++ b/src/remote/interface.cpp @@ -209,7 +209,7 @@ inline bool defer_packet(rem_port* port, const PACKET* packet, ISC_STATUS* statu rem_que_packet p; p.packet = *packet; p.sent = false; - port->port_defered_packets->add(p); + port->port_deferred_packets->add(p); return clear_queue(port, status); } @@ -5340,10 +5340,10 @@ static void disconnect( rem_port* port) if (rdb) { PACKET* packet = &rdb->rdb_packet; - // Deliver the pending defered packets + // Deliver the pending deferred packets - for (rem_que_packet* p = port->port_defered_packets->begin(); - p < port->port_defered_packets->end(); p++) + for (rem_que_packet* p = port->port_deferred_packets->begin(); + p < port->port_deferred_packets->end(); p++) { if (!p->sent) { port->send(&p->packet); @@ -5370,7 +5370,7 @@ static void disconnect( rem_port* port) // Cleanup the queue - delete port->port_defered_packets; + delete port->port_deferred_packets; // Clear context reference for the associated event handler // to avoid SEGV during shutdown @@ -5847,7 +5847,7 @@ static bool init(ISC_STATUS* user_status, PACKET* packet = &rdb->rdb_packet; MemoryPool& pool = *getDefaultMemoryPool(); - port->port_defered_packets = FB_NEW(pool) PacketQueue(pool); + port->port_deferred_packets = FB_NEW(pool) PacketQueue(pool); /* Make attach packet */ @@ -6208,16 +6208,16 @@ static bool receive_packet_noqueue(rem_port* port, user_status[1] = isc_net_read_err; user_status[2] = isc_arg_end; - // Receive responses for all defered packets that were already sent + // Receive responses for all deferred packets that were already sent - while (port->port_defered_packets->getCount()) + while (port->port_deferred_packets->getCount()) { - rem_que_packet* p = port->port_defered_packets->begin(); + rem_que_packet* p = port->port_deferred_packets->begin(); if (!p->sent) break; if (!port->receive(packet)) return FALSE; - port->port_defered_packets->remove(p); + port->port_deferred_packets->remove(p); } return (port->receive(packet)); @@ -6930,10 +6930,10 @@ static bool send_packet(rem_port* port, user_status[1] = isc_net_write_err; user_status[2] = isc_arg_end; - // Send packets that were defered + // Send packets that were deferred - for (rem_que_packet* p = port->port_defered_packets->begin(); - p < port->port_defered_packets->end(); p++) + for (rem_que_packet* p = port->port_deferred_packets->begin(); + p < port->port_deferred_packets->end(); p++) { if (!p->sent) { if (!port->send_partial(&p->packet)) @@ -6974,10 +6974,10 @@ static bool send_partial_packet(rem_port* port, user_status[1] = isc_net_write_err; user_status[2] = isc_arg_end; - // Send packets that were defered + // Send packets that were deferred - for (rem_que_packet* p = port->port_defered_packets->begin(); - p < port->port_defered_packets->end(); p++) + for (rem_que_packet* p = port->port_deferred_packets->begin(); + p < port->port_deferred_packets->end(); p++) { if (!p->sent) { if (!port->send_partial(&p->packet)) diff --git a/src/remote/protocol.h b/src/remote/protocol.h index dab4c1f28c..d6c34a139c 100644 --- a/src/remote/protocol.h +++ b/src/remote/protocol.h @@ -142,7 +142,7 @@ const USHORT ptype_page = 1; /* Page server protocol */ const USHORT ptype_rpc = 2; /* Simple remote procedure call */ const USHORT ptype_batch_send = 3; /* Batch sends, no asynchrony */ const USHORT ptype_out_of_band = 4; /* Batch sends w/ out of band notification */ -const USHORT ptype_lazy_send = 5; /* Defered packets delivery */ +const USHORT ptype_lazy_send = 5; /* Deferred packets delivery */ /* Generic object id */ diff --git a/src/remote/remote.h b/src/remote/remote.h index ba4b5c2d8c..c481a12f39 100644 --- a/src/remote/remote.h +++ b/src/remote/remote.h @@ -354,7 +354,7 @@ typedef int HANDLE; struct p_cnct; struct rmtque; -/* Queue of defered packets */ +/* Queue of deferred packets */ struct rem_que_packet { @@ -435,7 +435,7 @@ struct rem_port USHORT port_iosb[4]; #endif void* port_xcc; /* interprocess structure */ - PacketQueue* port_defered_packets; /* queue of defered packets */ + PacketQueue* port_deferred_packets; /* queue of deferred packets */ OBJCT port_last_object_id; /* cached last id */ #ifdef SUPERSERVER Firebird::ObjectsArray< Firebird::Array< char > >* port_queue; @@ -514,7 +514,7 @@ const USHORT PORT_not_trusted = 256; /* Connection is from an untrusted node */ //const USHORT PORT_impersonate = 512; // A remote user is being impersonated const USHORT PORT_dummy_pckt_set= 1024; /* A dummy packet interval is set */ const USHORT PORT_partial_data = 2048; /* Physical packet doesn't contain all API packet */ -const USHORT PORT_lazy = 4096; /* Defered operations are allowed */ +const USHORT PORT_lazy = 4096; /* Deferred operations are allowed */ /* Misc declarations */ diff --git a/src/remote/server.cpp b/src/remote/server.cpp index a038689adb..a4b57f4b75 100644 --- a/src/remote/server.cpp +++ b/src/remote/server.cpp @@ -2743,7 +2743,7 @@ ISC_STATUS rem_port::info(P_OP op, P_INFO * stuff, PACKET* sendL) } *info_buffer = isc_info_length; - memmove(info_buffer + 1, info_string->cstr_address, info_len-1); + memmove(info_buffer + 1, info_string->cstr_address, info_len - 1); } USHORT info_db_len = 0;