1
0
mirror of https://github.com/postgres/postgres.git synced 2025-07-08 11:42:09 +03:00

Remove Perl module's unnecessary dependence on libpq-int.h.

This commit is contained in:
Tom Lane
1999-02-11 23:25:16 +00:00
parent 34ecb9d850
commit 847da1a1ee

View File

@ -1,6 +1,6 @@
/*------------------------------------------------------- /*-------------------------------------------------------
* *
* $Id: Pg.xs,v 1.10 1998/12/13 02:50:20 momjian Exp $ * $Id: Pg.xs,v 1.11 1999/02/11 23:25:16 tgl Exp $
* *
* Copyright (c) 1997, 1998 Edmund Mergl * Copyright (c) 1997, 1998 Edmund Mergl
* *
@ -14,7 +14,6 @@
#include <fcntl.h> #include <fcntl.h>
#include "libpq-fe.h" #include "libpq-fe.h"
#include "libpq-int.h" /* need this for sizeof(PGresult) */
typedef struct pg_conn *PG_conn; typedef struct pg_conn *PG_conn;
typedef struct pg_result *PG_result; typedef struct pg_result *PG_result;
@ -352,7 +351,7 @@ PQexec(conn, query)
CODE: CODE:
RETVAL = PQexec(conn, query); RETVAL = PQexec(conn, query);
if (! RETVAL) { if (! RETVAL) {
RETVAL = (PGresult *)calloc(1, sizeof(PGresult)); RETVAL = PQmakeEmptyPGresult(conn, PGRES_FATAL_ERROR);
} }
OUTPUT: OUTPUT:
RETVAL RETVAL
@ -384,7 +383,7 @@ PQgetResult(conn)
CODE: CODE:
RETVAL = PQgetResult(conn); RETVAL = PQgetResult(conn);
if (! RETVAL) { if (! RETVAL) {
RETVAL = (PGresult *)calloc(1, sizeof(PGresult)); RETVAL = PQmakeEmptyPGresult(conn, PGRES_FATAL_ERROR);
} }
OUTPUT: OUTPUT:
RETVAL RETVAL
@ -893,7 +892,7 @@ PQexec(conn, query)
if (RETVAL) { if (RETVAL) {
RETVAL->result = PQexec((PGconn *)conn, query); RETVAL->result = PQexec((PGconn *)conn, query);
if (!RETVAL->result) { if (!RETVAL->result) {
RETVAL->result = (PG_result)calloc(1, sizeof(PGresult)); RETVAL->result = PQmakeEmptyPGresult((PGconn *)conn, PGRES_FATAL_ERROR);
} }
} }
OUTPUT: OUTPUT:
@ -928,7 +927,7 @@ PQgetResult(conn)
if (RETVAL) { if (RETVAL) {
RETVAL->result = PQgetResult((PGconn *)conn); RETVAL->result = PQgetResult((PGconn *)conn);
if (!RETVAL->result) { if (!RETVAL->result) {
RETVAL->result = (PG_result)calloc(1, sizeof(PGresult)); RETVAL->result = PQmakeEmptyPGresult((PGconn *)conn, PGRES_FATAL_ERROR);
} }
} }
OUTPUT: OUTPUT:
@ -994,9 +993,6 @@ PQmakeEmptyPGresult(conn, status)
RETVAL = (PG_results)calloc(1, sizeof(PGresults)); RETVAL = (PG_results)calloc(1, sizeof(PGresults));
if (RETVAL) { if (RETVAL) {
RETVAL->result = PQmakeEmptyPGresult((PGconn *)conn, status); RETVAL->result = PQmakeEmptyPGresult((PGconn *)conn, status);
if (!RETVAL->result) {
RETVAL->result = (PG_result)calloc(1, sizeof(PGresult));
}
} }
OUTPUT: OUTPUT:
RETVAL RETVAL