From 09bb369d230c1822671c5f115c12f7201fd09b33 Mon Sep 17 00:00:00 2001 From: Bryan Henderson Date: Fri, 11 Oct 1996 09:47:14 +0000 Subject: [PATCH] Separate general purpose functions from portal functions so they may be used in test drivers. --- src/backend/libpq/Makefile.inc | 8 ++- src/backend/libpq/portal.c | 76 ++----------------------- src/backend/libpq/util.c | 101 +++++++++++++++++++++++++++++++++ 3 files changed, 111 insertions(+), 74 deletions(-) create mode 100644 src/backend/libpq/util.c diff --git a/src/backend/libpq/Makefile.inc b/src/backend/libpq/Makefile.inc index 67052518d3..50c563fa6b 100644 --- a/src/backend/libpq/Makefile.inc +++ b/src/backend/libpq/Makefile.inc @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/libpq/Attic/Makefile.inc,v 1.1.1.1 1996/07/09 06:21:30 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/libpq/Attic/Makefile.inc,v 1.2 1996/10/11 09:47:11 bryanh Exp $ # #------------------------------------------------------------------------- @@ -21,6 +21,8 @@ SRCS_LIBPQ= be-dumpdata.c be-fsstubs.c be-pqexec.c # # These files are shared with the frontend library. # -SRCS_LIBPQ+= auth.c pqcomm.c portal.c portalbuf.c pqpacket.c pqsignal.c +SRCS_LIBPQ+= auth.c hba.c pqcomm.c portal.c util.c portalbuf.c \ + pqpacket.c pqsignal.c -HEADERS+= auth.h be-fsstubs.h libpq-be.h libpq-fs.h libpq.h pqcomm.h pqsignal.h +HEADERS+= auth.h hba.h be-fsstubs.h libpq-be.h libpq-fs.h libpq.h \ + pqcomm.h pqsignal.h diff --git a/src/backend/libpq/portal.c b/src/backend/libpq/portal.c index ca27fd8308..80c3468582 100644 --- a/src/backend/libpq/portal.c +++ b/src/backend/libpq/portal.c @@ -7,17 +7,11 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portal.c,v 1.1.1.1 1996/07/09 06:21:30 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portal.c,v 1.2 1996/10/11 09:47:13 bryanh Exp $ * *------------------------------------------------------------------------- */ /* - * UTILITY ROUTINES - * pqdebug - send a string to the debugging output port - * pqdebug2 - send two strings to stdout - * PQtrace - turn on pqdebug() tracing - * PQuntrace - turn off pqdebug() tracing - * * INTERFACE ROUTINES * PQnportals - Return the number of open portals. * PQpnames - Return all the portal names @@ -70,18 +64,11 @@ #include "utils/exc.h" #include "utils/palloc.h" -/* ---------------- - * exceptions - * ---------------- - */ -Exception MemoryError = {"Memory Allocation Error"}; -Exception PortalError = {"Invalid arguments to portal functions"}; -Exception PostquelError = {"Sql Error"}; -Exception ProtocolError = {"Protocol Error"}; -char PQerrormsg[ERROR_MSG_LENGTH]; -int PQtracep = 0; /* 1 to print out debugging messages */ -FILE *debug_port = (FILE *) NULL; +/* ---------------------------------------------------------------- + * Helper routines for PQ portal interface routines below + * ---------------------------------------------------------------- + */ static int in_range(char *msg, int value, int min, int max) @@ -108,59 +95,6 @@ valid_pointer(char *msg, void *ptr) return(1); } -/* ---------------------------------------------------------------- - * PQ utility routines - * ---------------------------------------------------------------- - */ -void -pqdebug(char *target, char *msg) -{ - if (!target) - return; - - if (PQtracep) { - /* - * if nothing else was suggested default to stdout - */ - if (!debug_port) - debug_port = stdout; - fprintf(debug_port, target, msg); - fprintf(debug_port, "\n"); - } -} - -void -pqdebug2(char *target, char *msg1, char *msg2) -{ - if (!target) - return; - - if (PQtracep) { - /* - * if nothing else was suggested default to stdout - */ - if (!debug_port) - debug_port = stdout; - fprintf(debug_port, target, msg1, msg2); - fprintf(debug_port, "\n"); - } -} - -/* -------------------------------- - * PQtrace() / PQuntrace() - * -------------------------------- - */ -void -PQtrace() -{ - PQtracep = 1; -} - -void -PQuntrace() -{ - PQtracep = 0; -} /* ---------------------------------------------------------------- * PQ portal interface routines diff --git a/src/backend/libpq/util.c b/src/backend/libpq/util.c new file mode 100644 index 0000000000..3330280753 --- /dev/null +++ b/src/backend/libpq/util.c @@ -0,0 +1,101 @@ +/*------------------------------------------------------------------------- + * + * util.c-- + * general routines for libpq backend + * + * Copyright (c) 1994, Regents of the University of California + * + * + * IDENTIFICATION + * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/util.c,v 1.1 1996/10/11 09:47:14 bryanh Exp $ + * + *------------------------------------------------------------------------- + */ +/* + * UTILITY ROUTINES + * pqdebug - send a string to the debugging output port + * pqdebug2 - send two strings to stdout + * PQtrace - turn on pqdebug() tracing + * PQuntrace - turn off pqdebug() tracing + */ + +#include /* for sprintf() */ +#include + +#include "c.h" +#include "lib/dllist.h" +#include "libpq/libpq.h" /* where the declarations go */ +#include "utils/exc.h" +#include "utils/palloc.h" + + +/* ---------------- + * exceptions + * ---------------- + */ +Exception MemoryError = {"Memory Allocation Error"}; +Exception PortalError = {"Invalid arguments to portal functions"}; +Exception PostquelError = {"Sql Error"}; +Exception ProtocolError = {"Protocol Error"}; +char PQerrormsg[ERROR_MSG_LENGTH]; + +int PQtracep = 0; /* 1 to print out debugging messages */ +FILE *debug_port = (FILE *) NULL; + +/* ---------------------------------------------------------------- + * PQ utility routines + * ---------------------------------------------------------------- + */ +void +pqdebug(char *target, char *msg) +{ + if (!target) + return; + + if (PQtracep) { + /* + * if nothing else was suggested default to stdout + */ + if (!debug_port) + debug_port = stdout; + fprintf(debug_port, target, msg); + fprintf(debug_port, "\n"); + } +} + +void +pqdebug2(char *target, char *msg1, char *msg2) +{ + if (!target) + return; + + if (PQtracep) { + /* + * if nothing else was suggested default to stdout + */ + if (!debug_port) + debug_port = stdout; + fprintf(debug_port, target, msg1, msg2); + fprintf(debug_port, "\n"); + } +} + +/* -------------------------------- + * PQtrace() / PQuntrace() + * -------------------------------- + */ +void +PQtrace() +{ + PQtracep = 1; +} + +void +PQuntrace() +{ + PQtracep = 0; +} + + + + -- 2.40.0