mirror of
https://github.com/postgres/postgres.git
synced 2025-07-11 10:01:57 +03:00
Rename "string" pstrdup argument to "in"
The former name collides with a symbol also used in the isolation test's parser, causing assorted failures in certain platforms.
This commit is contained in:
@ -67,17 +67,17 @@ pg_realloc(void *ptr, size_t size)
|
|||||||
* "Safe" wrapper around strdup().
|
* "Safe" wrapper around strdup().
|
||||||
*/
|
*/
|
||||||
char *
|
char *
|
||||||
pg_strdup(const char *string)
|
pg_strdup(const char *in)
|
||||||
{
|
{
|
||||||
char *tmp;
|
char *tmp;
|
||||||
|
|
||||||
if (!string)
|
if (!in)
|
||||||
{
|
{
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
_("cannot duplicate null pointer (internal error)\n"));
|
_("cannot duplicate null pointer (internal error)\n"));
|
||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
tmp = strdup(string);
|
tmp = strdup(in);
|
||||||
if (!tmp)
|
if (!tmp)
|
||||||
{
|
{
|
||||||
fprintf(stderr, _("out of memory\n"));
|
fprintf(stderr, _("out of memory\n"));
|
||||||
@ -116,9 +116,9 @@ pfree(void *pointer)
|
|||||||
}
|
}
|
||||||
|
|
||||||
char *
|
char *
|
||||||
pstrdup(const char *string)
|
pstrdup(const char *in)
|
||||||
{
|
{
|
||||||
return pg_strdup(string);
|
return pg_strdup(in);
|
||||||
}
|
}
|
||||||
|
|
||||||
void *
|
void *
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
#ifndef FE_MEMUTILS_H
|
#ifndef FE_MEMUTILS_H
|
||||||
#define FE_MEMUTILS_H
|
#define FE_MEMUTILS_H
|
||||||
|
|
||||||
extern char *pg_strdup(const char *string);
|
extern char *pg_strdup(const char *in);
|
||||||
extern void *pg_malloc(size_t size);
|
extern void *pg_malloc(size_t size);
|
||||||
extern void *pg_malloc0(size_t size);
|
extern void *pg_malloc0(size_t size);
|
||||||
extern void *pg_realloc(void *pointer, size_t size);
|
extern void *pg_realloc(void *pointer, size_t size);
|
||||||
|
Reference in New Issue
Block a user