diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2017-05-16 20:36:35 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2017-05-16 20:36:35 -0400 |
| commit | c079673dcb7f210617c9fc1470e6bf166d8a2971 (patch) | |
| tree | cd8a2c6834da8d1157f11a38cb6272dc48e42dd1 /contrib/btree_gist/btree_utils_num.c | |
| parent | ddd243584a0f353bbaba260d976cc41b251bbf21 (diff) | |
| download | postgresql-c079673dcb7f210617c9fc1470e6bf166d8a2971.tar.gz postgresql-c079673dcb7f210617c9fc1470e6bf166d8a2971.zip | |
Preventive maintenance in advance of pgindent run.
Reformat various places in which pgindent will make a mess, and
fix a few small violations of coding style that I happened to notice
while perusing the diffs from a pgindent dry run.
There is one actual bug fix here: the need-to-enlarge-the-buffer code
path in icu_convert_case was obviously broken. Perhaps it's unreachable
in our usage? Or maybe this is just sadly undertested.
Diffstat (limited to 'contrib/btree_gist/btree_utils_num.c')
| -rw-r--r-- | contrib/btree_gist/btree_utils_num.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/contrib/btree_gist/btree_utils_num.c b/contrib/btree_gist/btree_utils_num.c index d4fee91ee17..bae32c4064d 100644 --- a/contrib/btree_gist/btree_utils_num.c +++ b/contrib/btree_gist/btree_utils_num.c @@ -183,9 +183,11 @@ gbt_num_union(GBT_NUMKEY *out, const GistEntryVector *entryvec, const gbtree_nin cur = (GBT_NUMKEY *) DatumGetPointer((entryvec->vector[i].key)); c.lower = &cur[0]; c.upper = &cur[tinfo->size]; - if ((*tinfo->f_gt) (o.lower, c.lower, flinfo)) /* out->lower > cur->lower */ + /* if out->lower > cur->lower, adopt cur as lower */ + if ((*tinfo->f_gt) (o.lower, c.lower, flinfo)) memcpy((void *) o.lower, (void *) c.lower, tinfo->size); - if ((*tinfo->f_lt) (o.upper, c.upper, flinfo)) /* out->upper < cur->upper */ + /* if out->upper < cur->upper, adopt cur as upper */ + if ((*tinfo->f_lt) (o.upper, c.upper, flinfo)) memcpy((void *) o.upper, (void *) c.upper, tinfo->size); } @@ -274,7 +276,8 @@ gbt_num_consistent(const GBT_NUMKEY_R *key, if (is_leaf) retval = (*tinfo->f_eq) (query, key->lower, flinfo); else - retval = ((*tinfo->f_le) (key->lower, query, flinfo) && (*tinfo->f_le) (query, key->upper, flinfo)) ? true : false; + retval = ((*tinfo->f_le) (key->lower, query, flinfo) && + (*tinfo->f_le) (query, key->upper, flinfo)); break; case BTGreaterStrategyNumber: if (is_leaf) @@ -287,7 +290,7 @@ gbt_num_consistent(const GBT_NUMKEY_R *key, break; case BtreeGistNotEqualStrategyNumber: retval = (!((*tinfo->f_eq) (query, key->lower, flinfo) && - (*tinfo->f_eq) (query, key->upper, flinfo))) ? true : false; + (*tinfo->f_eq) (query, key->upper, flinfo))); break; default: retval = false; |