database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-25 01:02:05 +03:00
Code Activity

Add use of asprintf()

Browse Source 
Add asprintf(), pg_asprintf(), and psprintf() to simplify string
allocation and composition.  Replacement implementations taken from
NetBSD.

Reviewed-by: Álvaro Herrera <alvherre@2ndquadrant.com>
Reviewed-by: Asif Naeem <anaeem.it@gmail.com>
This commit is contained in:
Peter Eisentraut
2013-10-13 00:09:18 -04:00
parent a53dee43fe
commit 5b6d08cd29
47 changed files with 253 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/backend/utils/adt/dbsize.c
View File

@ -627,18 +627,14 @@ pg_size_pretty_numeric(PG_FUNCTION_ARGS)
Numeric size = PG_GETARG_NUMERIC(0);
Numeric limit,
limit2;
char *buf,
*result;
char *result;
limit = int64_to_numeric(10 * 1024);
limit2 = int64_to_numeric(10 * 1024 * 2 - 1);
if (numeric_is_less(size, limit))
{
buf = numeric_to_cstring(size);
result = palloc(strlen(buf) + 7);
strcpy(result, buf);
strcat(result, " bytes");
result = psprintf("%s bytes", numeric_to_cstring(size));
}
else
{
@ -650,10 +646,7 @@ pg_size_pretty_numeric(PG_FUNCTION_ARGS)
{
/* size = (size + 1) / 2 */
size = numeric_plus_one_over_two(size);
buf = numeric_to_cstring(size);
result = palloc(strlen(buf) + 4);
strcpy(result, buf);
strcat(result, " kB");
result = psprintf("%s kB", numeric_to_cstring(size));
}
else
{
@ -663,10 +656,7 @@ pg_size_pretty_numeric(PG_FUNCTION_ARGS)
{
/* size = (size + 1) / 2 */
size = numeric_plus_one_over_two(size);
buf = numeric_to_cstring(size);
result = palloc(strlen(buf) + 4);
strcpy(result, buf);
strcat(result, " MB");
result = psprintf("%s MB", numeric_to_cstring(size));
}
else
{
@ -677,10 +667,7 @@ pg_size_pretty_numeric(PG_FUNCTION_ARGS)
{
/* size = (size + 1) / 2 */
size = numeric_plus_one_over_two(size);
buf = numeric_to_cstring(size);
result = palloc(strlen(buf) + 4);
strcpy(result, buf);
strcat(result, " GB");
result = psprintf("%s GB", numeric_to_cstring(size));
}
else
{
@ -688,10 +675,7 @@ pg_size_pretty_numeric(PG_FUNCTION_ARGS)
size = numeric_shift_right(size, 10);
/* size = (size + 1) / 2 */
size = numeric_plus_one_over_two(size);
buf = numeric_to_cstring(size);
result = palloc(strlen(buf) + 4);
strcpy(result, buf);
strcat(result, " TB");
result = psprintf("%s TB", numeric_to_cstring(size));
}
}
}