From 0ccf3c88771a25d518ac8a6150b7fbdc0bf83fd4 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 28 Apr 2000 22:49:25 +0000
Subject: [PATCH] Update pgeasy examples

---
 contrib/findoidjoins/findoidjoins.c             | 2 +-
 src/interfaces/libpgeasy/examples/pginsert.c    | 2 +-
 src/interfaces/libpgeasy/examples/pgnulltest.c  | 2 +-
 src/interfaces/libpgeasy/examples/pgwordcount.c | 2 +-
 src/interfaces/libpgeasy/libpgeasy.c            | 4 +++-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/contrib/findoidjoins/findoidjoins.c b/contrib/findoidjoins/findoidjoins.c
index 226cf24388..56e936b8a5 100644
--- a/contrib/findoidjoins/findoidjoins.c
+++ b/contrib/findoidjoins/findoidjoins.c
@@ -8,7 +8,7 @@
 #include "libpq-fe.h"
 
 #include "halt.h"
-#include "libpgeasy.h"
+#include <libpgeasy.h>
 
 PGresult   *attres,
 		   *relres;
diff --git a/src/interfaces/libpgeasy/examples/pginsert.c b/src/interfaces/libpgeasy/examples/pginsert.c
index 18b5382ede..933d0ab182 100644
--- a/src/interfaces/libpgeasy/examples/pginsert.c
+++ b/src/interfaces/libpgeasy/examples/pginsert.c
@@ -7,7 +7,7 @@
 #include <time.h>
 #include <libpq-fe.h>
 #include "../halt.h"
-#include "libpgeasy.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
index da88efbbe4..7fd8c7f9e2 100644
--- a/src/interfaces/libpgeasy/examples/pgnulltest.c
+++ b/src/interfaces/libpgeasy/examples/pgnulltest.c
@@ -9,7 +9,7 @@
 #include <time.h>
 #include <libpq-fe.h>
 #include "../halt.h"
-#include "libpgeasy.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
index 08138510ea..df8d5b9d0c 100644
--- a/src/interfaces/libpgeasy/examples/pgwordcount.c
+++ b/src/interfaces/libpgeasy/examples/pgwordcount.c
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <libpq-fe.h>
 #include "../halt.h"
-#include "libpgeasy.h"
+#include <libpgeasy.h>
 
 int
 main(int argc, char **argv)
diff --git a/src/interfaces/libpgeasy/libpgeasy.c b/src/interfaces/libpgeasy/libpgeasy.c
index d7fc03e0f3..19b6d84167 100644
--- a/src/interfaces/libpgeasy/libpgeasy.c
+++ b/src/interfaces/libpgeasy/libpgeasy.c
@@ -77,7 +77,9 @@ disconnectdb()
 PGresult   *
 doquery(char *query)
 {
-	if (res != NULL && in_result_block == FALSE && was_get_unset_result == FALSE)
+	if (res != NULL &&
+		in_result_block == FALSE &&
+		was_get_unset_result == FALSE)
 		PQclear(res);
 
 	was_get_unset_result = FALSE;
-- 
2.40.0