Rename "string" pstrdup argument to "in"

alvherre · alvherre · commit 0e81ddde2c62 · 2013-02-12T12:43:09.000-03:00
The former name collides with a symbol also used in the isolation test's
parser, causing assorted failures in certain platforms.
diff --git 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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -67,17 +67,17 @@ pg_realloc(void *ptr, size_t size)`
`67`	`67`	`* "Safe" wrapper around strdup().`
`68`	`68`	`*/`
`69`	`69`	`char *`
`70`		`-pg_strdup(const char *string)`
	`70`	`+pg_strdup(const char *in)`
`71`	`71`	`{`
`72`	`72`	`char *tmp;`
`73`	`73`
`74`		`- if (!string)`
	`74`	`+ if (!in)`
`75`	`75`	`{`
`76`	`76`	`fprintf(stderr,`
`77`	`77`	`_("cannot duplicate null pointer (internal error)\n"));`
`78`	`78`	`exit(EXIT_FAILURE);`
`79`	`79`	`}`
`80`		`- tmp = strdup(string);`
	`80`	`+ tmp = strdup(in);`
`81`	`81`	`if (!tmp)`
`82`	`82`	`{`
`83`	`83`	`fprintf(stderr, _("out of memory\n"));`
`@@ -116,9 +116,9 @@ pfree(void *pointer)`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`char *`
`119`		`-pstrdup(const char *string)`
	`119`	`+pstrdup(const char *in)`
`120`	`120`	`{`
`121`		`- return pg_strdup(string);`
	`121`	`+ return pg_strdup(in);`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`void *`