Update pgeasy.

bmomjian · bmomjian · commit 433c213533d4 · 1999-10-11T18:51:10.000Z
diff --git a/src/interfaces/libpgeasy/Makefile.in b/src/interfaces/libpgeasy/Makefile.in
@@ -4,7 +4,7 @@
 #    Makefile for pgeasy library
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpgeasy/Attic/Makefile.in,v 1.2 1999/10/11 18:16:06 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpgeasy/Attic/Makefile.in,v 1.3 1999/10/11 18:51:09 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -15,11 +15,13 @@ SO_MINOR_VERSION= 0
 SRCDIR= @top_srcdir@
 include $(SRCDIR)/Makefile.global
 
+CFLAGS+= -I$(LIBPQDIR)
+
 ifdef KRBVERS
 CFLAGS+= $(KRBFLAGS)
 endif
 
-OBJS= pgeasy.o halt.o
+OBJS= libpgeasy.o halt.o
 
 SHLIB_LINK+= -L../libpq -lpq
 
@@ -38,9 +40,9 @@ include $(SRCDIR)/Makefile.shlib
 
 install: install-headers install-lib $(install-shlib-dep)
 
-install-headers: pgeasy.h
+install-headers: libpgeasy.h
 	@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
-	$(INSTALL) $(INSTLOPTS) pgeasy.h $(HEADERDIR)/pgeasy.h
+	$(INSTALL) $(INSTLOPTS) libpgeasy.h $(HEADERDIR)/libpgeasy.h
 
 .PHONY: clean
 
diff --git a/src/interfaces/libpgeasy/examples/pginsert.c b/src/interfaces/libpgeasy/examples/pginsert.c
@@ -6,8 +6,8 @@
 #include <stdio.h>
 #include <time.h>
 #include <libpq-fe.h>
-#include "halt.h"
-#include "pgeasy.h"
+#include "../halt.h"
+#include "libpgeasy.h"
 
 int
 main(int argc, char **argv)
diff --git a/src/interfaces/libpgeasy/examples/pgnulltest.c b/src/interfaces/libpgeasy/examples/pgnulltest.c
@@ -7,9 +7,9 @@
 
 #include <stdio.h>
 #include <time.h>
-#include <halt.h>
 #include <libpq-fe.h>
-#include <pgeasy.h>
+#include "../halt.h"
+#include "libpgeasy.h"
 
 int
 main(int argc, char **argv)
diff --git a/src/interfaces/libpgeasy/examples/pgwordcount.c b/src/interfaces/libpgeasy/examples/pgwordcount.c
@@ -4,9 +4,9 @@
 */
 
 #include <stdio.h>
-#include "halt.h"
 #include <libpq-fe.h>
-#include "pgeasy.h"
+#include "../halt.h"
+#include "libpgeasy.h"
 
 int
 main(int argc, char **argv)
diff --git a/src/interfaces/libpgeasy/halt.c b/src/interfaces/libpgeasy/halt.c
@@ -5,32 +5,28 @@
 **		This is used to print out error messages and exit
 */
 
-#include <varargs.h>
+#include <stdarg.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-
+#include "halt.h"
 
 /*-------------------------------------------------------------------------
 **
 **		halt - print error message, and call clean up routine or exit
 **
 **------------------------------------------------------------------------*/
 
-/*VARARGS*/
 void
-halt(va_alist)
-va_dcl
+halt(char *format, ...)
 {
 	va_list		arg_ptr;
-	char	   *format,
-			   *pstr;
+	char	   *pstr;
 	void		(*sig_func) ();
 
-	va_start(arg_ptr);
-	format = va_arg(arg_ptr, char *);
+	va_start(arg_ptr, format);
 	if (strncmp(format, "PERROR", 6) != 0)
 		vfprintf(stderr, format, arg_ptr);
 	else
diff --git a/src/interfaces/libpgeasy/halt.h b/src/interfaces/libpgeasy/halt.h
@@ -3,4 +3,4 @@
 **
 */
 
-void		halt();
+void		halt(char *format,...);
diff --git a/src/interfaces/libpgeasy/pgeasy.3 b/src/interfaces/libpgeasy/pgeasy.3
diff --git a/src/interfaces/libpgeasy/pgeasy.c b/src/interfaces/libpgeasy/pgeasy.c
diff --git a/src/interfaces/libpgeasy/pgeasy.h b/src/interfaces/libpgeasy/pgeasy.h
