Email Archive: firebird-checkins (read-only)
|
[Firebird-checkins] CVS: firebird2/src/gpre int_cxx.cpp,1.9,1.10 int.cpp,1.11,1.12 ftn.cpp,1.18,1.19 cob.cpp,1.20,1.21 c_cxx.cpp,1.18,1.19 ada.cpp,1.14,1.15
From: Blas Rodriguez Somoza <brodsom@us...> - 2003-03-27 17:16
|
Build Version : T1.5.0.3039 Firebird 1.5 Beta 4
(writeBuildNum.sh,v 1.3032 2003/03/27 17:15:54 brodsom Exp )
Update of /cvsroot/firebird/firebird2/src/gpre
In directory sc8-pr-cvs1:/tmp/cvs-serv28134/gpre
Modified Files:
int_cxx.cpp int.cpp ftn.cpp cob.cpp c_cxx.cpp ada.cpp
Log Message:
Fix some wrong format strings/argument lists
Index: int_cxx.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/gpre/int_cxx.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -b -U3 -r1.9 -r1.10
--- int_cxx.cpp 3 Mar 2003 08:36:03 -0000 1.9
+++ int_cxx.cpp 27 Mar 2003 17:15:43 -0000 1.10
@@ -204,11 +204,11 @@
if (!field || field->fld_dtype == dtype_text)
ib_fprintf(out_file, VTO_CALL,
JRD_VTOF,
- value, variable, field->fld_length, sw_interp);
+ value, variable, field->fld_length);
else if (!field || field->fld_dtype == dtype_cstring)
ib_fprintf(out_file, VTO_CALL,
GDS_VTOV,
- value, variable, field->fld_length, sw_interp);
+ value, variable, field->fld_length);
else
ib_fprintf(out_file, "%s = %s;", variable, value);
}
@@ -513,7 +513,7 @@
ib_fprintf(out_file, "static const UCHAR\tjrd_%d [%d] =",
request->req_ident, request->req_length);
align(INDENT);
- ib_fprintf(out_file, "{\t/* blr string */\n", request->req_ident);
+ ib_fprintf(out_file, "{\t/* blr string */\n");
if (sw_raw)
gen_raw(request);
Index: int.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/gpre/int.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -b -U3 -r1.11 -r1.12
--- int.cpp 3 Mar 2003 08:36:03 -0000 1.11
+++ int.cpp 27 Mar 2003 17:15:44 -0000 1.12
@@ -201,11 +201,11 @@
if (!field || field->fld_dtype == dtype_text)
ib_fprintf(out_file, VTO_CALL,
JRD_VTOF,
- value, variable, field->fld_length, sw_interp);
+ value, variable, field->fld_length);
else if (!field || field->fld_dtype == dtype_cstring)
ib_fprintf(out_file, VTO_CALL,
GDS_VTOV,
- value, variable, field->fld_length, sw_interp);
+ value, variable, field->fld_length);
else
ib_fprintf(out_file, "%s = %s;", variable, value);
}
@@ -507,7 +507,7 @@
ib_fprintf(out_file, "static const UCHAR\tjrd_%d [%d] =",
request->req_ident, request->req_length);
align(INDENT);
- ib_fprintf(out_file, "{\t/* blr string */\n", request->req_ident);
+ ib_fprintf(out_file, "{\t/* blr string */\n");
if (sw_raw)
gen_raw(request);
Index: ftn.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/gpre/ftn.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -b -U3 -r1.18 -r1.19
--- ftn.cpp 2 Mar 2003 17:47:20 -0000 1.18
+++ ftn.cpp 27 Mar 2003 17:15:45 -0000 1.19
@@ -5080,8 +5080,7 @@
request = action->act_request;
- ib_fprintf(out_file, "static %s_r (request, transaction",
- request->req_handle, request->req_handle, request->req_trans);
+ ib_fprintf(out_file, "static %s_r (request, transaction", request->req_handle);
if (port = request->req_vport)
for (reference = port->por_references; reference;
@@ -5090,8 +5089,7 @@
gen_name(s, reference->ref_source, TRUE));
ib_fprintf(out_file,
- ")\n isc_req_handle\trequest;\n isc_tr_handle\ttransaction;\n",
- request->req_handle, request->req_trans);
+ ")\n isc_req_handle\trequest;\n isc_tr_handle\ttransaction;\n");
if (port)
for (reference = port->por_references; reference;
Index: cob.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/gpre/cob.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -b -U3 -r1.20 -r1.21
--- cob.cpp 2 Mar 2003 17:47:20 -0000 1.20
+++ cob.cpp 27 Mar 2003 17:15:46 -0000 1.21
@@ -3010,8 +3010,7 @@
request = action->act_request;
- ib_fprintf(out_file, "static %s_r (request, transaction",
- request->req_handle, request->req_handle, request->req_trans);
+ ib_fprintf(out_file, "static %s_r (request, transaction", request->req_handle);
if (port = request->req_vport)
for (reference = port->por_references; reference;
@@ -3020,8 +3019,7 @@
gen_name(s, reference->ref_source, TRUE));
ib_fprintf(out_file,
- ")\n isc_req_handle\trequest;\n isc_tr_handle\ttransaction;\n",
- request->req_handle, request->req_trans);
+ ")\n isc_req_handle\trequest;\n isc_tr_handle\ttransaction;\n");
if (port)
for (reference = port->por_references; reference;
@@ -4846,7 +4844,7 @@
for (dimension = field->fld_array_info->ary_dimension, i = 3;
dimension->dim_next; dimension = dimension->dim_next, i += 2) {
dimension_size = dimension->dim_upper - dimension->dim_lower + 1;
- printa(space, FALSE, "%02.d %s%d%s%d OCCURS %d TIMES.",
+ printa(space, FALSE, "%02d %s%d%s%d OCCURS %d TIMES.",
i,
names[ISC_],
field->fld_array_info->ary_ident,
@@ -4856,7 +4854,7 @@
p = string1;
dimension_size = dimension->dim_upper - dimension->dim_lower + 1;
- sprintf(p, "%02.d %s%d OCCURS %d TIMES ",
+ sprintf(p, "%02d %s%d OCCURS %d TIMES ",
i, names[ISC_], field->fld_array_info->ary_ident, dimension_size);
while (*p)
p++;
Index: c_cxx.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/gpre/c_cxx.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -b -U3 -r1.18 -r1.19
--- c_cxx.cpp 28 Feb 2003 13:19:34 -0000 1.18
+++ c_cxx.cpp 27 Mar 2003 17:15:46 -0000 1.19
@@ -2603,9 +2603,7 @@
request = action->act_request;
-#pragma FB_COMPILER_MESSAGE("fix format string")
- ib_fprintf(out_file, "static %s_r (request, transaction ",
- request->req_handle, request->req_handle, request->req_trans);
+ ib_fprintf(out_file, "static %s_r (request, transaction ", request->req_handle);
if (port = request->req_vport)
for (reference = port->por_references; reference;
@@ -2613,10 +2611,8 @@
ib_fprintf(out_file, ", %s",
gen_name(s, reference->ref_source, TRUE));
-#pragma FB_COMPILER_MESSAGE("fix format string")
ib_fprintf(out_file,
- ")\n isc_req_handle\trequest;\n isc_tr_handle\ttransaction;\n",
- request->req_handle, request->req_trans);
+ ")\n isc_req_handle\trequest;\n isc_tr_handle\ttransaction;\n");
if (port)
for (reference = port->por_references; reference;
@@ -3526,7 +3522,7 @@
(request->req_flags & REQ_extend_dpb) ? "" : CONST_STR,
request->req_ident, request->req_length);
printa(0, "static %schar\n isc_%d [] = {",
- CONST_STR, request->req_ident, request->req_length);
+ CONST_STR, request->req_ident);
string_type = "blr";
if (sw_raw) {
gen_raw(request->req_blr, request->req_length);
@@ -3609,7 +3605,7 @@
IBERROR("internal error during BLR generation");
}
printa(INDENT, "};\t/* end of %s string for request isc_%d */\n",
- string_type, request->req_ident, request->req_length);
+ string_type, request->req_ident);
}
// Print out slice description language if there are arrays associated with request
Index: ada.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/gpre/ada.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -b -U3 -r1.14 -r1.15
--- ada.cpp 27 Feb 2003 16:05:18 -0000 1.14
+++ ada.cpp 27 Mar 2003 17:15:48 -0000 1.15
@@ -2367,8 +2367,7 @@
request = action->act_request;
- ib_fprintf(out_file, "static %s_r (request, transaction",
- request->req_handle, request->req_handle, request->req_trans);
+ ib_fprintf(out_file, "static %s_r (request, transaction", request->req_handle);
if (port = request->req_vport)
for (reference = port->por_references; reference;
@@ -2376,8 +2375,7 @@
ib_fprintf(out_file, ", %s",
gen_name(s, reference->ref_source, TRUE));
ib_fprintf(out_file,
- ")\n isc_req_handle\trequest;\n isc_tr_handle\ttransaction;\n",
- request->req_handle, request->req_trans);
+ ")\n isc_req_handle\trequest;\n isc_tr_handle\ttransaction;\n");
if (port)
for (reference = port->por_references; reference;
|
Thread View
| Thread | Author | Date |
|---|---|---|
| [Firebird-checkins] CVS: firebird2/src/gpre int_cxx.cpp,1.9,1.10 int.cpp,1.11,1.12 ftn.cpp,1.18,1.19 cob.cpp,1.20,1.21 c_cxx.cpp,1.18,1.19 ada.cpp,1.14,1.15 | Blas Rodriguez Somoza <brodsom@us...> |