database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-10 17:42:29 +03:00
Code Activity

Change elog(WARN) to elog(ERROR) and elog(ABORT).

Browse Source
This commit is contained in:
Bruce Momjian
1998-01-05 03:35:55 +00:00
parent 0af9137f14
commit 0d9fc5afd6
188 changed files with 1436 additions and 1433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/backend/libpq/be-fsstubs.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.17 1997/12/08 04:42:45 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.18 1998/01/05 03:31:26 momjian Exp $
*
* NOTES
* This should be moved to a more appropriate place. It is here
@@ -100,12 +100,12 @@ lo_close(int fd)
if (fd >= MAX_LOBJ_FDS)
{
elog(WARN, "lo_close: large obj descriptor (%d) out of range", fd);
elog(ABORT, "lo_close: large obj descriptor (%d) out of range", fd);
return -2;
}
if (cookies[fd] == NULL)
{
elog(WARN, "lo_close: invalid large obj descriptor (%d)", fd);
elog(ABORT, "lo_close: invalid large obj descriptor (%d)", fd);
return -3;
}
#if FSDB
@@ -150,7 +150,7 @@ lo_lseek(int fd, int offset, int whence)
if (fd >= MAX_LOBJ_FDS)
{
elog(WARN, "lo_seek: large obj descriptor (%d) out of range", fd);
elog(ABORT, "lo_seek: large obj descriptor (%d) out of range", fd);
return -2;
}
@@ -200,12 +200,12 @@ lo_tell(int fd)
{
if (fd >= MAX_LOBJ_FDS)
{
elog(WARN, "lo_tell: large object descriptor (%d) out of range", fd);
elog(ABORT, "lo_tell: large object descriptor (%d) out of range", fd);
return -2;
}
if (cookies[fd] == NULL)
{
elog(WARN, "lo_tell: invalid large object descriptor (%d)", fd);
elog(ABORT, "lo_tell: invalid large object descriptor (%d)", fd);
return -3;
}
return inv_tell(cookies[fd]);
@@ -273,7 +273,7 @@ lo_import(text *filename)
fd = open(fnamebuf, O_RDONLY, 0666);
if (fd < 0)
{ /* error */
elog(WARN, "be_lo_import: can't open unix file\"%s\"\n",
elog(ABORT, "be_lo_import: can't open unix file\"%s\"\n",
fnamebuf);
}
@@ -283,7 +283,7 @@ lo_import(text *filename)
lobj = inv_create(INV_READ | INV_WRITE);
if (lobj == NULL)
{
elog(WARN, "lo_import: can't create inv object for \"%s\"",
elog(ABORT, "lo_import: can't create inv object for \"%s\"",
fnamebuf);
}
@@ -301,7 +301,7 @@ lo_import(text *filename)
tmp = inv_write(lobj, buf, nbytes);
if (tmp < nbytes)
{
elog(WARN, "lo_import: error while reading \"%s\"",
elog(ABORT, "lo_import: error while reading \"%s\"",
fnamebuf);
}
}
@@ -335,7 +335,7 @@ lo_export(Oid lobjId, text *filename)
lobj = inv_open(lobjId, INV_READ);
if (lobj == NULL)
{
elog(WARN, "lo_export: can't open inv object %d",
elog(ABORT, "lo_export: can't open inv object %d",
lobjId);
}
@@ -348,7 +348,7 @@ lo_export(Oid lobjId, text *filename)
umask(oumask);
if (fd < 0)
{ /* error */
elog(WARN, "lo_export: can't open unix file\"%s\"",
elog(ABORT, "lo_export: can't open unix file\"%s\"",
fnamebuf);
}
@@ -360,7 +360,7 @@ lo_export(Oid lobjId, text *filename)
tmp = write(fd, buf, nbytes);
if (tmp < nbytes)
{
elog(WARN, "lo_export: error while writing \"%s\"",
elog(ABORT, "lo_export: error while writing \"%s\"",
fnamebuf);
}
}

8
src/backend/libpq/be-pqexec.c
View File

@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.11 1997/12/12 16:26:14 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.12 1998/01/05 03:31:28 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -82,7 +82,7 @@ PQfn(int fnid,
}
else if (args[i].len > sizeof(int4))
{
elog(WARN, "arg_length of argument %d too long", i);
elog(ABORT, "arg_length of argument %d too long", i);
}
else
{
@@ -125,7 +125,7 @@ PQfn(int fnid,
* If a query is does not return tuples, return "C query-command".
* If there is an error: return "E error-message".
*
* Note: if we get a serious error or an elog(WARN), then PQexec never
* Note: if we get a serious error or an elog(ABORT), then PQexec never
* returns because the system longjmp's back to the main loop.
* ----------------
*/
@@ -211,7 +211,7 @@ pqtest_PQexec(char *q)
case 'P':
a = PQparray(&res[1]);
if (a == NULL)
elog(WARN, "pqtest_PQexec: PQparray could not find portal %s",
elog(ABORT, "pqtest_PQexec: PQparray could not find portal %s",
res);
t = PQntuples(a);

10
src/backend/libpq/pqcomm.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.31 1997/12/16 15:58:14 thomas Exp $
* $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.32 1998/01/05 03:31:30 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -694,7 +694,7 @@ StreamConnection(int server_fd, Port *port)
(struct sockaddr *) & port->raddr,
&addrlen)) < 0)
{
elog(WARN, "postmaster: StreamConnection: accept: %m");
elog(ABORT, "postmaster: StreamConnection: accept: %m");
return (STATUS_ERROR);
}
@@ -703,7 +703,7 @@ StreamConnection(int server_fd, Port *port)
if (getsockname(port->sock, (struct sockaddr *) & port->laddr,
&addrlen) < 0)
{
elog(WARN, "postmaster: StreamConnection: getsockname: %m");
elog(ABORT, "postmaster: StreamConnection: getsockname: %m");
return (STATUS_ERROR);
}
if (family == AF_INET)
@@ -714,13 +714,13 @@ StreamConnection(int server_fd, Port *port)
pe = getprotobyname("TCP");
if (pe == NULL)
{
elog(WARN, "postmaster: getprotobyname failed");
elog(ABORT, "postmaster: getprotobyname failed");
return (STATUS_ERROR);
}
if (setsockopt(port->sock, pe->p_proto, TCP_NODELAY,
&on, sizeof(on)) < 0)
{
elog(WARN, "postmaster: setsockopt failed");
elog(ABORT, "postmaster: setsockopt failed");
return (STATUS_ERROR);
}
}