database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-03 20:02:46 +03:00
Code Activity

This patch reduces some unsightly #ifdefs, and fixes two typos in

Browse Source 
comments in the psql code. This doesn't make any functional change, so
feel free to save it for 7.5

Neil Conway
This commit is contained in:
Bruce Momjian
2003-12-01 22:14:40 +00:00
parent abd5d75c4c
commit 35ddc2edee
6 changed files with 31 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/bin/psql/command.c
View File

@ -3,13 +3,12 @@
*
* Copyright (c) 2000-2003, PostgreSQL Global Development Group
*
* $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.106 2003/11/29 19:52:06 pgsql Exp $
* $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.107 2003/12/01 22:14:40 momjian Exp $
*/
#include "postgres_fe.h"
#include "command.h"
#include <errno.h>
#include <assert.h>
#include <ctype.h>
#ifdef HAVE_PWD_H
#include <pwd.h>
@ -97,10 +96,7 @@ HandleSlashCmds(const char *line,
const char *continue_parse = NULL; /* tell the mainloop where the
* backslash command ended */
#ifdef USE_ASSERT_CHECKING
assert(line);
#endif
psql_assert(line);
my_line = xstrdup(line);
/*
@ -1234,9 +1230,7 @@ unescape(const unsigned char *source, size_t len)
*tmp;
size_t length;
#ifdef USE_ASSERT_CHECKING
assert(source);
#endif
psql_assert(source);
length = Min(len, strlen(source)) + 1;
@ -1515,12 +1509,7 @@ editFile(const char *fname)
char *sys;
int result;
#ifdef USE_ASSERT_CHECKING
assert(fname);
#else
if (!fname)
return false;
#endif
psql_assert(fname);
/* Find an editor to use */
editorName = getenv("PSQL_EDITOR");
@ -1755,12 +1744,7 @@ do_pset(const char *param, const char *value, printQueryOpt *popt, bool quiet)
{
size_t vallen = 0;
#ifdef USE_ASSERT_CHECKING
assert(param);
#else
if (!param)
return false;
#endif
psql_assert(param);
if (value)
vallen = strlen(value);