Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 0e81ddd

Browse files
committed
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.
1 parent 0f980b0 commit 0e81ddd

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/common/fe_memutils.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,17 @@ pg_realloc(void *ptr, size_t size)
6767
* "Safe" wrapper around strdup().
6868
*/
6969
char *
70-
pg_strdup(const char *string)
70+
pg_strdup(const char *in)
7171
{
7272
char *tmp;
7373

74-
if (!string)
74+
if (!in)
7575
{
7676
fprintf(stderr,
7777
_("cannot duplicate null pointer (internal error)\n"));
7878
exit(EXIT_FAILURE);
7979
}
80-
tmp = strdup(string);
80+
tmp = strdup(in);
8181
if (!tmp)
8282
{
8383
fprintf(stderr, _("out of memory\n"));
@@ -116,9 +116,9 @@ pfree(void *pointer)
116116
}
117117

118118
char *
119-
pstrdup(const char *string)
119+
pstrdup(const char *in)
120120
{
121-
return pg_strdup(string);
121+
return pg_strdup(in);
122122
}
123123

124124
void *

src/include/common/fe_memutils.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef FE_MEMUTILS_H
1010
#define FE_MEMUTILS_H
1111

12-
extern char *pg_strdup(const char *string);
12+
extern char *pg_strdup(const char *in);
1313
extern void *pg_malloc(size_t size);
1414
extern void *pg_malloc0(size_t size);
1515
extern void *pg_realloc(void *pointer, size_t size);

0 commit comments

Comments
 (0)