aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2004-10-25 02:30:29 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2004-10-25 02:30:29 +0000
commit0636d55843b7e042aa6088f031926317c1c6212c (patch)
tree5292f09e24890b1e2e8194cc6dc372b02bc9453b
parentf1283ed6cc4db5df781452b5f048dc930cc6a172 (diff)
downloadpostgresql-0636d55843b7e042aa6088f031926317c1c6212c.tar.gz
postgresql-0636d55843b7e042aa6088f031926317c1c6212c.zip
Fix some more 'old-style parameter declaration' warnings.
-rw-r--r--contrib/tsearch/parser.l19
-rw-r--r--contrib/tsearch2/wordparser/parser.l24
2 files changed, 30 insertions, 13 deletions
diff --git a/contrib/tsearch/parser.l b/contrib/tsearch/parser.l
index 3eb411dded3..19a37e27b35 100644
--- a/contrib/tsearch/parser.l
+++ b/contrib/tsearch/parser.l
@@ -274,18 +274,25 @@ ftp"://" {
%%
/* clearing after parsing from string */
-void end_parse() {
- if (s) { free(s); s=NULL; }
+void
+end_parse(void)
+{
+ if (s)
+ {
+ free(s);
+ s = NULL;
+ }
tsearch_yy_delete_buffer( buf );
buf = NULL;
}
/* start parse from string */
-void start_parse_str(char* str, int limit) {
- if (buf) end_parse();
+void
+start_parse_str(char* str, int limit)
+{
+ if (buf)
+ end_parse();
buf = tsearch_yy_scan_bytes( str, limit );
tsearch_yy_switch_to_buffer( buf );
BEGIN INITIAL;
}
-
-
diff --git a/contrib/tsearch2/wordparser/parser.l b/contrib/tsearch2/wordparser/parser.l
index 8c46edf7b8b..179c99c9dac 100644
--- a/contrib/tsearch2/wordparser/parser.l
+++ b/contrib/tsearch2/wordparser/parser.l
@@ -23,7 +23,8 @@ typedef struct {
static TagStorage ts={0,0,NULL};
static void
-addTag() {
+addTag(void)
+{
while( ts.clen+tsearch2_yyleng+1 > ts.tlen ) {
ts.tlen*=2;
ts.str=realloc(ts.str,ts.tlen);
@@ -38,7 +39,8 @@ addTag() {
}
static void
-startTag() {
+startTag(void)
+{
if ( ts.str==NULL ) {
ts.tlen=tsearch2_yyleng+1;
ts.str=malloc(ts.tlen);
@@ -319,17 +321,25 @@ ftp"://" {
%%
/* clearing after parsing from string */
-void tsearch2_end_parse() {
- if (s) { free(s); s=NULL; }
+void
+tsearch2_end_parse(void)
+{
+ if (s)
+ {
+ free(s);
+ s = NULL;
+ }
tsearch2_yy_delete_buffer( buf );
buf = NULL;
}
/* start parse from string */
-void tsearch2_start_parse_str(char* str, int limit) {
- if (buf) tsearch2_end_parse();
+void
+tsearch2_start_parse_str(char* str, int limit)
+{
+ if (buf)
+ tsearch2_end_parse();
buf = tsearch2_yy_scan_bytes( str, limit );
tsearch2_yy_switch_to_buffer( buf );
BEGIN INITIAL;
}
-