summaryrefslogtreecommitdiff
path: root/contrib/pg_upgrade/util.c
diff options
context:
space:
mode:
authorRobert Haas2013-12-18 18:31:35 +0000
committerRobert Haas2013-12-18 18:31:35 +0000
commit6bb9d3017c173fa6102010d83ced7ad4409e5a49 (patch)
treed7d438c4261686b693a91c73b893bded76460764 /contrib/pg_upgrade/util.c
parent001a573a2011d605f2a6e10aee9996de8581d099 (diff)
Fix compiler warning.
get_user_name returns const char *, but we were assigning the result to a char * variable.
Diffstat (limited to 'contrib/pg_upgrade/util.c')
-rw-r--r--contrib/pg_upgrade/util.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/contrib/pg_upgrade/util.c b/contrib/pg_upgrade/util.c
index c3d45237fde..a7a48d782b5 100644
--- a/contrib/pg_upgrade/util.c
+++ b/contrib/pg_upgrade/util.c
@@ -205,9 +205,10 @@ quote_identifier(const char *s)
* get_user_info()
*/
int
-get_user_info(char **user_name)
+get_user_info(char **user_name_p)
{
int user_id;
+ const char *user_name;
char *errstr;
#ifndef WIN32
@@ -216,12 +217,12 @@ get_user_info(char **user_name)
user_id = 1;
#endif
- *user_name = get_user_name(&errstr);
- if (!*user_name)
+ user_name = get_user_name(&errstr);
+ if (!user_name)
pg_fatal("%s\n", errstr);
/* make a copy */
- *user_name = pg_strdup(*user_name);
+ *user_name_p = pg_strdup(user_name);
return user_id;
}