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

Fix build after Claudio cleanup

Browse Source
This commit is contained in:
skidder 2004-02-21 09:24:14 +00:00
parent 3abc84de54
commit 14bfcc7019
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jrd/met.epp
View File

@ -37,7 +37,7 @@
* 2004.01.16 Vlad Horsun: added support for default parameters * 2004.01.16 Vlad Horsun: added support for default parameters
*/ */
/* /*
$Id: met.epp,v 1.91 2004-02-20 06:43:00 robocop Exp $ $Id: met.epp,v 1.92 2004-02-21 09:23:03 skidder Exp $
*/ */
// This MUST be at the top of the file // This MUST be at the top of the file
#ifdef DARWIN #ifdef DARWIN
@ -2779,7 +2779,7 @@ jrd_prc* MET_procedure(TDBB tdbb, int id, bool noscan, USHORT flags)
// Now, check the result of this function here! Null pointer means failure. // Now, check the result of this function here! Null pointer means failure.
// Or should parse_procedure_blr and its callee throw exceptions instead? // Or should parse_procedure_blr and its callee throw exceptions instead?
if (!parse_procedure_blr(tdbb, procedure, &P.RDB$PROCEDURE_BLR, csb_)) if (!parse_procedure_blr(tdbb, procedure, &P.RDB$PROCEDURE_BLR, csb_))
throw std::exception("Error while parsing procedure's BLR."); ERR_post(isc_random, isc_arg_string, "Error while parsing procedure's BLR.", 0);
procedure->prc_request->req_procedure = procedure; procedure->prc_request->req_procedure = procedure;
for (i = 0; i < csb_->csb_rpt.getCount(); i++) for (i = 0; i < csb_->csb_rpt.getCount(); i++)
{ {

18
src/qli/exe.cpp
View File

@ -309,16 +309,16 @@ file* EXEC_open_output(qli_nod* node)
#else #else
TEXT* argv[20]; TEXT* argv[20];
TEXT** arg = argv; TEXT** arg = argv;
p = filename; TEXT* pp = filename;
while (*p) { while (*pp) {
*arg++ = p; *arg++ = pp;
while (*p && *p != ' ') while (*pp && *pp != ' ')
p++; pp++;
if (!*p) if (!*pp)
break; break;
*p++ = 0; *pp++ = 0;
while (*p == ' ') while (*pp == ' ')
p++; pp++;
} }
*arg = NULL; *arg = NULL;

3
src/qli/expand.cpp
View File

@ -2939,7 +2939,8 @@ static void resolve_really( qli_fld* variable, const syn* field_node)
if (field_node->syn_count == 1) if (field_node->syn_count == 1)
resolved = MET_declare(0, variable, fld_name); resolved = MET_declare(0, variable, fld_name);
else if (field_node->syn_count == 2) { else if (field_node->syn_count == 2) {
for (qli_symbol* symbol = rel_name->nam_symbol; symbol; qli_symbol *symbol;
for (symbol = rel_name->nam_symbol; symbol;
symbol = symbol->sym_homonym) symbol = symbol->sym_homonym)
{ {
if (symbol->sym_type == SYM_database) { if (symbol->sym_type == SYM_database) {