From 0d0644dce82a87ef4b670fb60709ef1fd6a3030c Mon Sep 17 00:00:00 2001 From: Peter Eisentraut <peter_e@gmx.net> Date: Fri, 19 Feb 2016 23:07:46 -0500 Subject: [PATCH] ecpg: Fix typo GCC 6 points out the redundant conditions, which were apparently typos. Reviewed-by: Thomas Munro <thomas.munro@enterprisedb.com> --- src/interfaces/ecpg/test/compat_informix/describe.pgc | 2 +- src/interfaces/ecpg/test/expected/compat_informix-describe.c | 2 +- src/interfaces/ecpg/test/expected/sql-describe.c | 2 +- src/interfaces/ecpg/test/sql/describe.pgc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/interfaces/ecpg/test/compat_informix/describe.pgc b/src/interfaces/ecpg/test/compat_informix/describe.pgc index 1836ac3843d..6fcccc6ab4d 100644 --- a/src/interfaces/ecpg/test/compat_informix/describe.pgc +++ b/src/interfaces/ecpg/test/compat_informix/describe.pgc @@ -150,7 +150,7 @@ exec sql end declare section; exec sql describe st_id2 using descriptor sqlda2; exec sql describe st_id2 into sqlda3; - if (sqlda1 == NULL || sqlda1 == NULL || sqlda2 == NULL) + if (sqlda1 == NULL || sqlda2 == NULL || sqlda3 == NULL) exit(1); strcpy(msg, "get descriptor"); diff --git a/src/interfaces/ecpg/test/expected/compat_informix-describe.c b/src/interfaces/ecpg/test/expected/compat_informix-describe.c index 5951ae6c82d..9eb176ef1d5 100644 --- a/src/interfaces/ecpg/test/expected/compat_informix-describe.c +++ b/src/interfaces/ecpg/test/expected/compat_informix-describe.c @@ -362,7 +362,7 @@ if (sqlca.sqlcode < 0) exit (1);} #line 151 "describe.pgc" - if (sqlda1 == NULL || sqlda1 == NULL || sqlda2 == NULL) + if (sqlda1 == NULL || sqlda2 == NULL || sqlda3 == NULL) exit(1); strcpy(msg, "get descriptor"); diff --git a/src/interfaces/ecpg/test/expected/sql-describe.c b/src/interfaces/ecpg/test/expected/sql-describe.c index 356f5870e8c..d0e39e93565 100644 --- a/src/interfaces/ecpg/test/expected/sql-describe.c +++ b/src/interfaces/ecpg/test/expected/sql-describe.c @@ -360,7 +360,7 @@ if (sqlca.sqlcode < 0) exit (1);} #line 151 "describe.pgc" - if (sqlda1 == NULL || sqlda1 == NULL || sqlda2 == NULL) + if (sqlda1 == NULL || sqlda2 == NULL || sqlda3 == NULL) exit(1); strcpy(msg, "get descriptor"); diff --git a/src/interfaces/ecpg/test/sql/describe.pgc b/src/interfaces/ecpg/test/sql/describe.pgc index cd52c8220be..b95ab351bd0 100644 --- a/src/interfaces/ecpg/test/sql/describe.pgc +++ b/src/interfaces/ecpg/test/sql/describe.pgc @@ -150,7 +150,7 @@ exec sql end declare section; exec sql describe st_id2 using descriptor sqlda2; exec sql describe st_id2 into sqlda3; - if (sqlda1 == NULL || sqlda1 == NULL || sqlda2 == NULL) + if (sqlda1 == NULL || sqlda2 == NULL || sqlda3 == NULL) exit(1); strcpy(msg, "get descriptor"); -- GitLab