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

Misc

Browse Source
This commit is contained in:
asfernandes 2008-12-27 18:15:50 +00:00
parent d26488a99a
commit dff4d4fa99
14 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builds/install/arch-specific/hpux/classic/postUninstall.sh.in
View File

@ -31,8 +31,6 @@
# Contributor(s):
#
#
# $Id: postUninstall.sh.in,v 1.4 2008-12-26 14:39:02 alexpeshkoff Exp $
#
# The post uninstall routine for Firebird Classic.

2
builds/install/arch-specific/hpux/classic/preUninstall.sh.in
View File

@ -31,8 +31,6 @@
# Contributor(s):
#
#
# $Id: preUninstall.sh.in,v 1.3 2008-12-26 14:39:02 alexpeshkoff Exp $
#
# The pre uninstall routines for Firebird Classic

2
builds/install/arch-specific/hpux/classic/tarInstall.sh.in
View File

@ -31,8 +31,6 @@
# Contributor(s):
#
#
# $Id: tarInstall.sh.in,v 1.3 2008-12-26 14:39:02 alexpeshkoff Exp $
#
# The way this works is that the buildroot file is stored relative to the root
# directory and a tar -xvf at root directory will restore all the files in

2
builds/install/arch-specific/hpux/classic/tarUninstall.sh.in
View File

@ -31,8 +31,6 @@
# Contributor(s):
#
#
# $Id: tarUninstall.sh.in,v 1.3 2008-12-26 14:39:02 alexpeshkoff Exp $
#
cd $FBRootDir
cd ..

2
builds/install/arch-specific/hpux/misc/changegdslibrarycompatibleLink.sh.in
View File

@ -31,8 +31,6 @@
# Contributor(s):
#
#
# $Id: changegdslibrarycompatibleLink.sh.in,v 1.3 2008-12-26 14:39:03 alexpeshkoff Exp $
#
# This script allows the user to change the link on classic for the

14
src/gpre/c_cxx.cpp
View File

@ -1094,8 +1094,11 @@ static void gen_blr(void* user_arg, SSHORT offset, const char* string)
for (const char* p1 = p; p1 < q;)
{
if ((*q1++ = *p1++) == 'g')
{
if (p1 < q && (*q1++ = *p1++) == 'd')
{
if (p1 < q && (*q1++ = *p1++) == 's')
{
if (p1 < q && (*q1++ = *p1++) == '_')
{
char d;
@ -1104,6 +1107,9 @@ static void gen_blr(void* user_arg, SSHORT offset, const char* string)
else
*q1++ = d;
}
}
}
}
}
*q1 = 0;
printa(indent, line);
@ -2854,11 +2860,9 @@ static void gen_request(const gpre_req* request)
printa(0, "static %schar\n isc_%d [] = {", CONST_STR, reference->ref_sdl_ident);
if (gpreGlob.sw_raw)
gen_raw(reference->ref_sdl, reference->ref_sdl_length);
else
if (PRETTY_print_sdl(reference->ref_sdl, gen_blr, 0, 0))
{
CPR_error("internal error during SDL generation");
}
else if (PRETTY_print_sdl(reference->ref_sdl, gen_blr, 0, 0))
CPR_error("internal error during SDL generation");
printa(INDENT, "};\t/* end of sdl string for request isc_%d */\n",
reference->ref_sdl_ident);
}

2
src/gpre/cmp.cpp
View File

@ -703,8 +703,10 @@ static void cmp_fetch( act* action)
{
ref* var = (ref*) *ptr;
if (var->ref_null_value && !var->ref_null)
{
if (var->ref_friend)
var->ref_null = var->ref_friend->ref_null;
}
}
}

7
src/gpre/cob.cpp
View File

