diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2010-08-02 02:29:39 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2010-08-02 02:29:39 +0000 |
| commit | e621037eec4a1c9ec2d7056c9c1c11b9b03932cb (patch) | |
| tree | 79d1b68b7221885f13b23f4739cbe5a149d2239d /src/backend/regex/regexec.c | |
| parent | fbcf2cfb53513b9ade1c897e088aeb27252c43d7 (diff) | |
| download | postgresql-e621037eec4a1c9ec2d7056c9c1c11b9b03932cb.tar.gz postgresql-e621037eec4a1c9ec2d7056c9c1c11b9b03932cb.zip | |
Tweak a couple of macros in the regex code to suppress compiler warnings
from "clang". The VERR changes make an assignment unconditional, which is
probably easier to read/understand anyway, and one can hardly argue that
it's worth shaving cycles off the case of reporting another error when
one has already been detected. The INSIST change limits where that macro
can be used, but not in a way that creates a problem for any existing call.
Diffstat (limited to 'src/backend/regex/regexec.c')
| -rw-r--r-- | src/backend/regex/regexec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/regex/regexec.c b/src/backend/regex/regexec.c index 60a03a417ee..0e8b2fb2836 100644 --- a/src/backend/regex/regexec.c +++ b/src/backend/regex/regexec.c @@ -27,7 +27,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $PostgreSQL: pgsql/src/backend/regex/regexec.c,v 1.28 2010/02/01 02:45:29 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/regex/regexec.c,v 1.29 2010/08/02 02:29:39 tgl Exp $ * */ @@ -119,7 +119,7 @@ struct vars #define VISERR(vv) ((vv)->err != 0) /* have we seen an error yet? */ #define ISERR() VISERR(v) -#define VERR(vv,e) (((vv)->err) ? (vv)->err : ((vv)->err = (e))) +#define VERR(vv,e) ((vv)->err = ((vv)->err ? (vv)->err : (e))) #define ERR(e) VERR(v, e) /* record an error */ #define NOERR() {if (ISERR()) return v->err;} /* if error seen, return it */ #define OFF(p) ((p) - v->start) |