database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-27 12:41:57 +03:00
Code Activity

Standardize naming of malloc/realloc/strdup wrapper functions.

Browse Source 
We had a number of variants on the theme of "malloc or die", with the
majority named like "pg_malloc", but by no means all.  Standardize on the
names pg_malloc, pg_malloc0, pg_realloc, pg_strdup.  Get rid of pg_calloc
entirely in favor of using pg_malloc0.

This is an essentially cosmetic change, so no back-patch.  (I did find
a couple of places where psql and pg_dump were using plain malloc or
strdup instead of the pg_ versions, but they don't look significant
enough to bother back-patching.)
This commit is contained in:
Tom Lane
2012-10-02 15:35:10 -04:00
parent 779f80b75d
commit a563d94180
28 changed files with 223 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
contrib/pgbench/pgbench.c
View File

@ -295,7 +295,7 @@ static void *threadRun(void *arg);
* routines to check mem allocations and fail noisily.
*/
static void *
xmalloc(size_t size)
pg_malloc(size_t size)
{
void *result;
@ -309,7 +309,7 @@ xmalloc(size_t size)
}
static void *
xrealloc(void *ptr, size_t size)
pg_realloc(void *ptr, size_t size)
{
void *result;
@ -323,7 +323,7 @@ xrealloc(void *ptr, size_t size)
}
static char *
xstrdup(const char *s)
pg_strdup(const char *s)
{
char *result;
@ -574,17 +574,17 @@ putVariable(CState *st, const char *context, char *name, char *value)
}
if (st->variables)
newvars = (Variable *) xrealloc(st->variables,
newvars = (Variable *) pg_realloc(st->variables,
(st->nvariables + 1) * sizeof(Variable));
else
newvars = (Variable *) xmalloc(sizeof(Variable));
newvars = (Variable *) pg_malloc(sizeof(Variable));
st->variables = newvars;
var = &newvars[st->nvariables];
var->name = xstrdup(name);
var->value = xstrdup(value);
var->name = pg_strdup(name);
var->value = pg_strdup(value);
st->nvariables++;
@ -596,7 +596,7 @@ putVariable(CState *st, const char *context, char *name, char *value)
char *val;
/* dup then free, in case value is pointing at this variable */
val = xstrdup(value);
val = pg_strdup(value);
free(var->value);
var->value = val;
@ -618,7 +618,7 @@ parseVariable(const char *sql, int *eaten)
if (i == 1)
return NULL;
name = xmalloc(i);
name = pg_malloc(i);
memcpy(name, &sql[1], i - 1);
name[i - 1] = '\0';
@ -635,7 +635,7 @@ replaceVariable(char **sql, char *param, int len, char *value)
{
size_t offset = param - *sql;
*sql = xrealloc(*sql, strlen(*sql) - len + valueln + 1);
*sql = pg_realloc(*sql, strlen(*sql) - len + valueln + 1);
param = *sql + offset;
}
@ -971,7 +971,7 @@ top:
{
char *sql;
sql = xstrdup(command->argv[0]);
sql = pg_strdup(command->argv[0]);
sql = assignVariables(st, sql);
if (debug)
@ -1496,7 +1496,7 @@ parseQuery(Command *cmd, const char *raw_sql)
char *sql,
*p;
sql = xstrdup(raw_sql);
sql = pg_strdup(raw_sql);
cmd->argc = 1;
p = sql;
@ -1558,8 +1558,8 @@ process_commands(char *buf)
return NULL;
/* Allocate and initialize Command structure */
my_commands = (Command *) xmalloc(sizeof(Command));
my_commands->line = xstrdup(buf);
my_commands = (Command *) pg_malloc(sizeof(Command));
my_commands->line = pg_strdup(buf);
my_commands->command_num = num_commands++;
my_commands->type = 0; /* until set */
my_commands->argc = 0;
@ -1573,7 +1573,7 @@ process_commands(char *buf)
while (tok != NULL)
{
my_commands->argv[j++] = xstrdup(tok);
my_commands->argv[j++] = pg_strdup(tok);
my_commands->argc++;
tok = strtok(NULL, delim);
}
@ -1675,7 +1675,7 @@ process_commands(char *buf)
switch (querymode)
{
case QUERY_SIMPLE:
my_commands->argv[0] = xstrdup(p);
my_commands->argv[0] = pg_strdup(p);
my_commands->argc++;
break;
case QUERY_EXTENDED:
@ -1709,7 +1709,7 @@ process_file(char *filename)
}
alloc_num = COMMANDS_ALLOC_NUM;
my_commands = (Command **) xmalloc(sizeof(Command *) * alloc_num);
my_commands = (Command **) pg_malloc(sizeof(Command *) * alloc_num);
if (strcmp(filename, "-") == 0)
fd = stdin;
@ -1735,7 +1735,7 @@ process_file(char *filename)
if (lineno >= alloc_num)
{
alloc_num += COMMANDS_ALLOC_NUM;
my_commands = xrealloc(my_commands, sizeof(Command *) * alloc_num);
my_commands = pg_realloc(my_commands, sizeof(Command *) * alloc_num);
}
}
fclose(fd);
@ -1758,7 +1758,7 @@ process_builtin(char *tb)
int alloc_num;
alloc_num = COMMANDS_ALLOC_NUM;
my_commands = (Command **) xmalloc(sizeof(Command *) * alloc_num);
my_commands = (Command **) pg_malloc(sizeof(Command *) * alloc_num);
lineno = 0;
@ -1789,7 +1789,7 @@ process_builtin(char *tb)
if (lineno >= alloc_num)
{
alloc_num += COMMANDS_ALLOC_NUM;
my_commands = xrealloc(my_commands, sizeof(Command *) * alloc_num);
my_commands = pg_realloc(my_commands, sizeof(Command *) * alloc_num);
}
}
@ -1961,7 +1961,7 @@ main(int argc, char **argv)
else if ((env = getenv("PGUSER")) != NULL && *env != '\0')
login = env;
state = (CState *) xmalloc(sizeof(CState));
state = (CState *) pg_malloc(sizeof(CState));
memset(state, 0, sizeof(CState));
while ((c = getopt_long(argc, argv, "ih:nvp:dSNc:j:Crs:t:T:U:lf:D:F:M:", long_options, &optindex)) != -1)
@ -2184,7 +2184,7 @@ main(int argc, char **argv)
if (nclients > 1)
{
state = (CState *) xrealloc(state, sizeof(CState) * nclients);
state = (CState *) pg_realloc(state, sizeof(CState) * nclients);
memset(state + 1, 0, sizeof(CState) * (nclients - 1));
/* copy any -D switch values to all clients */
@ -2308,7 +2308,7 @@ main(int argc, char **argv)
}
/* set up thread data structures */
threads = (TState *) xmalloc(sizeof(TState) * nthreads);
threads = (TState *) pg_malloc(sizeof(TState) * nthreads);
for (i = 0; i < nthreads; i++)
{
TState *thread = &threads[i];
@ -2326,9 +2326,9 @@ main(int argc, char **argv)
int t;
thread->exec_elapsed = (instr_time *)
xmalloc(sizeof(instr_time) * num_commands);
pg_malloc(sizeof(instr_time) * num_commands);
thread->exec_count = (int *)
xmalloc(sizeof(int) * num_commands);
pg_malloc(sizeof(int) * num_commands);
for (t = 0; t < num_commands; t++)
{
@ -2419,7 +2419,7 @@ threadRun(void *arg)
int remains = nstate; /* number of remaining clients */
int i;
result = xmalloc(sizeof(TResult));
result = pg_malloc(sizeof(TResult));
INSTR_TIME_SET_ZERO(result->conn_time);
/* open log file if requested */
@ -2632,7 +2632,7 @@ pthread_create(pthread_t *thread,
fork_pthread *th;
void *ret;
th = (fork_pthread *) xmalloc(sizeof(fork_pthread));
th = (fork_pthread *) pg_malloc(sizeof(fork_pthread));
if (pipe(th->pipes) < 0)
{
free(th);
@ -2680,7 +2680,7 @@ pthread_join(pthread_t th, void **thread_return)
if (thread_return != NULL)
{
/* assume result is TResult */
*thread_return = xmalloc(sizeof(TResult));
*thread_return = pg_malloc(sizeof(TResult));
if (read(th->pipes[0], *thread_return, sizeof(TResult)) != sizeof(TResult))
{
free(*thread_return);
@ -2748,7 +2748,7 @@ pthread_create(pthread_t *thread,
int save_errno;
win32_pthread *th;
th = (win32_pthread *) xmalloc(sizeof(win32_pthread));
th = (win32_pthread *) pg_malloc(sizeof(win32_pthread));
th->routine = start_routine;
th->arg = arg;
th->result = NULL;