summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlvaro Herrera2013-02-12 15:43:09 +0000
committerAlvaro Herrera2013-02-12 15:43:09 +0000
commit0e81ddde2c62ada7f818114ca961d80d42370e32 (patch)
tree4423a21ffde38396c10c416a002aa936fe708a00
parent0f980b0e17d95e77dc2822eb7855d072a5874d9a (diff)
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.
-rw-r--r--src/common/fe_memutils.c10
-rw-r--r--src/include/common/fe_memutils.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/common/fe_memutils.c b/src/common/fe_memutils.c
index 7d4d99eefd..afb42030e7 100644
--- a/src/common/fe_memutils.c
+++ b/src/common/fe_memutils.c
@@ -67,17 +67,17 @@ pg_realloc(void *ptr, size_t size)
* "Safe" wrapper around strdup().
*/
char *
-pg_strdup(const char *string)
+pg_strdup(const char *in)
{
char *tmp;
- if (!string)
+ if (!in)
{
fprintf(stderr,
_("cannot duplicate null pointer (internal error)\n"));
exit(EXIT_FAILURE);
}
- tmp = strdup(string);
+ tmp = strdup(in);
if (!tmp)
{
fprintf(stderr, _("out of memory\n"));
@@ -116,9 +116,9 @@ pfree(void *pointer)
}
char *
-pstrdup(const char *string)
+pstrdup(const char *in)
{
- return pg_strdup(string);
+ return pg_strdup(in);
}
void *
diff --git a/src/include/common/fe_memutils.h b/src/include/common/fe_memutils.h
index cefa7ecedc..13288f476a 100644
--- a/src/include/common/fe_memutils.h
+++ b/src/include/common/fe_memutils.h
@@ -9,7 +9,7 @@
#ifndef 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_malloc0(size_t size);
extern void *pg_realloc(void *pointer, size_t size);