database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-08-31 17:02:12 +03:00
Code Activity

Cosmetic code cleanup: fix a bunch of places that used "return (expr);"

Browse Source 
rather than "return expr;" -- the latter style is used in most of the
tree. I kept the parentheses when they were necessary or useful because
the return expression was complex.
This commit is contained in:
Neil Conway
2006-01-11 08:43:13 +00:00
parent 762bcbdba2
commit fb627b76cc
19 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/interfaces/libpq/fe-connect.c
View File

@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.324 2005/11/22 18:17:32 momjian Exp $
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.325 2006/01/11 08:43:13 neilc Exp $
*
*-------------------------------------------------------------------------
*/
@@ -2936,7 +2936,7 @@ PQsetClientEncoding(PGconn *conn, const char *encoding)
status = 0; /* everything is ok */
}
PQclear(res);
return (status);
return status;
}
PGVerbosity

10
src/interfaces/libpq/fe-exec.c
View File

@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-exec.c,v 1.177 2005/11/22 18:17:32 momjian Exp $
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-exec.c,v 1.178 2006/01/11 08:43:13 neilc Exp $
*
*-------------------------------------------------------------------------
*/
@@ -2271,7 +2271,7 @@ PQsetnonblocking(PGconn *conn, int arg)
/* early out if the socket is already in the state requested */
if (barg == conn->nonblocking)
return (0);
return 0;
/*
* to guarantee constancy for flushing/query/result-polling behavior we
@@ -2281,11 +2281,11 @@ PQsetnonblocking(PGconn *conn, int arg)
*/
/* if we are going from blocking to non-blocking flush here */
if (pqFlush(conn))
return (-1);
return -1;
conn->nonblocking = barg;
return (0);
return 0;
}
/*
@@ -2295,7 +2295,7 @@ PQsetnonblocking(PGconn *conn, int arg)
int
PQisnonblocking(const PGconn *conn)
{
return (pqIsnonblocking(conn));
return pqIsnonblocking(conn);
}
/* try to force data out, really only useful for non-blocking users */

8
src/interfaces/libpq/fe-misc.c
View File

@@ -23,7 +23,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-misc.c,v 1.123 2005/11/22 18:17:33 momjian Exp $
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-misc.c,v 1.124 2006/01/11 08:43:13 neilc Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1090,7 +1090,7 @@ pqSocketPoll(int sock, int forRead, int forWrite, time_t end_time)
int
PQmblen(const char *s, int encoding)
{
return (pg_encoding_mblen(encoding, s));
return pg_encoding_mblen(encoding, s);
}
/*
@@ -1100,7 +1100,7 @@ PQmblen(const char *s, int encoding)
int
PQdsplen(const char *s, int encoding)
{
return (pg_encoding_dsplen(encoding, s));
return pg_encoding_dsplen(encoding, s);
}
/*
@@ -1115,7 +1115,7 @@ PQenv2encoding(void)
str = getenv("PGCLIENTENCODING");
if (str && *str != '\0')
encoding = pg_char_to_encoding(str);
return (encoding);
return encoding;
}

6
src/interfaces/libpq/fe-protocol2.c
View File

@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-protocol2.c,v 1.20 2005/11/22 18:17:33 momjian Exp $
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-protocol2.c,v 1.21 2006/01/11 08:43:13 neilc Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1180,11 +1180,11 @@ pqEndcopy2(PGconn *conn)
* and the flush fails
*/
if (pqFlush(conn) && pqIsnonblocking(conn))
return (1);
return 1;
/* non blocking connections may have to abort at this point. */
if (pqIsnonblocking(conn) && PQisBusy(conn))
return (1);
return 1;
/* Return to active duty */
conn->asyncStatus = PGASYNC_BUSY;

6
src/interfaces/libpq/fe-protocol3.c
View File

@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-protocol3.c,v 1.23 2005/11/22 18:17:33 momjian Exp $
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-protocol3.c,v 1.24 2006/01/11 08:43:13 neilc Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1158,7 +1158,7 @@ pqEndcopy3(PGconn *conn)
* and the flush fails
*/
if (pqFlush(conn) && pqIsnonblocking(conn))
return (1);
return 1;
/* Return to active duty */
conn->asyncStatus = PGASYNC_BUSY;
@@ -1172,7 +1172,7 @@ pqEndcopy3(PGconn *conn)
* with the CopyDone; are there corner cases where that doesn't happen?)
*/
if (pqIsnonblocking(conn) && PQisBusy(conn))
return (1);
return 1;
/* Wait for the completion response */
result = PQgetResult(conn);