Skip to content

Commit a065827

Browse files
committed
Clean up badly-formatted error messages from pg_connect.
1 parent 750549d commit a065827

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

src/interfaces/libpgtcl/pgtclCmds.c

+9-8
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.46 2000/01/26 05:58:43 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.47 2000/02/27 07:44:22 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -287,8 +287,8 @@ Pg_connect(ClientData cData, Tcl_Interp *interp, int argc, char *argv[])
287287
if (argc == 1)
288288
{
289289
Tcl_AppendResult(interp, "pg_connect: database name missing\n", 0);
290-
Tcl_AppendResult(interp, "pg_connect databaseName [-host hostName] [-port portNumber] [-tty pgtty]]\n", 0);
291-
Tcl_AppendResult(interp, "pg_connect -conninfo <conninfo-string>", 0);
290+
Tcl_AppendResult(interp, "pg_connect databaseName [-host hostName] [-port portNumber] [-tty pgtty]\n", 0);
291+
Tcl_AppendResult(interp, "pg_connect -conninfo conninfoString", 0);
292292
return TCL_ERROR;
293293

294294
}
@@ -302,7 +302,7 @@ Pg_connect(ClientData cData, Tcl_Interp *interp, int argc, char *argv[])
302302
if (argc != 3)
303303
{
304304
Tcl_AppendResult(interp, "pg_connect: syntax error\n", 0);
305-
Tcl_AppendResult(interp, "pg_connect -conninfo <conninfo-string>", 0);
305+
Tcl_AppendResult(interp, "pg_connect -conninfo conninfoString", 0);
306306
return TCL_ERROR;
307307
}
308308
conn = PQconnectdb(argv[2]);
@@ -341,16 +341,17 @@ Pg_connect(ClientData cData, Tcl_Interp *interp, int argc, char *argv[])
341341
}
342342
else
343343
{
344-
Tcl_AppendResult(interp, "Bad option to pg_connect : \n",
344+
Tcl_AppendResult(interp, "Bad option to pg_connect: ",
345345
argv[i], 0);
346-
Tcl_AppendResult(interp, "pg_connect databaseName [-host hostName] [-port portNumber] [-tty pgtty]]", 0);
346+
Tcl_AppendResult(interp, "\npg_connect databaseName [-host hostName] [-port portNumber] [-tty pgtty]", 0);
347347
return TCL_ERROR;
348348
}
349349
} /* while */
350350
if ((i % 2 != 0) || i != argc)
351351
{
352-
Tcl_AppendResult(interp, "wrong # of arguments to pg_connect\n", argv[i], 0);
353-
Tcl_AppendResult(interp, "pg_connect databaseName [-host hostName] [-port portNumber] [-tty pgtty]]", 0);
352+
Tcl_AppendResult(interp, "wrong # of arguments to pg_connect: ",
353+
argv[i], 0);
354+
Tcl_AppendResult(interp, "\npg_connect databaseName [-host hostName] [-port portNumber] [-tty pgtty]", 0);
354355
return TCL_ERROR;
355356
}
356357
}

0 commit comments

Comments
 (0)