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 /src/backend/utils/adt/pg_locale.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 'src/backend/utils/adt/pg_locale.c')
| -rw-r--r-- | src/backend/utils/adt/pg_locale.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c index 2a2c9bc5046..e2ccac2d2a5 100644 --- a/src/backend/utils/adt/pg_locale.c +++ b/src/backend/utils/adt/pg_locale.c @@ -1381,12 +1381,14 @@ pg_newlocale_from_collation(Oid collid) actual_versionstr = get_collation_actual_version(collform->collprovider, collcollate); if (!actual_versionstr) + { /* This could happen when specifying a version in CREATE * COLLATION for a libc locale, or manually creating a mess * in the catalogs. */ ereport(ERROR, (errmsg("collation \"%s\" has no actual version, but a version was specified", NameStr(collform->collname)))); + } collversionstr = TextDatumGetCString(collversion); if (strcmp(actual_versionstr, collversionstr) != 0) |