diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2013-10-22 07:04:41 -0400 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2013-10-22 07:04:41 -0400 |
| commit | 586a8fc75bf266214d635cdcf527176b80f808ea (patch) | |
| tree | 3b2d7f87ec4ebb48e4107946293c829c7ccb2c66 | |
| parent | 36f4c7843cf3d201279855ed9a6ebc1deb3c9463 (diff) | |
| download | postgresql-586a8fc75bf266214d635cdcf527176b80f808ea.tar.gz postgresql-586a8fc75bf266214d635cdcf527176b80f808ea.zip | |
Make use of psprintf() in recent changes
| -rw-r--r-- | src/backend/utils/adt/geo_ops.c | 6 | ||||
| -rw-r--r-- | src/backend/utils/error/elog.c | 5 |
2 files changed, 2 insertions, 9 deletions
diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c index b792d269772..25f0bfd3943 100644 --- a/src/backend/utils/adt/geo_ops.c +++ b/src/backend/utils/adt/geo_ops.c @@ -1010,16 +1010,12 @@ Datum line_out(PG_FUNCTION_ARGS) { LINE *line = PG_GETARG_LINE_P(0); - char *buf; int ndig = DBL_DIG + extra_float_digits; if (ndig < 1) ndig = 1; - buf = palloc(ndig * 3 + 5); - sprintf(buf, "{%.*g,%.*g,%.*g}", ndig, line->A, ndig, line->B, ndig, line->C); - - PG_RETURN_CSTRING(buf); + PG_RETURN_CSTRING(psprintf("{%.*g,%.*g,%.*g}", ndig, line->A, ndig, line->B, ndig, line->C)); } /* diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index eb62ff5054c..9c7489a9bb2 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -2364,10 +2364,7 @@ log_line_prefix(StringInfo buf, ErrorData *edata) */ char *hostport; - int alloclen = strlen(MyProcPort->remote_host) + - strlen(MyProcPort->remote_port) + 3; - hostport = palloc(alloclen); - sprintf(hostport, "%s(%s)", MyProcPort->remote_host, MyProcPort->remote_port); + hostport = psprintf("%s(%s)", MyProcPort->remote_host, MyProcPort->remote_port); appendStringInfo(buf, "%*s", padding, hostport); pfree(hostport); } |