pgpool2.git / summary / log / commit / refs
commit 5946d733aad007a3fce13f6179252bf85d9cebae
Author: Tatsuo Ishii <ishii@postgresql.org>
Date: Mon Apr 08 13:22:30 2013 +0000
Remove "//" comments.
pcp/pcp.c | 8 ++++----
pgpool_adm/pgpool_adm.c | 1 -
pool_config.c | 28 +++-------------------------
3 files changed, 7 insertions(+), 30 deletions(-)
diff --git a/pcp/pcp.c b/pcp/pcp.c
index 62cd755a8..497a632f5 100644
--- a/pcp/pcp.c
+++ b/pcp/pcp.c
@@ -8,7 +8,7 @@
* pgpool: a language independent connection pool server for PostgreSQL
* written by Tatsuo Ishii
*
- * Copyright (c) 2003-2011 PgPool Global Development Group
+ * Copyright (c) 2003-2013 PgPool Global Development Group
*
* Permission to use, copy, modify, and distribute this software and
* its documentation for any purpose and without fee is hereby
@@ -763,7 +763,7 @@ pcp_process_info(int pid, int *array_size)
}
else
{
- // never reached
+ /* never reached */
}
}
}
@@ -1053,7 +1053,7 @@ pcp_systemdb_info(void)
}
else
{
- // never reached
+ /* never reached */
}
}
}
@@ -1361,7 +1361,7 @@ pcp_pool_status(int *array_size)
}
else
{
- // never reached
+ /* never reached */
}
}
}
diff --git a/pgpool_adm/pgpool_adm.c b/pgpool_adm/pgpool_adm.c
index 33154f3e9..bb6e9a705 100644
--- a/pgpool_adm/pgpool_adm.c
+++ b/pgpool_adm/pgpool_adm.c
@@ -311,7 +311,6 @@ _pcp_pool_status(PG_FUNCTION_ARGS)
TupleDescInitEntry(tupdesc, (AttrNumber) 1, "item", TEXTOID, -1, 0);
TupleDescInitEntry(tupdesc, (AttrNumber) 2, "value", TEXTOID, -1, 0);
TupleDescInitEntry(tupdesc, (AttrNumber) 3, "description", TEXTOID, -1, 0);
- //tupdesc = BlessTupleDesc(tupdesc);
/*
* Generate attribute metadata needed later to produce tuples from raw
diff --git a/pool_config.c b/pool_config.c
index 6c68ea428..f19378e84 100644
--- a/pool_config.c
+++ b/pool_config.c
@@ -490,7 +490,7 @@ char *yytext;
* pgpool: a language independent connection pool server for PostgreSQL
* written by Tatsuo Ishii
*
- * Copyright (c) 2003-2012 PgPool Global Development Group
+ * Copyright (c) 2003-2013 PgPool Global Development Group
*
* Permission to use, copy, modify, and distribute this software and
* its documentation for any purpose and without fee is hereby
@@ -3578,17 +3578,6 @@ int pool_get_config(char *confpath, POOL_CONFIG_CONTEXT context)
}
pool_config->log_per_node_statement = v;
}
- else if (!strcmp(key, "log_statement") && CHECK_CONTEXT(INIT_CONFIG|RELOAD_CONFIG, context))
- {
- int v = eval_logical(yytext);
-
- if (v < 0)
- {
- pool_error("pool_config: invalid value %s for %s", yytext, key);
- return(-1);
- }
- pool_config->log_statement = v;
- }
else if (!strcmp(key, "lobj_lock_table") && CHECK_CONTEXT(INIT_CONFIG|RELOAD_CONFIG, context))
{
@@ -3687,6 +3676,7 @@ int pool_get_config(char *confpath, POOL_CONFIG_CONTEXT context)
}
pool_config->use_watchdog = v;
}
+
else if (!strcmp(key, "trusted_servers") && CHECK_CONTEXT(INIT_CONFIG, context))
{
char *str;
@@ -4199,18 +4189,6 @@ int pool_get_config(char *confpath, POOL_CONFIG_CONTEXT context)
}
pool_config->memqcache_total_size = v;
}
- else if (!strcmp(key, "memqcache_total_size") && CHECK_CONTEXT(INIT_CONFIG, context))
- {
- int v = atoi(yytext);
-
- if (token != POOL_INTEGER || v < 0)
- {
- pool_error("pool_config: %s must be equal or higher than 0 numeric value", key);
- fclose(fd);
- return(-1);
- }
- pool_config->memqcache_total_size = v;
- }
else if (!strcmp(key, "memqcache_max_num_cache") && CHECK_CONTEXT(INIT_CONFIG, context))
{
int v = atoi(yytext);
@@ -4356,7 +4334,7 @@ int pool_get_config(char *confpath, POOL_CONFIG_CONTEXT context)
if (log_destination_changed)
{
- // log_destination has changed, we need to open syslog or close it
+ /* log_destination has changed, we need to open syslog or close it */
if (!strcmp(pool_config->log_destination, "stderr"))
{
closelog();
[parent: 5f2adf6ba6cc]