@ -2708,8 +2708,10 @@ static TEXT* gen_name(TEXT* const string, const ref* reference, bool as_blob)
{
if (reference->ref_field->fld_array_info && !as_blob)
{
fb_utils::snprintf(string, MAX_REF_SIZE, "%s%d", names[isc_a_pos],
reference->ref_field->fld_array_info->ary_ident);
}
else
fb_utils::snprintf(string, MAX_REF_SIZE, "%s%d", names[isc_b_pos], reference->ref_ident);
@ -4143,11 +4145,12 @@ static void t_start_auto(const gpre_req* request,
}
fb_assert(strlen(buffer) < sizeof(buffer));
if (test)
{
if (buffer[0])
printa(names[COLUMN], false, "IF (%s) AND %s = 0 THEN", buffer, trname);
else
printa(names[COLUMN], false, "IF %s = 0 THEN", trname);
}
else if (buffer[0])
printa(names[COLUMN], false, "IF (%s) THEN", buffer);
}
@ -4161,8 +4164,10 @@ static void t_start_auto(const gpre_req* request,
BY_VALUE, count, END_VALUE);
for (db = gpreGlob.isc_databases; db; db = db->dbb_next)
{
printa(names[CONTINUE], true, ", %s%s, %s, %s",
BY_REF, db->dbb_name->sym_string, OMITTED, OMITTED);
}
if (gpreGlob.sw_auto && (test || buffer[0]))
printa(names[COLUMN], false, "END-IF");

2
src/gpre/gpre_meta.epp
View File

@ -1223,8 +1223,10 @@ gpre_rel* MET_get_relation(dbb* database, const TEXT* string, const TEXT* owner_
intlsym* MET_get_text_subtype(SSHORT ttype)
{
for (intlsym* p = gpreGlob.text_subtypes; p; p = p->intlsym_next)
{
if (p->intlsym_ttype == ttype)
return p;
}
return NULL;
}

2
src/gpre/gpre_meta_boot.cpp
View File

@ -516,8 +516,10 @@ gpre_rel* MET_get_relation(DBB db, const TEXT* string, const TEXT* owner_name)
intlsym* MET_get_text_subtype(SSHORT ttype)
{
for (intlsym* p = gpreGlob.text_subtypes; p; p = p->intlsym_next)
{
if (p->intlsym_ttype == ttype)
return p;
}
return NULL;
}

2
src/gpre/msc_proto.h
View File

@ -42,7 +42,7 @@ gpre_nod* MSC_node(nod_t, SSHORT);
gpre_nod* MSC_pop(gpre_lls**);
PRV MSC_privilege_block();
void MSC_push(gpre_nod*, gpre_lls**);
ref* MSC_reference(ref**);
ref* MSC_reference(ref**);
gpre_req* MSC_request(req_t);
SCHAR* MSC_string(const TEXT*);
gpre_sym* MSC_symbol(sym_t, const TEXT*, USHORT, gpre_ctx*);

4
src/gpre/rmc.cpp
View File

@ -1939,8 +1939,8 @@ static void gen_database( const act* action)
for (ref* reference = port->por_references; reference;
reference = reference->ref_next)
{
if (reference->ref_field->fld_array_info)
make_array_declaration(reference);
if (reference->ref_field->fld_array_info)
make_array_declaration(reference);
}
}

3
src/gpre/sqe.cpp
View File

@ -504,8 +504,7 @@ gpre_nod* SQE_field(gpre_req* request,
if (context->ctx_request != request)
PAR_error("context not part of this request");
SQL_resolve_identifier("<Column Name>", NULL, NAME_SIZE);
if (!
(reference->ref_field =
if (!(reference->ref_field =
MET_context_field(context, gpreGlob.token_global.tok_string)))
{
sprintf(s, "column \"%s\" not in context", gpreGlob.token_global.tok_string);

4
src/gpre/sql.cpp
View File

@ -2854,7 +2854,7 @@ static act* act_drop()
SLONG num = EXP_USHORT_ordinal(true);
if (!range_positive_short_integer(num))
PAR_error("Shadow number out of range");
action->act_object = (ref*)(IPTR)num;
action->act_object = (ref*)(IPTR) num;
}
return action;
@ -5136,7 +5136,6 @@ static gpre_rel* make_relation( gpre_req* request, const TEXT * relation_name)
static void pair( gpre_nod* expr, gpre_nod* field_expr)
{
if (field_expr->nod_type != nod_field)
return;
@ -6368,4 +6367,3 @@ void SQL_dialect1_bad_type(USHORT field_dtype)
s);
PAR_error(buffer);
}