aboutsummaryrefslogtreecommitdiff
path: root/src/backend/libpq
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/libpq')
-rw-r--r--src/backend/libpq/auth.c32
-rw-r--r--src/backend/libpq/be-dumpdata.c6
-rw-r--r--src/backend/libpq/be-fsstubs.c4
-rw-r--r--src/backend/libpq/be-pqexec.c4
-rw-r--r--src/backend/libpq/hba.c78
-rw-r--r--src/backend/libpq/portal.c136
-rw-r--r--src/backend/libpq/portalbuf.c18
-rw-r--r--src/backend/libpq/pqcomm.c56
-rw-r--r--src/backend/libpq/pqsignal.c6
9 files changed, 170 insertions, 170 deletions
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index c1cc08f4c79..027f945a3d8 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.29 1998/07/09 03:28:45 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.30 1998/09/01 03:22:41 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -103,7 +103,7 @@ pg_krb4_recvauth(Port *port)
krb_err_txt[status]);
fputs(PQerrormsg, stderr);
pqdebug("%s", PQerrormsg);
- return (STATUS_ERROR);
+ return STATUS_ERROR;
}
if (strncmp(version, PG_KRB4_VERSION, KRB_SENDAUTH_VLEN))
{
@@ -112,7 +112,7 @@ pg_krb4_recvauth(Port *port)
PG_KRB4_VERSION);
fputs(PQerrormsg, stderr);
pqdebug("%s", PQerrormsg);
- return (STATUS_ERROR);
+ return STATUS_ERROR;
}
if (strncmp(port->user, auth_data.pname, SM_USER))
{
@@ -122,9 +122,9 @@ pg_krb4_recvauth(Port *port)
auth_data.pname);
fputs(PQerrormsg, stderr);
pqdebug("%s", PQerrormsg);
- return (STATUS_ERROR);
+ return STATUS_ERROR;
}
- return (STATUS_OK);
+ return STATUS_OK;
}
#else
@@ -137,7 +137,7 @@ pg_krb4_recvauth(Port *port)
fputs(PQerrormsg, stderr);
pqdebug("%s", PQerrormsg);
- return (STATUS_ERROR);
+ return STATUS_ERROR;
}
#endif /* KRB4 */
@@ -174,7 +174,7 @@ pg_an_to_ln(char *aname)
if ((p = strchr(aname, '/')) || (p = strchr(aname, '@')))
*p = '\0';
- return (aname);
+ return aname;
}
/*
@@ -230,7 +230,7 @@ pg_krb5_recvauth(Port *port)
"pg_krb5_recvauth: Kerberos error %d in krb5_parse_name\n",
code);
com_err("pg_krb5_recvauth", code, "in krb5_parse_name");
- return (STATUS_ERROR);
+ return STATUS_ERROR;
}
/*
@@ -265,7 +265,7 @@ pg_krb5_recvauth(Port *port)
code);
com_err("pg_krb5_recvauth", code, "in krb5_recvauth");
krb5_free_principal(server);
- return (STATUS_ERROR);
+ return STATUS_ERROR;
}
krb5_free_principal(server);
@@ -281,7 +281,7 @@ pg_krb5_recvauth(Port *port)
code);
com_err("pg_krb5_recvauth", code, "in krb5_unparse_name");
krb5_free_principal(client);
- return (STATUS_ERROR);
+ return STATUS_ERROR;
}
krb5_free_principal(client);
if (!kusername)
@@ -290,7 +290,7 @@ pg_krb5_recvauth(Port *port)
"pg_krb5_recvauth: could not decode username\n");
fputs(PQerrormsg, stderr);
pqdebug("%s", PQerrormsg);
- return (STATUS_ERROR);
+ return STATUS_ERROR;
}
kusername = pg_an_to_ln(kusername);
if (strncmp(username, kusername, SM_USER))
@@ -301,10 +301,10 @@ pg_krb5_recvauth(Port *port)
fputs(PQerrormsg, stderr);
pqdebug("%s", PQerrormsg);
pfree(kusername);
- return (STATUS_ERROR);
+ return STATUS_ERROR;
}
pfree(kusername);
- return (STATUS_OK);
+ return STATUS_OK;
}
#else
@@ -317,7 +317,7 @@ pg_krb5_recvauth(Port *port)
fputs(PQerrormsg, stderr);
pqdebug("%s", PQerrormsg);
- return (STATUS_ERROR);
+ return STATUS_ERROR;
}
#endif /* KRB5 */
@@ -394,7 +394,7 @@ pg_passwordv0_recvauth(void *arg, PacketLen len, void *pkt)
auth_failed(port);
}
- return (STATUS_OK); /* don't close the connection yet */
+ return STATUS_OK; /* don't close the connection yet */
}
@@ -628,7 +628,7 @@ readPasswordPacket(void *arg, PacketLen len, void *pkt)
else
sendAuthRequest(port, AUTH_REQ_OK, handle_done_auth);
- return (STATUS_OK); /* don't close the connection yet */
+ return STATUS_OK; /* don't close the connection yet */
}
diff --git a/src/backend/libpq/be-dumpdata.c b/src/backend/libpq/be-dumpdata.c
index 0f0a4b021c5..76bff775f0c 100644
--- a/src/backend/libpq/be-dumpdata.c
+++ b/src/backend/libpq/be-dumpdata.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-dumpdata.c,v 1.16 1998/07/13 16:34:48 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-dumpdata.c,v 1.17 1998/09/01 03:22:43 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -111,7 +111,7 @@ be_currentportal(void)
Dlelem *elt;
elt = DLGetTail(be_portalstack);
- return (elt ? (PortalEntry *) DLE_VAL(elt) : NULL);
+ return elt ? (PortalEntry *) DLE_VAL(elt) : NULL;
}
/* ----------------
@@ -173,7 +173,7 @@ be_typeinit(PortalEntry *entry,
PortalBuffer *portal;
GroupBuffer *group;
int i;
- AttributeTupleForm *attrs = tupDesc->attrs;
+ Form_pg_attribute *attrs = tupDesc->attrs;
/* ----------------
* add a new portal group to the portal
diff --git a/src/backend/libpq/be-fsstubs.c b/src/backend/libpq/be-fsstubs.c
index 05a639aec4a..7be91f13e8b 100644
--- a/src/backend/libpq/be-fsstubs.c
+++ b/src/backend/libpq/be-fsstubs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.24 1998/08/19 02:02:09 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.25 1998/09/01 03:22:44 momjian Exp $
*
* NOTES
* This should be moved to a more appropriate place. It is here
@@ -211,7 +211,7 @@ lo_tell(int fd)
int
lo_unlink(Oid lobjId)
{
- return (inv_destroy(lobjId));
+ return inv_destroy(lobjId);
}
/*****************************************************************************
diff --git a/src/backend/libpq/be-pqexec.c b/src/backend/libpq/be-pqexec.c
index 2d3952bebad..1fb6ca7644e 100644
--- a/src/backend/libpq/be-pqexec.c
+++ b/src/backend/libpq/be-pqexec.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.18 1998/08/24 01:37:52 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.19 1998/09/01 03:22:45 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -412,5 +412,5 @@ pqtest(struct varlena * vlena)
return pqtest_PQexec(q);
break;
}
- return (0);
+ return 0;
}
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index 80c149b062d..83acfe4c006 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.33 1998/06/15 19:28:26 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.34 1998/09/01 03:22:46 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -36,7 +36,7 @@
static bool
isblank(const char c)
{
- return (c == ' ' || c == 9 /* tab */ );
+ return c == ' ' || c == 9 /* tab */ ;
}
@@ -97,7 +97,7 @@ read_through_eol(FILE *file)
static void
-read_hba_entry2(FILE *file, UserAuth *userauth_p, char auth_arg[],
+read_hba_entry2(FILE *file, UserAuth *userauth_p, char *auth_arg,
bool *error_p)
{
/*--------------------------------------------------------------------------
@@ -154,15 +154,15 @@ read_hba_entry2(FILE *file, UserAuth *userauth_p, char auth_arg[],
static void
-process_hba_record(FILE *file, SockAddr *raddr, const char user[],
- const char database[], bool *matches_p, bool *error_p,
- UserAuth *userauth_p, char auth_arg[])
+process_hba_record(FILE *file, SockAddr *raddr, const char *user,
+ const char *database, bool *matches_p, bool *error_p,
+ UserAuth *userauth_p, char *auth_arg)
{
/*---------------------------------------------------------------------------
Process the non-comment record in the config file that is next on the file.
See if it applies to a connection to a host with IP address "*raddr"
- to a database named "database[]". If so, return *matches_p true
- and *userauth_p and auth_arg[] as the values from the entry.
+ to a database named "*database". If so, return *matches_p true
+ and *userauth_p and *auth_arg as the values from the entry.
If not, leave *matches_p as it was. If the record has a syntax error,
return *error_p true, after issuing a message to stderr. If no error,
leave *error_p as it was.
@@ -299,9 +299,9 @@ syntax:
static void
-process_open_config_file(FILE *file, SockAddr *raddr, const char user[],
- const char database[], bool *host_ok_p,
- UserAuth *userauth_p, char auth_arg[])
+process_open_config_file(FILE *file, SockAddr *raddr, const char *user,
+ const char *database, bool *host_ok_p,
+ UserAuth *userauth_p, char *auth_arg)
{
/*---------------------------------------------------------------------------
This function does the same thing as find_hba_entry, only with
@@ -355,8 +355,8 @@ process_open_config_file(FILE *file, SockAddr *raddr, const char user[],
static void
-find_hba_entry(SockAddr *raddr, const char user[], const char database[],
- bool *host_ok_p, UserAuth *userauth_p, char auth_arg[])
+find_hba_entry(SockAddr *raddr, const char *user, const char *database,
+ bool *host_ok_p, UserAuth *userauth_p, char *auth_arg)
{
/*--------------------------------------------------------------------------
Read the config file and find an entry that allows connection from
@@ -442,16 +442,16 @@ find_hba_entry(SockAddr *raddr, const char user[], const char database[],
static void
-interpret_ident_response(char ident_response[],
- bool *error_p, char ident_username[])
+interpret_ident_response(char *ident_response,
+ bool *error_p, char *ident_username)
{
/*----------------------------------------------------------------------------
- Parse the string "ident_response[]" as a response from a query to an Ident
+ Parse the string "*ident_response" as a response from a query to an Ident
server. If it's a normal response indicating a username, return
- *error_p == false and the username as ident_username[]. If it's anything
- else, return *error_p == true and ident_username[] undefined.
+ *error_p == false and the username as *ident_username. If it's anything
+ else, return *error_p == true and *ident_username undefined.
----------------------------------------------------------------------------*/
- char *cursor; /* Cursor into ident_response[] */
+ char *cursor; /* Cursor into *ident_response */
cursor = &ident_response[0];
@@ -474,7 +474,7 @@ interpret_ident_response(char ident_response[],
{
/* We're positioned to colon before response type field */
char response_type[80];
- int i; /* Index into response_type[] */
+ int i; /* Index into *response_type */
cursor++; /* Go over colon */
while (isblank(*cursor))
@@ -508,7 +508,7 @@ interpret_ident_response(char ident_response[],
*error_p = true;
else
{
- int i; /* Index into ident_username[] */
+ int i; /* Index into *ident_username */
cursor++; /* Go over colon */
while (isblank(*cursor))
@@ -531,18 +531,18 @@ interpret_ident_response(char ident_response[],
static void
ident(const struct in_addr remote_ip_addr, const struct in_addr local_ip_addr,
const ushort remote_port, const ushort local_port,
- bool *ident_failed, char ident_username[])
+ bool *ident_failed, char *ident_username)
{
/*--------------------------------------------------------------------------
Talk to the ident server on host "remote_ip_addr" and find out who
owns the tcp connection from his port "remote_port" to port
"local_port_addr" on host "local_ip_addr". Return the username the
- ident server gives as "ident_username[]".
+ ident server gives as "*ident_username".
IP addresses and port numbers are in network byte order.
But iff we're unable to get the information from ident, return
- *ident_failed == true (and ident_username[] undefined).
+ *ident_failed == true (and *ident_username undefined).
----------------------------------------------------------------------------*/
int sock_fd;
@@ -644,7 +644,7 @@ ident(const struct in_addr remote_ip_addr, const struct in_addr local_ip_addr,
static void
parse_map_record(FILE *file,
- char file_map[], char file_pguser[], char file_iuser[])
+ char *file_map, char *file_pguser, char *file_iuser)
{
/*---------------------------------------------------------------------------
Take the noncomment line which is next on file "file" and interpret
@@ -689,9 +689,9 @@ parse_map_record(FILE *file,
static void
verify_against_open_usermap(FILE *file,
- const char pguser[],
- const char ident_username[],
- const char usermap_name[],
+ const char *pguser,
+ const char *ident_username,
+ const char *usermap_name,
bool *checks_out_p)
{
/*--------------------------------------------------------------------------
@@ -740,9 +740,9 @@ verify_against_open_usermap(FILE *file,
static void
-verify_against_usermap(const char pguser[],
- const char ident_username[],
- const char usermap_name[],
+verify_against_usermap(const char *pguser,
+ const char *ident_username,
+ const char *usermap_name,
bool *checks_out_p)
{
/*--------------------------------------------------------------------------
@@ -821,14 +821,14 @@ verify_against_usermap(const char pguser[],
int
authident(struct sockaddr_in * raddr, struct sockaddr_in * laddr,
- const char postgres_username[],
- const char auth_arg[])
+ const char *postgres_username,
+ const char *auth_arg)
{
/*---------------------------------------------------------------------------
Talk to the ident server on the remote host and find out who owns the
connection described by "port". Then look in the usermap file under
- the usermap auth_arg[] and see if that user is equivalent to
- Postgres user user[].
+ the usermap *auth_arg and see if that user is equivalent to
+ Postgres user *user.
Return STATUS_OK if yes.
---------------------------------------------------------------------------*/
@@ -850,7 +850,7 @@ authident(struct sockaddr_in * raddr, struct sockaddr_in * laddr,
verify_against_usermap(postgres_username, ident_username, auth_arg,
&checks_out);
- return (checks_out ? STATUS_OK : STATUS_ERROR);
+ return checks_out ? STATUS_OK : STATUS_ERROR;
}
@@ -930,7 +930,7 @@ InRange(char *buf, int host)
if (valid)
{
FromAddr = file_ip_addr.s_addr;
- return ((unsigned) FromAddr == (unsigned) host);
+ return (unsigned) FromAddr == (unsigned) host;
}
}
}
@@ -938,7 +938,7 @@ InRange(char *buf, int host)
}
void
-GetCharSetByHost(char TableName[], int host, const char DataDir[])
+GetCharSetByHost(char *TableName, int host, const char *DataDir)
{
FILE *file;
char buf[MAX_TOKEN],
@@ -1064,5 +1064,5 @@ hba_getauthmethod(SockAddr *raddr, char *user, char *database,
find_hba_entry(raddr, user, database, &host_ok, auth_method, auth_arg);
- return (host_ok ? STATUS_OK : STATUS_ERROR);
+ return host_ok ? STATUS_OK : STATUS_ERROR;
}
diff --git a/src/backend/libpq/portal.c b/src/backend/libpq/portal.c
index ac5240e1926..679d9bdc9b5 100644
--- a/src/backend/libpq/portal.c
+++ b/src/backend/libpq/portal.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portal.c,v 1.15 1998/07/13 16:34:48 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portal.c,v 1.16 1998/09/01 03:22:48 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -48,7 +48,7 @@
* communicate with a backend or by user-defined functions which
* are compiled or dynamically loaded into a backend.
*
- * the portals[] array should be organized as a hash table for
+ * the *portals array should be organized as a hash table for
* quick portal-by-name lookup.
*
* Do not confuse "PortalEntry" (or "PortalBuffer") with "Portal"
@@ -79,9 +79,9 @@ in_range(char *msg, int value, int min, int max)
msg, value, min, max);
pqdebug("%s", PQerrormsg);
fputs(PQerrormsg, stderr);
- return (0);
+ return 0;
}
- return (1);
+ return 1;
}
static int
@@ -92,9 +92,9 @@ valid_pointer(char *msg, void *ptr)
sprintf(PQerrormsg, "FATAL: %s\n", msg);
pqdebug("%s", PQerrormsg);
fputs(PQerrormsg, stderr);
- return (0);
+ return 0;
}
- return (1);
+ return 1;
}
@@ -122,7 +122,7 @@ PQnportals(int rule_p)
++n;
}
}
- return (n);
+ return n;
}
/* --------------------------------
@@ -172,8 +172,8 @@ PQparray(char *pname)
return NULL;
if ((i = pbuf_getIndex(pname)) < 0)
- return ((PortalBuffer *) NULL);
- return (portals[i]->portal);
+ return (PortalBuffer *) NULL;
+ return portals[i]->portal;
}
/* --------------------------------
@@ -184,9 +184,9 @@ int
PQrulep(PortalBuffer *portal)
{
if (!valid_pointer("PQrulep: invalid portal pointer", portal))
- return (-1);
+ return -1;
- return (portal->rule_p);
+ return portal->rule_p;
}
/* --------------------------------
@@ -197,15 +197,15 @@ int
PQntuples(PortalBuffer *portal)
{
if (!valid_pointer("PQntuples: invalid portal pointer", portal))
- return (-1);
+ return -1;
- return (portal->no_tuples);
+ return portal->no_tuples;
}
int
PQninstances(PortalBuffer *portal)
{
- return (PQntuples(portal));
+ return PQntuples(portal);
}
/* --------------------------------
@@ -216,9 +216,9 @@ int
PQngroups(PortalBuffer *portal)
{
if (!valid_pointer("PQngroups: invalid portal pointer", portal))
- return (-1);
+ return -1;
- return (portal->no_groups);
+ return portal->no_groups;
}
/* --------------------------------
@@ -233,18 +233,18 @@ PQntuplesGroup(PortalBuffer *portal, int group_index)
if (!valid_pointer("PQntuplesGroup: invalid portal pointer", portal) ||
!in_range("PQntuplesGroup: group index",
group_index, 0, portal->no_groups))
- return (-1);
+ return -1;
gbp = pbuf_findGroup(portal, group_index);
if (gbp)
- return (gbp->no_tuples);
- return (-1);
+ return gbp->no_tuples;
+ return -1;
}
int
PQninstancesGroup(PortalBuffer *portal, int group_index)
{
- return (PQntuplesGroup(portal, group_index));
+ return PQntuplesGroup(portal, group_index);
}
/* --------------------------------
@@ -259,11 +259,11 @@ PQnfieldsGroup(PortalBuffer *portal, int group_index)
if (!valid_pointer("PQnfieldsGroup: invalid portal pointer", portal) ||
!in_range("PQnfieldsGroup: group index",
group_index, 0, portal->no_groups))
- return (-1);
+ return -1;
gbp = pbuf_findGroup(portal, group_index);
if (gbp)
- return (gbp->no_fields);
- return (-1);
+ return gbp->no_fields;
+ return -1;
}
/* --------------------------------
@@ -281,11 +281,11 @@ PQfnumberGroup(PortalBuffer *portal, int group_index, char *field_name)
field_name) ||
!in_range("PQfnumberGroup: group index",
group_index, 0, portal->no_groups))
- return (-1);
+ return -1;
gbp = pbuf_findGroup(portal, group_index);
if (gbp)
- return (pbuf_findFnumber(gbp, field_name));
- return (-1);
+ return pbuf_findFnumber(gbp, field_name);
+ return -1;
}
/* --------------------------------
@@ -301,13 +301,13 @@ PQfnameGroup(PortalBuffer *portal, int group_index, int field_number)
if (!valid_pointer("PQfnameGroup: invalid portal pointer", portal) ||
!in_range("PQfnameGroup: group index",
group_index, 0, portal->no_groups))
- return ((char *) NULL);
+ return (char *) NULL;
if ((gbp = pbuf_findGroup(portal, group_index)) &&
in_range("PQfnameGroup: field number",
field_number, 0, gbp->no_fields))
- return (pbuf_findFname(gbp, field_number));
- return ((char *) NULL);
+ return pbuf_findFname(gbp, field_number);
+ return (char *) NULL;
}
/* --------------------------------
@@ -323,12 +323,12 @@ PQftypeGroup(PortalBuffer *portal, int group_index, int field_number)
if (!valid_pointer("PQftypeGroup: invalid portal pointer", portal) ||
!in_range("PQftypeGroup: group index",
group_index, 0, portal->no_groups))
- return (-1);
+ return -1;
if ((gbp = pbuf_findGroup(portal, group_index)) &&
in_range("PQftypeGroup: field number", field_number, 0, gbp->no_fields))
- return (gbp->types[field_number].typid);
- return (-1);
+ return gbp->types[field_number].typid;
+ return -1;
}
/* --------------------------------
@@ -344,12 +344,12 @@ PQfsizeGroup(PortalBuffer *portal, int group_index, int field_number)
if (!valid_pointer("PQfsizeGroup: invalid portal pointer", portal) ||
!in_range("PQfsizeGroup: tuple index",
group_index, 0, portal->no_groups))
- return (-1);
+ return -1;
if ((gbp = pbuf_findGroup(portal, group_index)) &&
in_range("PQfsizeGroup: field number", field_number, 0, gbp->no_fields))
- return (gbp->types[field_number].typlen);
- return (-1);
+ return gbp->types[field_number].typlen;
+ return -1;
}
@@ -366,7 +366,7 @@ PQgroup(PortalBuffer *portal, int tuple_index)
if (!valid_pointer("PQgroup: invalid portal pointer", portal) ||
!in_range("PQgroup: tuple index",
tuple_index, 0, portal->no_tuples))
- return ((GroupBuffer *) NULL);
+ return (GroupBuffer *) NULL;
for (gbp = portal->groups;
gbp && tuple_index >= (tuple_count += gbp->no_tuples);
@@ -374,8 +374,8 @@ PQgroup(PortalBuffer *portal, int tuple_index)
;
if (!in_range("PQgroup: tuple not found: tuple index",
tuple_index, 0, tuple_count))
- return ((GroupBuffer *) NULL);
- return (gbp);
+ return (GroupBuffer *) NULL;
+ return gbp;
}
/* --------------------------------
@@ -393,7 +393,7 @@ PQgetgroup(PortalBuffer *portal, int tuple_index)
if (!valid_pointer("PQgetgroup: invalid portal pointer", portal) ||
!in_range("PQgetgroup: tuple index",
tuple_index, 0, portal->no_tuples))
- return (-1);
+ return -1;
for (gbp = portal->groups;
gbp && tuple_index >= (tuple_count += gbp->no_tuples);
@@ -401,8 +401,8 @@ PQgetgroup(PortalBuffer *portal, int tuple_index)
++group_count;
if (!gbp || !in_range("PQgetgroup: tuple not found: tuple index",
tuple_index, 0, tuple_count))
- return (-1);
- return (group_count);
+ return -1;
+ return group_count;
}
/* --------------------------------
@@ -417,11 +417,11 @@ PQnfields(PortalBuffer *portal, int tuple_index)
if (!valid_pointer("PQnfields: invalid portal pointer", portal) ||
!in_range("PQnfields: tuple index",
tuple_index, 0, portal->no_tuples))
- return (-1);
+ return -1;
gbp = PQgroup(portal, tuple_index);
if (gbp)
- return (gbp->no_fields);
- return (-1);
+ return gbp->no_fields;
+ return -1;
}
/* --------------------------------
@@ -438,11 +438,11 @@ PQfnumber(PortalBuffer *portal, int tuple_index, char *field_name)
!valid_pointer("PQfnumber: invalid field name pointer", field_name) ||
!in_range("PQfnumber: tuple index",
tuple_index, 0, portal->no_tuples))
- return (-1);
+ return -1;
gbp = PQgroup(portal, tuple_index);
if (gbp)
- return (pbuf_findFnumber(gbp, field_name));
- return (-1);
+ return pbuf_findFnumber(gbp, field_name);
+ return -1;
}
/* --------------------------------
@@ -457,13 +457,13 @@ PQfname(PortalBuffer *portal, int tuple_index, int field_number)
if (!valid_pointer("PQfname: invalid portal pointer", portal) ||
!in_range("PQfname: tuple index",
tuple_index, 0, portal->no_tuples))
- return ((char *) NULL);
+ return (char *) NULL;
if ((gbp = PQgroup(portal, tuple_index)) &&
in_range("PQfname: field number",
field_number, 0, gbp->no_fields))
- return (pbuf_findFname(gbp, field_number));
- return ((char *) NULL);
+ return pbuf_findFname(gbp, field_number);
+ return (char *) NULL;
}
/* --------------------------------
@@ -478,12 +478,12 @@ PQftype(PortalBuffer *portal, int tuple_index, int field_number)
if (!valid_pointer("PQftype: invalid portal pointer", portal) ||
!in_range("PQfname: tuple index",
tuple_index, 0, portal->no_tuples))
- return (-1);
+ return -1;
if ((gbp = PQgroup(portal, tuple_index)) &&
in_range("PQftype: field number", field_number, 0, gbp->no_fields))
- return (gbp->types[field_number].typid);
- return (-1);
+ return gbp->types[field_number].typid;
+ return -1;
}
/* --------------------------------
@@ -498,12 +498,12 @@ PQfsize(PortalBuffer *portal, int tuple_index, int field_number)
if (!valid_pointer("PQfsize: invalid portal pointer", portal) ||
!in_range("PQfsize: tuple index",
tuple_index, 0, portal->no_tuples))
- return (-1);
+ return -1;
if ((gbp = PQgroup(portal, tuple_index)) &&
in_range("PQfsize: field number", field_number, 0, gbp->no_fields))
- return (gbp->types[field_number].typlen);
- return (-1);
+ return gbp->types[field_number].typlen;
+ return -1;
}
@@ -524,13 +524,13 @@ PQsametype(PortalBuffer *portal, int tuple_index1, int tuple_index2)
tuple_index1, 0, portal->no_tuples) ||
!in_range("PQsametype: tuple index 2",
tuple_index2, 0, portal->no_tuples))
- return (-1);
+ return -1;
gbp1 = PQgroup(portal, tuple_index1);
gbp2 = PQgroup(portal, tuple_index2);
if (gbp1 && gbp2)
- return (gbp1 == gbp2);
- return (-1);
+ return gbp1 == gbp2;
+ return -1;
}
static TupleBlock *
@@ -547,7 +547,7 @@ PQGetTupleBlock(PortalBuffer *portal,
tuple_offset) ||
!in_range("PQGetTupleBlock: tuple index",
tuple_index, 0, portal->no_tuples))
- return ((TupleBlock *) NULL);
+ return (TupleBlock *) NULL;
for (gbp = portal->groups;
gbp && tuple_index >= (tuple_count += gbp->no_tuples);
@@ -556,7 +556,7 @@ PQGetTupleBlock(PortalBuffer *portal,
if (!gbp ||
!in_range("PQGetTupleBlock: tuple not found: tuple index",
tuple_index, 0, tuple_count))
- return ((TupleBlock *) NULL);
+ return (TupleBlock *) NULL;
tuple_count -= gbp->no_tuples;
for (tbp = gbp->tuples;
tbp && tuple_index >= (tuple_count += TupleBlockSize);
@@ -565,11 +565,11 @@ PQGetTupleBlock(PortalBuffer *portal,
if (!tbp ||
!in_range("PQGetTupleBlock: tuple not found: tuple index",
tuple_index, 0, tuple_count))
- return ((TupleBlock *) NULL);
+ return (TupleBlock *) NULL;
tuple_count -= TupleBlockSize;
*tuple_offset = tuple_index - tuple_count;
- return (tbp);
+ return tbp;
}
/* --------------------------------
@@ -586,8 +586,8 @@ PQgetvalue(PortalBuffer *portal,
tbp = PQGetTupleBlock(portal, tuple_index, &tuple_offset);
if (tbp)
- return (tbp->values[tuple_offset][field_number]);
- return ((char *) NULL);
+ return tbp->values[tuple_offset][field_number];
+ return (char *) NULL;
}
/* --------------------------------
@@ -634,8 +634,8 @@ PQgetlength(PortalBuffer *portal,
tbp = PQGetTupleBlock(portal, tuple_index, &tuple_offset);
if (tbp)
- return (tbp->lengths[tuple_offset][field_number]);
- return (-1);
+ return tbp->lengths[tuple_offset][field_number];
+ return -1;
}
/* ----------------
@@ -708,7 +708,7 @@ PQnotifies()
PQcleanNotify();
e = DLGetHead(pqNotifyList);
- return (e ? (PQNotifyList *) DLE_VAL(e) : NULL);
+ return e ? (PQNotifyList *) DLE_VAL(e) : NULL;
}
void
diff --git a/src/backend/libpq/portalbuf.c b/src/backend/libpq/portalbuf.c
index f3cbf22a20b..21eef4c8fcc 100644
--- a/src/backend/libpq/portalbuf.c
+++ b/src/backend/libpq/portalbuf.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.10 1998/02/26 04:31:52 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.11 1998/09/01 03:22:49 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -115,7 +115,7 @@ pbuf_alloc(size_t size)
if (addr == (caddr_t) NULL)
libpq_raise(&MemoryError, form("Cannot Allocate space."));
- return (addr);
+ return addr;
}
/* --------------------------------
@@ -152,7 +152,7 @@ pbuf_addPortal()
portal->no_groups = 0;
portal->groups = NULL;
- return (portal);
+ return portal;
}
/* --------------------------------
@@ -184,7 +184,7 @@ pbuf_addGroup(PortalBuffer *portal)
group1->next = group;
}
- return (group);
+ return group;
}
/* --------------------------------
@@ -199,7 +199,7 @@ pbuf_addTypes(int n)
types = (TypeBlock *)
pbuf_alloc(n * sizeof(TypeBlock));
- return (types);
+ return types;
}
/* --------------------------------
@@ -217,7 +217,7 @@ pbuf_addTuples()
tuples->next = NULL;
tuples->tuple_index = 0;
- return (tuples);
+ return tuples;
}
/* --------------------------------
@@ -373,7 +373,7 @@ pbuf_getIndex(char *pname)
return i;
}
- return (-1);
+ return -1;
}
/* --------------------------------
@@ -465,7 +465,7 @@ pbuf_findGroup(PortalBuffer *portal,
libpq_raise(&PortalError,
form("Group index %d out of bound.", group_index));
- return (group);
+ return group;
}
/* --------------------------------
@@ -483,7 +483,7 @@ pbuf_findFnumber(GroupBuffer *group,
for (i = 0; i < group->no_fields; i++)
if (strncmp(types[i].name, field_name, NAMEDATALEN) == 0)
- return (i);
+ return i;
libpq_raise(&PortalError,
form("Field-name %s does not exist.", field_name));
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index 1a67903959d..f44176400ce 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.51 1998/08/25 21:32:10 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.52 1998/09/01 03:22:50 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -139,8 +139,8 @@ pq_getport()
char *envport = getenv("PGPORT");
if (envport)
- return (atoi(envport));
- return (atoi(DEF_PGPORT));
+ return atoi(envport);
+ return atoi(DEF_PGPORT);
}
/* --------------------------------
@@ -194,7 +194,7 @@ pq_getstr(char *s, int maxlen)
if (Pfin == (FILE *) NULL)
{
/* elog(DEBUG, "Input descriptor is null"); */
- return (EOF);
+ return EOF;
}
while (maxlen-- && (c = pq_getc(Pfin)) != EOF && c)
@@ -215,8 +215,8 @@ pq_getstr(char *s, int maxlen)
* -----------------
*/
if (c == EOF)
- return (EOF);
- return (!EOF);
+ return EOF;
+ return !EOF;
}
/*
@@ -240,7 +240,7 @@ int
PQgetline(char *s, int maxlen)
{
if (!Pfin || !s || maxlen <= 1)
- return (EOF);
+ return EOF;
if (fgets(s, maxlen - 1, Pfin) == NULL)
return feof(Pfin) ? EOF : 1;
@@ -275,7 +275,7 @@ PQputline(char *s)
fputs(s, Pfout);
fflush(Pfout);
}
- return (0);
+ return 0;
}
/* --------------------------------
@@ -438,7 +438,7 @@ pq_getinaddr(struct sockaddr_in * sin,
if (!(hs = gethostbyname(host)))
{
perror(host);
- return (1);
+ return 1;
}
if (hs->h_addrtype != AF_INET)
{
@@ -447,7 +447,7 @@ pq_getinaddr(struct sockaddr_in * sin,
host);
fputs(PQerrormsg, stderr);
pqdebug("%s", PQerrormsg);
- return (1);
+ return 1;
}
memmove((char *) &sin->sin_addr,
hs->h_addr,
@@ -456,7 +456,7 @@ pq_getinaddr(struct sockaddr_in * sin,
}
sin->sin_family = AF_INET;
sin->sin_port = htons(port);
- return (0);
+ return 0;
}
/* --------------------------------
@@ -469,7 +469,7 @@ pq_getinserv(struct sockaddr_in * sin, char *host, char *serv)
struct servent *ss;
if (*serv >= '0' && *serv <= '9')
- return (pq_getinaddr(sin, host, atoi(serv)));
+ return pq_getinaddr(sin, host, atoi(serv));
if (!(ss = getservbyname(serv, NULL)))
{
sprintf(PQerrormsg,
@@ -477,9 +477,9 @@ pq_getinserv(struct sockaddr_in * sin, char *host, char *serv)
serv);
fputs(PQerrormsg, stderr);
pqdebug("%s", PQerrormsg);
- return (1);
+ return 1;
}
- return (pq_getinaddr(sin, host, ntohs(ss->s_port)));
+ return pq_getinaddr(sin, host, ntohs(ss->s_port));
}
/*
@@ -535,7 +535,7 @@ StreamServerPort(char *hostName, short portName, int *fdP)
errno);
fputs(PQerrormsg, stderr);
pqdebug("%s", PQerrormsg);
- return (STATUS_ERROR);
+ return STATUS_ERROR;
}
if ((setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *) &one,
sizeof(one))) == -1)
@@ -545,7 +545,7 @@ StreamServerPort(char *hostName, short portName, int *fdP)
errno);
fputs(PQerrormsg, stderr);
pqdebug("%s", PQerrormsg);
- return (STATUS_ERROR);
+ return STATUS_ERROR;
}
MemSet((char *) &saddr, 0, sizeof(saddr));
saddr.sa.sa_family = family;
@@ -590,7 +590,7 @@ StreamServerPort(char *hostName, short portName, int *fdP)
else
strcat(PQerrormsg, "\tIf not, wait a few seconds and retry.\n");
fputs(PQerrormsg, stderr);
- return (STATUS_ERROR);
+ return STATUS_ERROR;
}
if (family == AF_UNIX) {
@@ -620,7 +620,7 @@ StreamServerPort(char *hostName, short portName, int *fdP)
*fdP = fd;
if (family == AF_UNIX)
chmod(sock_path, 0777);
- return (STATUS_OK);
+ return STATUS_OK;
}
/*
@@ -647,7 +647,7 @@ StreamConnection(int server_fd, Port *port)
&addrlen)) < 0)
{
elog(ERROR, "postmaster: StreamConnection: accept: %m");
- return (STATUS_ERROR);
+ return STATUS_ERROR;
}
/* fill in the server (local) address */
@@ -656,7 +656,7 @@ StreamConnection(int server_fd, Port *port)
&addrlen) < 0)
{
elog(ERROR, "postmaster: StreamConnection: getsockname: %m");
- return (STATUS_ERROR);
+ return STATUS_ERROR;
}
if (family == AF_INET)
{
@@ -667,20 +667,20 @@ StreamConnection(int server_fd, Port *port)
if (pe == NULL)
{
elog(ERROR, "postmaster: getprotobyname failed");
- return (STATUS_ERROR);
+ return STATUS_ERROR;
}
if (setsockopt(port->sock, pe->p_proto, TCP_NODELAY,
&on, sizeof(on)) < 0)
{
elog(ERROR, "postmaster: setsockopt failed");
- return (STATUS_ERROR);
+ return STATUS_ERROR;
}
}
/* reset to non-blocking */
fcntl(port->sock, F_SETFL, 1);
- return (STATUS_OK);
+ return STATUS_OK;
}
/*
@@ -722,7 +722,7 @@ StreamOpen(char *hostName, short portName, Port *port)
hostName);
fputs(PQerrormsg, stderr);
pqdebug("%s", PQerrormsg);
- return (STATUS_ERROR);
+ return STATUS_ERROR;
}
memmove((char *) &(port->raddr.in.sin_addr),
(char *) hp->h_addr,
@@ -744,7 +744,7 @@ StreamOpen(char *hostName, short portName, Port *port)
errno);
fputs(PQerrormsg, stderr);
pqdebug("%s", PQerrormsg);
- return (STATUS_ERROR);
+ return STATUS_ERROR;
}
err = connect(port->sock, &port->raddr.sa, len);
if (err < 0)
@@ -754,7 +754,7 @@ StreamOpen(char *hostName, short portName, Port *port)
errno);
fputs(PQerrormsg, stderr);
pqdebug("%s", PQerrormsg);
- return (STATUS_ERROR);
+ return STATUS_ERROR;
}
/* fill in the client address */
@@ -765,10 +765,10 @@ StreamOpen(char *hostName, short portName, Port *port)
errno);
fputs(PQerrormsg, stderr);
pqdebug("%s", PQerrormsg);
- return (STATUS_ERROR);
+ return STATUS_ERROR;
}
- return (STATUS_OK);
+ return STATUS_OK;
}
#ifdef MULTIBYTE
diff --git a/src/backend/libpq/pqsignal.c b/src/backend/libpq/pqsignal.c
index 8829af19ca3..ab5afd12ebc 100644
--- a/src/backend/libpq/pqsignal.c
+++ b/src/backend/libpq/pqsignal.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/pqsignal.c,v 1.8 1998/06/15 19:28:27 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/pqsignal.c,v 1.9 1998/09/01 03:22:52 momjian Exp $
*
* NOTES
* This shouldn't be in libpq, but the monitor and some other
@@ -58,7 +58,7 @@ pqsignal(int signo, pqsigfunc func)
if (signo != SIGALRM)
act.sa_flags |= SA_RESTART;
if (sigaction(signo, &act, &oact) < 0)
- return (SIG_ERR);
- return (oact.sa_handler);
+ return SIG_ERR;
+ return oact.sa_handler;
#endif /* !USE_POSIX_SIGNALS */
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-02 22:19:14 +0000