Commit 586a8fc7 authored by Peter Eisentraut's avatar Peter Eisentraut

Make use of psprintf() in recent changes

parent 36f4c784
...@@ -1010,16 +1010,12 @@ Datum ...@@ -1010,16 +1010,12 @@ Datum
line_out(PG_FUNCTION_ARGS) line_out(PG_FUNCTION_ARGS)
{ {
LINE *line = PG_GETARG_LINE_P(0); LINE *line = PG_GETARG_LINE_P(0);
char *buf;
int ndig = DBL_DIG + extra_float_digits; int ndig = DBL_DIG + extra_float_digits;
if (ndig < 1) if (ndig < 1)
ndig = 1; ndig = 1;
buf = palloc(ndig * 3 + 5); PG_RETURN_CSTRING(psprintf("{%.*g,%.*g,%.*g}", ndig, line->A, ndig, line->B, ndig, line->C));
sprintf(buf, "{%.*g,%.*g,%.*g}", ndig, line->A, ndig, line->B, ndig, line->C);
PG_RETURN_CSTRING(buf);
} }
/* /*
......
...@@ -2364,10 +2364,7 @@ log_line_prefix(StringInfo buf, ErrorData *edata) ...@@ -2364,10 +2364,7 @@ log_line_prefix(StringInfo buf, ErrorData *edata)
*/ */
char *hostport; char *hostport;
int alloclen = strlen(MyProcPort->remote_host) + hostport = psprintf("%s(%s)", MyProcPort->remote_host, MyProcPort->remote_port);
strlen(MyProcPort->remote_port) + 3;
hostport = palloc(alloclen);
sprintf(hostport, "%s(%s)", MyProcPort->remote_host, MyProcPort->remote_port);
appendStringInfo(buf, "%*s", padding, hostport); appendStringInfo(buf, "%*s", padding, hostport);
pfree(hostport); pfree(hostport);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment