database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-15 19:21:59 +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

19
src/bin/psql/tab-complete.c
View File

@ -3,7 +3,7 @@
*
* Copyright (c) 2000-2003, PostgreSQL Global Development Group
*
* $PostgreSQL: pgsql/src/bin/psql/tab-complete.c,v 1.95 2003/12/01 22:08:01 momjian Exp $
* $PostgreSQL: pgsql/src/bin/psql/tab-complete.c,v 1.96 2003/12/01 22:14:40 momjian Exp $
*/
/*----------------------------------------------------------------------
@ -49,9 +49,6 @@
#ifdef USE_READLINE
#include <ctype.h>
#ifdef USE_ASSERT_CHECKING
#include <assert.h>
#endif
#include "libpq-fe.h"
#include "pqexpbuffer.h"
#include "common.h"
@ -1345,7 +1342,6 @@ psql_completion(char *text, int start, int end)
}
}
/*
* If we still don't have anything to match we have to fabricate some
* sort of default list. If we were to just return NULL, readline
@ -1360,7 +1356,6 @@ psql_completion(char *text, int start, int end)
#endif
}
/* free storage */
free(prev_wd);
free(prev2_wd);
@ -1382,7 +1377,7 @@ psql_completion(char *text, int start, int end)
directly but through the readline interface.
The return value is expected to be the full completion of the text, going
through a list each time, or NULL if there are no more matches. The string
will be free()'d be readline, so you must run it through strdup() or
will be free()'d by readline, so you must run it through strdup() or
something of that sort.
*/
@ -1637,9 +1632,7 @@ complete_from_list(const char *text, int state)
const char *item;
/* need to have a list */
#ifdef USE_ASSERT_CHECKING
assert(completion_charpp);
#endif
psql_assert(completion_charpp);
/* Initialization */
if (state == 0)
@ -1693,9 +1686,7 @@ complete_from_const(const char *text, int state)
(void) text; /* We don't care about what was entered
* already. */
#ifdef USE_ASSERT_CHECKING
assert(completion_charp);
#endif
psql_assert(completion_charp);
if (state == 0)
return xstrdup(completion_charp);
else
@ -1809,7 +1800,7 @@ previous_word(int point, int skip)
/*
* Surround a string with single quotes. This works for both SQL and
* psql internal. Currently disable because it is reported not to
* psql internal. Currently disabled because it is reported not to
* cooperate with certain versions of readline.
*/
static char *