Menu
▾
▴
[Firebird-checkins] CVS: firebird2/src/isql show.epp,1.17,1.18 isql.h,1.10,1.11 isql.epp,1.36,1.37 extract.epp,1.10,1.11
|
From: Blas R. S. <br...@us...> - 2003-08-26 23:12:03
|
Build Version : T2.0.0.4425 Firebird 2.0 Alpha 1
(writeBuildNum.sh,v 1.4424 2003/08/26 23:11:55 brodsom Exp )
Update of /cvsroot/firebird/firebird2/src/isql
In directory sc8-pr-cvs1:/tmp/cvs-serv24020
Modified Files:
show.epp isql.h isql.epp extract.epp
Log Message:
-Remove NULL_PTR macro
-Remove unneeded casts
Index: show.epp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/isql/show.epp,v
retrieving revision 1.17
retrieving revision 1.18
diff -b -U3 -r1.17 -r1.18
--- show.epp 16 Apr 2003 10:17:14 -0000 1.17
+++ show.epp 26 Aug 2003 23:11:54 -0000 1.18
@@ -1072,9 +1072,8 @@
/* Only show version works if there is no db attached */
if ((!strcmp(cmd[1], "VERSION")) || (!strcmp(cmd[1], "VER"))) {
- gds__msg_format(NULL_PTR, ISQL_MSG_FAC, VERSION, sizeof(msg_string),
- msg_string, FB_VERSION, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR,
- (TEXT*) NULL_PTR);
+ gds__msg_format(NULL, ISQL_MSG_FAC, VERSION, sizeof(msg_string),
+ msg_string, FB_VERSION, NULL, NULL, NULL, NULL);
sprintf(Print_buffer, "%s%s", msg_string, NEWLINE);
ISQL_printf(Out, Print_buffer);
isc_version(&DB, (FPTR_VOID) local_fprintf, NULL);
@@ -1396,13 +1395,11 @@
if (ret == NOT_FOUND) {
if (*cmd[2] == '"')
- gds__msg_format(NULL_PTR, ISQL_MSG_FAC, key, sizeof(msg_string),
- msg_string, lcmd[2], (TEXT*) NULL_PTR, (TEXT*) NULL_PTR,
- (TEXT*) NULL_PTR, (TEXT*) NULL_PTR);
- else
- gds__msg_format(NULL_PTR, ISQL_MSG_FAC, key, sizeof(msg_string),
- msg_string, cmd[2], (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR,
- (TEXT*) NULL_PTR);
+ gds__msg_format(NULL, ISQL_MSG_FAC, key, sizeof(msg_string),
+ msg_string, lcmd[2], NULL, NULL, NULL, NULL);
+ else
+ gds__msg_format(NULL, ISQL_MSG_FAC, key, sizeof(msg_string),
+ msg_string, cmd[2], NULL, NULL, NULL, NULL);
STDERROUT(msg_string, 1);
}
Index: isql.h
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/isql/isql.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -b -U3 -r1.10 -r1.11
--- isql.h 16 Jul 2003 18:48:57 -0000 1.10
+++ isql.h 26 Aug 2003 23:11:54 -0000 1.11
@@ -95,8 +95,6 @@
#define DEFCHARSET "NONE"
#define NULL_DISP_LEN 6
-#define NULL_PTR ((void*) 0)
-
/* Error codes */
#define MSG_LENGTH 256
Index: isql.epp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/isql/isql.epp,v
retrieving revision 1.36
retrieving revision 1.37
diff -b -U3 -r1.36 -r1.37
--- isql.epp 20 Aug 2003 19:47:07 -0000 1.36
+++ isql.epp 26 Aug 2003 23:11:54 -0000 1.37
@@ -474,18 +474,15 @@
break;
case ERR:
- gds__msg_format(NULL_PTR, ISQL_MSG_FAC, USAGE1, sizeof(helpstring),
- helpstring, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR,
- (TEXT*) NULL_PTR);
+ gds__msg_format(NULL, ISQL_MSG_FAC, USAGE1, sizeof(helpstring),
+ helpstring, NULL, NULL, NULL, NULL, NULL);
STDERROUT(helpstring, 1);
- gds__msg_format(NULL_PTR, ISQL_MSG_FAC, USAGE2, sizeof(helpstring),
- helpstring, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR,
- (TEXT*) NULL_PTR);
+ gds__msg_format(NULL, ISQL_MSG_FAC, USAGE2, sizeof(helpstring),
+ helpstring, NULL, NULL, NULL, NULL, NULL);
STDERROUT(helpstring, 1);
- gds__msg_format(NULL_PTR, ISQL_MSG_FAC, USAGE3, sizeof(helpstring),
- helpstring, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR,
- (TEXT*) NULL_PTR);
+ gds__msg_format(NULL, ISQL_MSG_FAC, USAGE3, sizeof(helpstring),
+ helpstring, NULL, NULL, NULL, NULL, NULL);
STDERROUT(helpstring, 1);
Exit_value = FINI_ERROR;
break;
@@ -613,9 +610,8 @@
if (!Db_name[0]) {
if (!Quiet) {
- gds__msg_format(NULL_PTR, ISQL_MSG_FAC, NO_DB, sizeof(errbuf),
- errbuf, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR,
- (TEXT*) NULL_PTR);
+ gds__msg_format(NULL, ISQL_MSG_FAC, NO_DB, sizeof(errbuf),
+ errbuf, NULL, NULL, NULL, NULL, NULL);
STDERROUT(errbuf, 1);
}
else
@@ -810,9 +806,8 @@
&& vec[1] == 0
&& vec[2] == gds_arg_warning
&& !Warnings)) return;
- gds__msg_format(NULL_PTR, ISQL_MSG_FAC, 0, sizeof(errbuf), errbuf,
- (TEXT *) isc_sqlcode(status), (TEXT*) NULL_PTR, (TEXT*) NULL_PTR,
- (TEXT*) NULL_PTR, (TEXT*) NULL_PTR);
+ gds__msg_format(NULL, ISQL_MSG_FAC, 0, sizeof(errbuf), errbuf,
+ (TEXT *) isc_sqlcode(status), NULL, NULL, NULL, NULL);
TRANSLATE_CP;
STDERROUT(errbuf, 1);
isc_interprete(errbuf, &vec);
@@ -1473,7 +1468,7 @@
*
**************************************/
- gds__msg_format(NULL_PTR, ISQL_MSG_FAC, number, MSG_LENGTH, msg,
+ gds__msg_format(NULL, ISQL_MSG_FAC, number, MSG_LENGTH, msg,
arg1, arg2, arg3, arg4, arg5);
}
@@ -1730,9 +1725,8 @@
** and ib_scanf the resulting string into a buffer of the right type.
*/
- gds__msg_format(NULL_PTR, ISQL_MSG_FAC, ADD_PROMPT, sizeof(infobuf),
- infobuf, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR,
- (TEXT*) NULL_PTR);
+ gds__msg_format(NULL, ISQL_MSG_FAC, ADD_PROMPT, sizeof(infobuf),
+ infobuf, NULL, NULL, NULL, NULL, NULL);
STDERROUT(infobuf, 1);
done = FALSE;
@@ -2229,8 +2223,8 @@
if (Out == (IB_FILE *) - 1) {
/* If we can't open a temp file then bail */
- gds__msg_format(NULL_PTR, ISQL_MSG_FAC, FILE_OPEN_ERR, sizeof(errbuf),
- errbuf, ftmp, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR);
+ gds__msg_format(NULL, ISQL_MSG_FAC, FILE_OPEN_ERR, sizeof(errbuf),
+ errbuf, ftmp, NULL, NULL, NULL, NULL);
STDERROUT(errbuf, 1);
Exit_value = FINI_ERROR;
return END;
@@ -2238,9 +2232,8 @@
ISQL_make_upper((UCHAR*) source);
if (EXTRACT_list_table(source, destination, domain_flag, -1)) {
- gds__msg_format(NULL_PTR, ISQL_MSG_FAC, NOT_FOUND, sizeof(errbuf),
- errbuf, source, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR,
- (TEXT*) NULL_PTR);
+ gds__msg_format(NULL, ISQL_MSG_FAC, NOT_FOUND, sizeof(errbuf),
+ errbuf, source, NULL, NULL, NULL, NULL);
STDERROUT(errbuf, 1);
(void) ib_fclose(Out);
}
@@ -2255,9 +2248,8 @@
altdb = Db_name;
sprintf(cmd, "isql -q %s -i %s", altdb, ftmp);
if (system(cmd)) {
- gds__msg_format(NULL_PTR, ISQL_MSG_FAC, COPY_ERR, sizeof(errbuf),
- errbuf, destination, altdb, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR,
- (TEXT*) NULL_PTR);
+ gds__msg_format(NULL, ISQL_MSG_FAC, COPY_ERR, sizeof(errbuf),
+ errbuf, destination, altdb, NULL, NULL, NULL);
STDERROUT(errbuf, 1);
}
}
@@ -2411,10 +2403,10 @@
str_flag = INIT_STR_FLAG;
get_str(temp_local_stmt_str, &str_begin, &str_end, &str_flag);
if (str_flag == INCOMPLETE_STRING) {
- gds__msg_format(NULL_PTR, ISQL_MSG_FAC, INCOMPLETE_STR,
+ gds__msg_format(NULL, ISQL_MSG_FAC, INCOMPLETE_STR,
sizeof(errbuf), errbuf,
"create database statement",
- (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR);
+ NULL, NULL, NULL, NULL);
STDERROUT(errbuf, 1);
return (FAIL);
}
@@ -2450,10 +2442,10 @@
str_flag = INIT_STR_FLAG;
get_str(temp_local_stmt_str, &str_begin, &str_end, &str_flag);
if (str_flag == INCOMPLETE_STRING) {
- gds__msg_format(NULL_PTR, ISQL_MSG_FAC, INCOMPLETE_STR,
+ gds__msg_format(NULL, ISQL_MSG_FAC, INCOMPLETE_STR,
sizeof(errbuf), errbuf,
"create database statement",
- (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR);
+ NULL, NULL, NULL, NULL);
STDERROUT(errbuf, 1);
return (FAIL);
}
@@ -2561,9 +2553,8 @@
{
/* If we can't open a temp file then bail */
- gds__msg_format(NULL_PTR, ISQL_MSG_FAC, FILE_OPEN_ERR, MSG_LENGTH,
- errbuf, Tmpfile, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR,
- (TEXT*) NULL_PTR);
+ gds__msg_format(NULL, ISQL_MSG_FAC, FILE_OPEN_ERR, MSG_LENGTH,
+ errbuf, Tmpfile, NULL, NULL, NULL, NULL);
STDERROUT(errbuf, 1);
Exit_value = FINI_ERROR;
exit(Exit_value);
@@ -2573,28 +2564,27 @@
signal(SIGINT, (void (*)(int)) query_abort);
-/*
- * We will not excute this for now on WINDOWS. We are not prompting for
- * a database name, username password. A connect statement has to be in
- * the file containing the script.
- */
+ //
+ // We will not excute this for now on WINDOWS. We are not prompting for
+ // a database name, username password. A connect statement has to be in
+ // the file containing the script.
+ //
(void) newdb(Db_name, User, Password, Numbufs, Role, TRUE);
-/* If that failed or no Dbname was specified */
+ // If that failed or no Dbname was specified
(void) ISQL_dbcheck();
-/* Set up SQLDA for SELECTs, allow up to 20 fields to be selected.
-** If we subsequently encounter a query with more columns, we
-** will realloc the sqlda as needed
-*/
+ // Set up SQLDA for SELECTs, allow up to 20 fields to be selected.
+ // If we subsequently encounter a query with more columns, we
+ // will realloc the sqlda as needed
sqlda = (XSQLDA *) ISQL_ALLOC((SLONG) (XSQLDA_LENGTH(20)));
sqlda->version = SQLDA_VERSION1;
sqlda->sqln = 20;
-/* The sqldap is the handle containing the current sqlda pointer */
+ // The sqldap is the handle containing the current sqlda pointer
sqldap = &sqlda;
@@ -2631,9 +2621,8 @@
if (!Db_name[0] && (ret == CONT)) {
if (!Quiet) {
- gds__msg_format(NULL_PTR, ISQL_MSG_FAC, NO_DB, MSG_LENGTH,
- errbuf, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR,
- (TEXT*) NULL_PTR, (TEXT*) NULL_PTR);
+ gds__msg_format(NULL, ISQL_MSG_FAC, NO_DB, MSG_LENGTH,
+ errbuf, NULL, NULL, NULL, NULL, NULL);
STDERROUT(errbuf, 1);
}
ret = SKIP;
@@ -2650,9 +2639,8 @@
case EXIT:
/* Quit upon EOF from top level file pointer */
if ((ret == EOF) && Continuation) {
- gds__msg_format(NULL_PTR, ISQL_MSG_FAC, UNEXPECTED_EOF,
- MSG_LENGTH, errbuf, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR,
- (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR);
+ gds__msg_format(NULL, ISQL_MSG_FAC, UNEXPECTED_EOF, MSG_LENGTH,
+ errbuf, NULL, NULL, NULL, NULL, NULL);
STDERROUT(errbuf, 1);
Exit_value = FINI_ERROR;
}
@@ -2760,9 +2748,8 @@
if (!V4) {
errbuf = (TEXT *) ISQL_ALLOC((SLONG) MSG_LENGTH);
if (errbuf) {
- gds__msg_format(NULL_PTR, ISQL_MSG_FAC, SERVER_TOO_OLD,
- MSG_LENGTH, errbuf, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR,
- (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR);
+ gds__msg_format(NULL, ISQL_MSG_FAC, SERVER_TOO_OLD, MSG_LENGTH,
+ errbuf, NULL, NULL, NULL, NULL, NULL);
STDERROUT(errbuf, 1);
ISQL_FREE(errbuf);
}
@@ -2851,9 +2838,8 @@
gds__edit(file, 0);
}
else {
- gds__msg_format(NULL_PTR, ISQL_MSG_FAC, FILE_OPEN_ERR, MSG_LENGTH,
- errbuf, file, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR,
- (TEXT*) NULL_PTR);
+ gds__msg_format(NULL, ISQL_MSG_FAC, FILE_OPEN_ERR, MSG_LENGTH,
+ errbuf, file, NULL, NULL, NULL, NULL);
STDERROUT(errbuf, 1);
}
}
@@ -2912,16 +2898,14 @@
if (M__trans) {
if (Interactive) {
- gds__msg_format(NULL_PTR, ISQL_MSG_FAC, COMMIT_PROMPT,
- sizeof(infobuf), infobuf, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR,
- (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR);
+ gds__msg_format(NULL, ISQL_MSG_FAC, COMMIT_PROMPT, sizeof(infobuf),
+ infobuf, NULL, NULL, NULL, NULL, NULL);
readNextInputLine(infobuf);
// ISQL_prompt(infobuf);
// (void) ib_fgets(buffer, BUFFER_LENGTH80, ib_stdin);
if (isyesno(lastInputLine)) { /* check for Yes answer */
- gds__msg_format(NULL_PTR, ISQL_MSG_FAC, COMMIT_MSG,
- sizeof(infobuf), infobuf, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR,
- (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR);
+ gds__msg_format(NULL, ISQL_MSG_FAC, COMMIT_MSG, sizeof(infobuf),
+ infobuf, NULL, NULL, NULL, NULL, NULL);
STDERROUT(infobuf, 1);
if (DB && M__trans) {
if (isc_commit_transaction(isc_status, &M__trans)) {
@@ -2932,9 +2916,9 @@
}
}
else {
- gds__msg_format(NULL_PTR, ISQL_MSG_FAC, ROLLBACK_MSG,
- sizeof(infobuf), infobuf, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR,
- (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR);
+ gds__msg_format(NULL, ISQL_MSG_FAC, ROLLBACK_MSG,
+ sizeof(infobuf), infobuf, NULL, NULL, NULL,
+ NULL, NULL);
STDERROUT(infobuf, 1);
if (DB && M__trans) {
if (isc_rollback_transaction(isc_status, &M__trans)) {
@@ -2954,12 +2938,9 @@
* the user connects and then disconnects or if the user enters a SET TRANSACTION stat without
* ever doing anything that would cause changes to the dictionary.
*/
- gds__msg_format(NULL_PTR,
- ISQL_MSG_FAC,
- ROLLBACK_MSG, sizeof(infobuf),
- infobuf,
- (TEXT*) NULL_PTR,
- (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR);
+ gds__msg_format(NULL, ISQL_MSG_FAC, ROLLBACK_MSG,
+ sizeof(infobuf), infobuf, NULL, NULL, NULL,
+ NULL, NULL);
STDERROUT(infobuf, 1);
if (isc_rollback_transaction(isc_status, &M__trans)) {
ISQL_errmsg(isc_status);
@@ -3114,9 +3095,8 @@
/* If we hit the end of string before the close comment,
** raise an error
*/
- gds__msg_format(NULL_PTR, ISQL_MSG_FAC, CMD_ERR, MSG_LENGTH,
- errbuf, statement, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR,
- (TEXT*) NULL_PTR);
+ gds__msg_format(NULL, ISQL_MSG_FAC, CMD_ERR, MSG_LENGTH,
+ errbuf, statement, NULL, NULL, NULL, NULL);
STDERROUT(errbuf, 1);
ISQL_FREE(errbuf);
ISQL_FREE(buffer);
@@ -3489,10 +3469,10 @@
}
else if (!strcmp(parms[0], "CONNECT"))
{
- psw = (TEXT *) NULL;
- usr = (TEXT *) NULL;
- sql_role_nm = (TEXT *) NULL;
- numbufs = (TEXT *) NULL;
+ psw = NULL;
+ usr = NULL;
+ sql_role_nm = NULL;
+ numbufs = NULL;
/* if a parameter is given in the command more than once, the
last one will be used. The parameters can appear each any
@@ -3597,13 +3577,11 @@
if (ret == ERR) {
if (bad_dialect == TRUE)
- gds__msg_format(NULL_PTR, ISQL_MSG_FAC, CMD_ERR, MSG_LENGTH,
- errbuf, bad_dialect_buf, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR,
- (TEXT*) NULL_PTR, (TEXT*) NULL_PTR);
- else
- gds__msg_format(NULL_PTR, ISQL_MSG_FAC, CMD_ERR, MSG_LENGTH,
- errbuf, cmd, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR,
- (TEXT*) NULL_PTR);
+ gds__msg_format(NULL, ISQL_MSG_FAC, CMD_ERR, MSG_LENGTH,
+ errbuf, bad_dialect_buf, NULL, NULL, NULL, NULL);
+ else
+ gds__msg_format(NULL, ISQL_MSG_FAC, CMD_ERR, MSG_LENGTH,
+ errbuf, cmd, NULL, NULL, NULL, NULL);
STDERROUT(errbuf, 1);
}
@@ -3948,9 +3926,9 @@
overflowing the variable bufsize */
errbuf = (TEXT *) ISQL_ALLOC((SLONG) MSG_LENGTH);
if (errbuf) {
- gds__msg_format(NULL_PTR, ISQL_MSG_FAC, BUFFER_OVERFLOW,
- MSG_LENGTH, (TEXT*) errbuf, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR,
- (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR);
+ gds__msg_format(NULL, ISQL_MSG_FAC, BUFFER_OVERFLOW,
+ MSG_LENGTH, (TEXT*) errbuf, NULL, NULL,
+ NULL, NULL, NULL);
STDERROUT(errbuf, 1);
ISQL_FREE(errbuf);
}
@@ -4724,8 +4702,8 @@
Ifp = fp;
}
else {
- gds__msg_format(NULL_PTR, ISQL_MSG_FAC, FILE_OPEN_ERR, MSG_LENGTH,
- errbuf, file, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR);
+ gds__msg_format(NULL, ISQL_MSG_FAC, FILE_OPEN_ERR, MSG_LENGTH,
+ errbuf, file, NULL, NULL, NULL, NULL);
STDERROUT(errbuf, 1);
ISQL_FREE(errbuf);
return FAIL;
@@ -5066,9 +5044,8 @@
}
if (!V4 && !V33) {
- gds__msg_format(NULL_PTR, ISQL_MSG_FAC, SERVER_TOO_OLD, MSG_LENGTH,
- errbuf, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR,
- (TEXT*) NULL_PTR);
+ gds__msg_format(NULL, ISQL_MSG_FAC, SERVER_TOO_OLD, MSG_LENGTH,
+ errbuf, NULL, NULL, NULL, NULL, NULL);
STDERROUT(errbuf, 1);
isc_detach_database(isc_status, &DB);
DB = 0;
@@ -5189,13 +5166,8 @@
else {
errbuf = (TEXT *) ISQL_ALLOC(MSG_LENGTH);
if (errbuf) {
- gds__msg_format(NULL_PTR,
- ISQL_MSG_FAC,
- FILE_OPEN_ERR,
- MSG_LENGTH,
- errbuf,
- outfile,
- (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR);
+ gds__msg_format(NULL, ISQL_MSG_FAC, FILE_OPEN_ERR, MSG_LENGTH,
+ errbuf, outfile, NULL, NULL, NULL, NULL);
STDERROUT(errbuf, 1);
ISQL_FREE(errbuf);
}
@@ -5461,9 +5433,8 @@
Quiet = TRUE;
else if (c == 'Z') {
Version_info = TRUE;
- gds__msg_format(NULL_PTR, ISQL_MSG_FAC, VERSION, MSG_LENGTH,
- errbuf, FB_VERSION, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR,
- (TEXT*) NULL_PTR, (TEXT*) NULL_PTR);
+ gds__msg_format(NULL, ISQL_MSG_FAC, VERSION, MSG_LENGTH,
+ errbuf, FB_VERSION, NULL, NULL, NULL, NULL);
sprintf(Print_buffer, "%s%s", errbuf, NEWLINE);
ISQL_printf(Out, Print_buffer);
@@ -5493,9 +5464,8 @@
}
else { /* This is an unknown flag */
- gds__msg_format(NULL_PTR, ISQL_MSG_FAC, SWITCH, MSG_LENGTH,
- errbuf, s + 1, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR,
- (TEXT*) NULL_PTR);
+ gds__msg_format(NULL, ISQL_MSG_FAC, SWITCH, MSG_LENGTH,
+ errbuf, s + 1, NULL, NULL, NULL, NULL);
STDERROUT(errbuf, 1);
ret = ERR;
}
@@ -6496,8 +6466,7 @@
es = !f\n */
have_report = TRUE;
}
- perf_format(&perf_before, &perf_after, report_1, statistics,
- (SSHORT*) NULL_PTR);
+ perf_format(&perf_before, &perf_after, report_1, statistics, NULL);
sprintf(Print_buffer, "%s%s", statistics, NEWLINE);
ISQL_printf(Diag, Print_buffer);
}
@@ -6841,10 +6810,10 @@
}
else {
TEXT errbuf[MSG_LENGTH];
- gds__msg_format(NULL_PTR, ISQL_MSG_FAC, CMD_ERR,
- MSG_LENGTH, errbuf,
+ gds__msg_format(NULL, ISQL_MSG_FAC, CMD_ERR, MSG_LENGTH,
+ errbuf,
"Expected NEXT, PRIOR, FIRST, LAST, ABSOLUTE <n>, RELATIVE <n>, or QUIT",
- (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR);
+ NULL, NULL, NULL, NULL);
STDERROUT(errbuf, 1);
}
@@ -6923,8 +6892,7 @@
es = !f\n */
have_report = TRUE;
}
- perf_format(&perf_before, &perf_after, report_1, statistics,
- (SSHORT*) NULL_PTR);
+ perf_format(&perf_before, &perf_after, report_1, statistics, NULL);
sprintf(Print_buffer, "%s%s", statistics, NEWLINE);
ISQL_printf(Out, Print_buffer);
}
Index: extract.epp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/isql/extract.epp,v
retrieving revision 1.10
retrieving revision 1.11
diff -b -U3 -r1.10 -r1.11
--- extract.epp 13 Feb 2003 09:42:16 -0000 1.10
+++ extract.epp 26 Aug 2003 23:11:54 -0000 1.11
@@ -207,7 +207,7 @@
{
if (EXTRACT_list_table(tabname, NULL, 1, default_char_set_id))
{
- gds__msg_format(NULL_PTR, ISQL_MSG_FAC, NOT_FOUND, sizeof(errbuf),
+ gds__msg_format(NULL, ISQL_MSG_FAC, NOT_FOUND, sizeof(errbuf),
errbuf, tabname, NULL, NULL, NULL, NULL);
STDERROUT(errbuf, 1);
ret_code = (SSHORT) FINI_ERROR;
|