diff options
| author | Marc G. Fournier <scrappy@hub.org> | 1996-09-16 06:06:17 +0000 |
|---|---|---|
| committer | Marc G. Fournier <scrappy@hub.org> | 1996-09-16 06:06:17 +0000 |
| commit | f589ca68001c82d3e15e86f8e6ff33ad344f7062 (patch) | |
| tree | 5fbbb100320166d48a8d6549fe0c109f82e4b7ed /src/bin/psql/psql.c | |
| parent | 24f001226865d914c6e388ea0f1edb468098bb9d (diff) | |
| download | postgresql-f589ca68001c82d3e15e86f8e6ff33ad344f7062.tar.gz postgresql-f589ca68001c82d3e15e86f8e6ff33ad344f7062.zip | |
The following diffs remove the various definitions of dupstr() and replace
all the calls with strdup.
Submitted by: darcy@druid.druid.com (D'Arcy J.M. Cain)
Diffstat (limited to 'src/bin/psql/psql.c')
| -rw-r--r-- | src/bin/psql/psql.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/bin/psql/psql.c b/src/bin/psql/psql.c index 8ad2dd45eb4..fedd9fb85ba 100644 --- a/src/bin/psql/psql.c +++ b/src/bin/psql/psql.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.20 1996/08/21 00:22:41 julian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.21 1996/09/16 06:06:11 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -631,7 +631,7 @@ HandleSlashCmds(PsqlSettings *settings, if (!optarg) settings->opt.caption=NULL; else - if (!(settings->opt.caption=dupstr(optarg))) + if (!(settings->opt.caption=strdup(optarg))) { perror("malloc"); exit(1); @@ -787,7 +787,7 @@ HandleSlashCmds(PsqlSettings *settings, fs=optarg; if (settings->opt.fieldSep); free(settings->opt.fieldSep); - if (!(settings->opt.fieldSep=dupstr(fs))) + if (!(settings->opt.fieldSep=strdup(fs))) { perror("malloc"); exit(1); @@ -903,13 +903,13 @@ HandleSlashCmds(PsqlSettings *settings, settings->opt.html3 = settings->opt.expanded = 0; settings->opt.align = settings->opt.header = 1; free(settings->opt.fieldSep); - settings->opt.fieldSep=dupstr("|"); + settings->opt.fieldSep=strdup("|"); if (!settings->quiet) fprintf(stderr, "field separater changed to '%s'\n", settings->opt.fieldSep); } else { free(settings->opt.fieldSep); - settings->opt.fieldSep=dupstr(DEFAULT_FIELD_SEP); + settings->opt.fieldSep=strdup(DEFAULT_FIELD_SEP); if (!settings->quiet) fprintf(stderr, "field separater changed to '%s'\n", settings->opt.fieldSep); } @@ -923,7 +923,7 @@ HandleSlashCmds(PsqlSettings *settings, if (!optarg) settings->opt.tableOpt=NULL; else - if (!(settings->opt.tableOpt=dupstr(optarg))) + if (!(settings->opt.tableOpt=strdup(optarg))) { perror("malloc"); exit(1); @@ -1144,7 +1144,7 @@ main(int argc, char **argv) settings.opt.align = 1; settings.opt.header = 1; settings.queryFout = stdout; - settings.opt.fieldSep=dupstr(DEFAULT_FIELD_SEP); + settings.opt.fieldSep=strdup(DEFAULT_FIELD_SEP); settings.opt.pager = 1; if (!isatty(0) || !isatty(1)) settings.quiet = settings.notty = 1; |