|
7 | 7 | *
|
8 | 8 | *
|
9 | 9 | * IDENTIFICATION
|
10 |
| - * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.22 1998/09/01 04:33:15 momjian Exp $ |
| 10 | + * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.23 1998/10/05 02:48:49 thomas Exp $ |
11 | 11 | *
|
12 | 12 | *-------------------------------------------------------------------------
|
13 | 13 | */
|
@@ -236,12 +236,12 @@ SetDatabaseName(char *name)
|
236 | 236 |
|
237 | 237 | #ifndef MULTIBYTE
|
238 | 238 | /* even if MULTIBYTE is not enabled, this function is neccesary
|
239 |
| - * since pg_proc.h does have. |
| 239 | + * since pg_proc.h has an entry for it. |
240 | 240 | */
|
241 | 241 | const char *
|
242 | 242 | getdatabaseencoding()
|
243 | 243 | {
|
244 |
| - elog(ERROR, "you need to enable MB to use this function"); |
| 244 | + elog(ERROR, "MultiByte strings (MB) must be enabled to use this function"); |
245 | 245 | return ("");
|
246 | 246 | }
|
247 | 247 |
|
@@ -421,13 +421,13 @@ SetPgUserName()
|
421 | 421 | {
|
422 | 422 | /* use the (possibly) authenticated name that's provided */
|
423 | 423 | if (!(p = getenv("PG_USER")))
|
424 |
| - elog(FATAL, "SetPgUserName: PG_USER environment variable unset"); |
| 424 | + elog(FATAL, "SetPgUserName: PG_USER environment variable is unset"); |
425 | 425 | }
|
426 | 426 | else
|
427 | 427 | {
|
428 | 428 | /* setuid() has not yet been done, see above comment */
|
429 | 429 | if (!(pw = getpwuid(geteuid())))
|
430 |
| - elog(FATAL, "SetPgUserName: no entry in passwd file"); |
| 430 | + elog(FATAL, "SetPgUserName: no entry in host passwd file"); |
431 | 431 | p = pw->pw_name;
|
432 | 432 | }
|
433 | 433 | if (UserName)
|
@@ -473,7 +473,7 @@ SetUserId()
|
473 | 473 | PointerGetDatum(userName),
|
474 | 474 | 0, 0, 0);
|
475 | 475 | if (!HeapTupleIsValid(userTup))
|
476 |
| - elog(FATAL, "SetUserId: user \"%s\" is not in \"%s\"", |
| 476 | + elog(FATAL, "SetUserId: user '%s' is not in '%s'", |
477 | 477 | userName,
|
478 | 478 | ShadowRelationName);
|
479 | 479 | UserId = (Oid) ((Form_pg_shadow) GETSTRUCT(userTup))->usesysid;
|
|
0 commit comments