diff options
| author | Peter Eisentraut | 2010-11-23 20:27:50 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2010-11-23 20:34:55 +0000 |
| commit | fc946c39aeacdff7df60c83fca6582985e8546c8 (patch) | |
| tree | 866145f64c09c0673a4aa3d3a2f5647f0b7afc45 /src/backend/utils | |
| parent | 44475e782f4674d257b9e5c1a3930218a4b4deea (diff) | |
Remove useless whitespace at end of lines
Diffstat (limited to 'src/backend/utils')
| -rw-r--r-- | src/backend/utils/Gen_fmgrtab.pl | 2 | ||||
| -rw-r--r-- | src/backend/utils/adt/numeric.c | 4 | ||||
| -rw-r--r-- | src/backend/utils/adt/varlena.c | 20 | ||||
| -rw-r--r-- | src/backend/utils/adt/xml.c | 6 | ||||
| -rwxr-xr-x | src/backend/utils/mb/Unicode/UCS_to_EUC_CN.pl | 2 | ||||
| -rwxr-xr-x | src/backend/utils/mb/Unicode/UCS_to_EUC_JIS_2004.pl | 10 | ||||
| -rwxr-xr-x | src/backend/utils/mb/Unicode/UCS_to_EUC_JP.pl | 2 | ||||
| -rwxr-xr-x | src/backend/utils/mb/Unicode/UCS_to_EUC_KR.pl | 2 | ||||
| -rwxr-xr-x | src/backend/utils/mb/Unicode/UCS_to_EUC_TW.pl | 2 | ||||
| -rwxr-xr-x | src/backend/utils/mb/Unicode/UCS_to_SHIFT_JIS_2004.pl | 8 | ||||
| -rwxr-xr-x | src/backend/utils/mb/Unicode/UCS_to_SJIS.pl | 2 | ||||
| -rw-r--r-- | src/backend/utils/mb/Unicode/ucs2utf.pl | 4 | ||||
| -rw-r--r-- | src/backend/utils/misc/Makefile | 2 | ||||
| -rwxr-xr-x | src/backend/utils/misc/check_guc | 22 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc-file.l | 8 | ||||
| -rw-r--r-- | src/backend/utils/misc/postgresql.conf.sample | 12 | ||||
| -rw-r--r-- | src/backend/utils/mmgr/README | 2 |
17 files changed, 55 insertions, 55 deletions
diff --git a/src/backend/utils/Gen_fmgrtab.pl b/src/backend/utils/Gen_fmgrtab.pl index 57cc5f70ff..797324dcf3 100644 --- a/src/backend/utils/Gen_fmgrtab.pl +++ b/src/backend/utils/Gen_fmgrtab.pl @@ -93,7 +93,7 @@ my $tabfile = $output_path . 'fmgrtab.c'; open H, '>', $oidsfile . $tmpext or die "Could not open $oidsfile$tmpext: $!"; open T, '>', $tabfile . $tmpext or die "Could not open $tabfile$tmpext: $!"; -print H +print H qq|/*------------------------------------------------------------------------- * * fmgroids.h diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c index 9ae6492982..5d29cf6533 100644 --- a/src/backend/utils/adt/numeric.c +++ b/src/backend/utils/adt/numeric.c @@ -102,7 +102,7 @@ typedef int16 NumericDigit; * remaining bits are never examined. Currently, we always initialize these * to zero, but it might be possible to use them for some other purpose in * the future. - * + * * In the NumericShort format, the remaining 14 bits of the header word * (n_short.n_header) are allocated as follows: 1 for sign (positive or * negative), 6 for dynamic scale, and 7 for weight. In practice, most @@ -3725,7 +3725,7 @@ make_result(NumericVar *var) len = NUMERIC_HDRSZ_SHORT + n * sizeof(NumericDigit); result = (Numeric) palloc(len); SET_VARSIZE(result, len); - result->choice.n_short.n_header = + result->choice.n_short.n_header = (sign == NUMERIC_NEG ? (NUMERIC_SHORT | NUMERIC_SHORT_SIGN_MASK) : NUMERIC_SHORT) | (var->dscale << NUMERIC_SHORT_DSCALE_SHIFT) diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c index 15b6d7c4fd..ee83e2f308 100644 --- a/src/backend/utils/adt/varlena.c +++ b/src/backend/utils/adt/varlena.c @@ -3054,7 +3054,7 @@ text_to_array_internal(PG_FUNCTION_ARGS) int start_posn; int end_posn; int chunk_len; - + text_position_setup(inputstring, fldsep, &state); /* @@ -3085,7 +3085,7 @@ text_to_array_internal(PG_FUNCTION_ARGS) PointerGetDatum(inputstring), is_null, 1)); } - + start_posn = 1; /* start_ptr points to the start_posn'th character of inputstring */ start_ptr = VARDATA_ANY(inputstring); @@ -3110,7 +3110,7 @@ text_to_array_internal(PG_FUNCTION_ARGS) /* must build a temp text datum to pass to accumArrayResult */ result_text = cstring_to_text_with_len(start_ptr, chunk_len); is_null = null_string ? text_isequal(result_text, null_string) : false; - + /* stash away this field */ astate = accumArrayResult(astate, PointerGetDatum(result_text), @@ -3133,19 +3133,19 @@ text_to_array_internal(PG_FUNCTION_ARGS) } else { - /* + /* * When fldsep is NULL, each character in the inputstring becomes an * element in the result array. The separator is effectively the space * between characters. */ inputstring_len = VARSIZE_ANY_EXHDR(inputstring); - + /* return empty array for empty input string */ if (inputstring_len < 1) PG_RETURN_ARRAYTYPE_P(construct_empty_array(TEXTOID)); - + start_ptr = VARDATA_ANY(inputstring); - + while (inputstring_len > 0) { int chunk_len = pg_mblen(start_ptr); @@ -3155,7 +3155,7 @@ text_to_array_internal(PG_FUNCTION_ARGS) /* must build a temp text datum to pass to accumArrayResult */ result_text = cstring_to_text_with_len(start_ptr, chunk_len); is_null = null_string ? text_isequal(result_text, null_string) : false; - + /* stash away this field */ astate = accumArrayResult(astate, PointerGetDatum(result_text), @@ -3205,7 +3205,7 @@ array_to_text_null(PG_FUNCTION_ARGS) /* returns NULL when first or second parameter is NULL */ if (PG_ARGISNULL(0) || PG_ARGISNULL(1)) PG_RETURN_NULL(); - + v = PG_GETARG_ARRAYTYPE_P(0); fldsep = text_to_cstring(PG_GETARG_TEXT_PP(1)); @@ -3332,7 +3332,7 @@ array_to_text_internal(FunctionCallInfo fcinfo, ArrayType *v, } } } - + result = cstring_to_text_with_len(buf.data, buf.len); pfree(buf.data); diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c index 6e9c7fe2b0..726780bf37 100644 --- a/src/backend/utils/adt/xml.c +++ b/src/backend/utils/adt/xml.c @@ -3601,7 +3601,7 @@ xml_is_well_formed(PG_FUNCTION_ARGS) { #ifdef USE_LIBXML text *data = PG_GETARG_TEXT_P(0); - + PG_RETURN_BOOL(wellformed_xml(data, xmloption)); #else NO_XML_SUPPORT(); @@ -3614,7 +3614,7 @@ xml_is_well_formed_document(PG_FUNCTION_ARGS) { #ifdef USE_LIBXML text *data = PG_GETARG_TEXT_P(0); - + PG_RETURN_BOOL(wellformed_xml(data, XMLOPTION_DOCUMENT)); #else NO_XML_SUPPORT(); @@ -3627,7 +3627,7 @@ xml_is_well_formed_content(PG_FUNCTION_ARGS) { #ifdef USE_LIBXML text *data = PG_GETARG_TEXT_P(0); - + PG_RETURN_BOOL(wellformed_xml(data, XMLOPTION_CONTENT)); #else NO_XML_SUPPORT(); diff --git a/src/backend/utils/mb/Unicode/UCS_to_EUC_CN.pl b/src/backend/utils/mb/Unicode/UCS_to_EUC_CN.pl index 909c7d272e..f2bf957a2e 100755 --- a/src/backend/utils/mb/Unicode/UCS_to_EUC_CN.pl +++ b/src/backend/utils/mb/Unicode/UCS_to_EUC_CN.pl @@ -8,7 +8,7 @@ # map files provided by Unicode organization. # Unfortunately it is prohibited by the organization # to distribute the map files. So if you try to use this script, -# you have to obtain GB2312.TXT from +# you have to obtain GB2312.TXT from # the organization's ftp site. # # GB2312.TXT format: diff --git a/src/backend/utils/mb/Unicode/UCS_to_EUC_JIS_2004.pl b/src/backend/utils/mb/Unicode/UCS_to_EUC_JIS_2004.pl index 4552e06628..94e850cc7b 100755 --- a/src/backend/utils/mb/Unicode/UCS_to_EUC_JIS_2004.pl +++ b/src/backend/utils/mb/Unicode/UCS_to_EUC_JIS_2004.pl @@ -45,7 +45,7 @@ while($line = <FILE> ){ } else { next; } - + $ucs = hex($u); $code = hex($c); $utf = &ucs2utf($ucs); @@ -73,7 +73,7 @@ for $index ( sort {$a <=> $b} keys( %array ) ){ if( $count == 0 ){ printf FILE " {0x%08x, 0x%06x} /* %s */\n", $index, $code, $comment{ $code }; } else { - printf FILE " {0x%08x, 0x%06x}, /* %s */\n", $index, $code, $comment{ $code }; + printf FILE " {0x%08x, 0x%06x}, /* %s */\n", $index, $code, $comment{ $code }; } } @@ -135,7 +135,7 @@ if ($TEST == 1) { ($code >= 0x8ea1 && $code <= 0x8efe) || ($code >= 0x8fa1a1 && $code <= 0x8ffefe) || ($code >= 0xa1a1 && $code <= 0x8fefe))) { - + $v1 = hex(substr($index, 0, 8)); $v2 = hex(substr($index, 8, 8)); @@ -192,7 +192,7 @@ while($line = <FILE> ){ } else { next; } - + $ucs = hex($u); $code = hex($c); $utf = &ucs2utf($ucs); @@ -220,7 +220,7 @@ for $index ( sort {$a <=> $b} keys( %array ) ){ if( $count == 0 ){ printf FILE " {0x%06x, 0x%08x} /* %s */\n", $index, $code, $comment{ $code }; } else { - printf FILE " {0x%06x, 0x%08x}, /* %s */\n", $index, $code, $comment{ $code }; + printf FILE " {0x%06x, 0x%08x}, /* %s */\n", $index, $code, $comment{ $code }; } } diff --git a/src/backend/utils/mb/Unicode/UCS_to_EUC_JP.pl b/src/backend/utils/mb/Unicode/UCS_to_EUC_JP.pl index daaaea0bd5..2951fc2f1b 100755 --- a/src/backend/utils/mb/Unicode/UCS_to_EUC_JP.pl +++ b/src/backend/utils/mb/Unicode/UCS_to_EUC_JP.pl @@ -8,7 +8,7 @@ # map files provided by Unicode organization. # Unfortunately it is prohibited by the organization # to distribute the map files. So if you try to use this script, -# you have to obtain JIS0201.TXT, JIS0208.TXT, JIS0212.TXT from +# you have to obtain JIS0201.TXT, JIS0208.TXT, JIS0212.TXT from # the organization's ftp site. # # JIS0201.TXT format: diff --git a/src/backend/utils/mb/Unicode/UCS_to_EUC_KR.pl b/src/backend/utils/mb/Unicode/UCS_to_EUC_KR.pl index 4e2296a838..2d44837133 100755 --- a/src/backend/utils/mb/Unicode/UCS_to_EUC_KR.pl +++ b/src/backend/utils/mb/Unicode/UCS_to_EUC_KR.pl @@ -8,7 +8,7 @@ # map files provided by Unicode organization. # Unfortunately it is prohibited by the organization # to distribute the map files. So if you try to use this script, -# you have to obtain OLD5601.TXT from +# you have to obtain OLD5601.TXT from # the organization's ftp site. # # OLD5601.TXT format: diff --git a/src/backend/utils/mb/Unicode/UCS_to_EUC_TW.pl b/src/backend/utils/mb/Unicode/UCS_to_EUC_TW.pl index 9434298927..176f765a28 100755 --- a/src/backend/utils/mb/Unicode/UCS_to_EUC_TW.pl +++ b/src/backend/utils/mb/Unicode/UCS_to_EUC_TW.pl @@ -8,7 +8,7 @@ # map files provided by Unicode organization. # Unfortunately it is prohibited by the organization # to distribute the map files. So if you try to use this script, -# you have to obtain CNS11643.TXT from +# you have to obtain CNS11643.TXT from # the organization's ftp site. # # CNS11643.TXT format: diff --git a/src/backend/utils/mb/Unicode/UCS_to_SHIFT_JIS_2004.pl b/src/backend/utils/mb/Unicode/UCS_to_SHIFT_JIS_2004.pl index 828f34ed5a..5b7254feb0 100755 --- a/src/backend/utils/mb/Unicode/UCS_to_SHIFT_JIS_2004.pl +++ b/src/backend/utils/mb/Unicode/UCS_to_SHIFT_JIS_2004.pl @@ -43,7 +43,7 @@ while($line = <FILE> ){ } else { next; } - + $ucs = hex($u); $code = hex($c); $utf = &ucs2utf($ucs); @@ -71,7 +71,7 @@ for $index ( sort {$a <=> $b} keys( %array ) ){ if( $count == 0 ){ printf FILE " {0x%08x, 0x%06x} /* %s */\n", $index, $code, $comment{ $code }; } else { - printf FILE " {0x%08x, 0x%06x}, /* %s */\n", $index, $code, $comment{ $code }; + printf FILE " {0x%08x, 0x%06x}, /* %s */\n", $index, $code, $comment{ $code }; } } @@ -132,7 +132,7 @@ while($line = <FILE> ){ } else { next; } - + $ucs = hex($u); $code = hex($c); $utf = &ucs2utf($ucs); @@ -161,7 +161,7 @@ for $index ( sort {$a <=> $b} keys( %array ) ){ if( $count == 0 ){ printf FILE " {0x%04x, 0x%08x} /* %s */\n", $index, $code, $comment{ $code }; } else { - printf FILE " {0x%04x, 0x%08x}, /* %s */\n", $index, $code, $comment{ $code }; + printf FILE " {0x%04x, 0x%08x}, /* %s */\n", $index, $code, $comment{ $code }; } } diff --git a/src/backend/utils/mb/Unicode/UCS_to_SJIS.pl b/src/backend/utils/mb/Unicode/UCS_to_SJIS.pl index 00517a03f9..68037bd77a 100755 --- a/src/backend/utils/mb/Unicode/UCS_to_SJIS.pl +++ b/src/backend/utils/mb/Unicode/UCS_to_SJIS.pl @@ -8,7 +8,7 @@ # map files provided by Unicode organization. # Unfortunately it is prohibited by the organization # to distribute the map files. So if you try to use this script, -# you have to obtain SHIFTJIS.TXT from +# you have to obtain SHIFTJIS.TXT from # the organization's ftp site. # # SHIFTJIS.TXT format: diff --git a/src/backend/utils/mb/Unicode/ucs2utf.pl b/src/backend/utils/mb/Unicode/ucs2utf.pl index 6ca982f8cb..7e137f2e47 100644 --- a/src/backend/utils/mb/Unicode/ucs2utf.pl +++ b/src/backend/utils/mb/Unicode/ucs2utf.pl @@ -13,12 +13,12 @@ sub ucs2utf { } elsif ($ucs > 0x007f && $ucs <= 0x07ff) { $utf = (($ucs & 0x003f) | 0x80) | ((($ucs >> 6) | 0xc0) << 8); } elsif ($ucs > 0x07ff && $ucs <= 0xffff) { - $utf = ((($ucs >> 12) | 0xe0) << 16) | + $utf = ((($ucs >> 12) | 0xe0) << 16) | (((($ucs & 0x0fc0) >> 6) | 0x80) << 8) | (($ucs & 0x003f) | 0x80); } else { $utf = ((($ucs >> 18) | 0xf0) << 24) | - (((($ucs & 0x3ffff) >> 12) | 0x80) << 16) | + (((($ucs & 0x3ffff) >> 12) | 0x80) << 16) | (((($ucs & 0x0fc0) >> 6) | 0x80) << 8) | (($ucs & 0x003f) | 0x80); } diff --git a/src/backend/utils/misc/Makefile b/src/backend/utils/misc/Makefile index 0ca57a1f21..cd9ba5d1cc 100644 --- a/src/backend/utils/misc/Makefile +++ b/src/backend/utils/misc/Makefile @@ -37,5 +37,5 @@ endif # Note: guc-file.c is not deleted by 'make clean', # since we want to ship it in distribution tarballs. -clean: +clean: @rm -f lex.yy.c diff --git a/src/backend/utils/misc/check_guc b/src/backend/utils/misc/check_guc index 5152b4e929..293fb0363f 100755 --- a/src/backend/utils/misc/check_guc +++ b/src/backend/utils/misc/check_guc @@ -4,7 +4,7 @@ ## in postgresql.conf.sample: ## 1) the valid config settings may be preceded by a '#', but NOT '# ' ## (we use this to skip comments) -## 2) the valid config settings will be followed immediately by ' =' +## 2) the valid config settings will be followed immediately by ' =' ## (at least one space preceding the '=') ## in guc.c: ## 3) the options have PGC_ on the same line as the option @@ -14,7 +14,7 @@ ## 1) Don't know what to do with TRANSACTION ISOLATION LEVEL ## if an option is valid but shows up in only one file (guc.c but not -## postgresql.conf.sample), it should be listed here so that it +## postgresql.conf.sample), it should be listed here so that it ## can be ignored INTENTIONALLY_NOT_INCLUDED="autocommit debug_deadlocks \ is_superuser lc_collate lc_ctype lc_messages lc_monetary lc_numeric lc_time \ @@ -23,35 +23,35 @@ session_authorization trace_lock_oidmin trace_lock_table trace_locks trace_lwloc trace_notify trace_userlocks transaction_isolation transaction_read_only \ zero_damaged_pages" -### What options are listed in postgresql.conf.sample, but don't appear +### What options are listed in postgresql.conf.sample, but don't appear ### in guc.c? # grab everything that looks like a setting and convert it to lower case -SETTINGS=`grep ' =' postgresql.conf.sample | +SETTINGS=`grep ' =' postgresql.conf.sample | grep -v '^# ' | # strip comments -sed -e 's/^#//' | +sed -e 's/^#//' | awk '{print $1}'` SETTINGS=`echo "$SETTINGS" | tr 'A-Z' 'a-z'` -for i in $SETTINGS ; do +for i in $SETTINGS ; do hidden=0 ## it sure would be nice to replace this with an sql "not in" statement ## it doesn't seem to make sense to have things in .sample and not in guc.c # for hidethis in $INTENTIONALLY_NOT_INCLUDED ; do -# if [ "$hidethis" = "$i" ] ; then +# if [ "$hidethis" = "$i" ] ; then # hidden=1 # fi # done if [ "$hidden" -eq 0 ] ; then grep -i '"'$i'"' guc.c > /dev/null - if [ $? -ne 0 ] ; then - echo "$i seems to be missing from guc.c"; - fi; + if [ $? -ne 0 ] ; then + echo "$i seems to be missing from guc.c"; + fi; fi done -### What options are listed in guc.c, but don't appear +### What options are listed in guc.c, but don't appear ### in postgresql.conf.sample? # grab everything that looks like a setting and convert it to lower case diff --git a/src/backend/utils/misc/guc-file.l b/src/backend/utils/misc/guc-file.l index 3b827958f5..2986d2f25b 100644 --- a/src/backend/utils/misc/guc-file.l +++ b/src/backend/utils/misc/guc-file.l @@ -463,9 +463,9 @@ ParseConfigFile(const char *config_file, const char *calling_file, /* now we must have the option value */ if (token != GUC_ID && - token != GUC_STRING && - token != GUC_INTEGER && - token != GUC_REAL && + token != GUC_STRING && + token != GUC_INTEGER && + token != GUC_REAL && token != GUC_UNQUOTED_STRING) goto parse_error; if (token == GUC_STRING) /* strip quotes and escapes */ @@ -573,7 +573,7 @@ ParseConfigFile(const char *config_file, const char *calling_file, else ereport(elevel, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("syntax error in file \"%s\" line %u, near token \"%s\"", + errmsg("syntax error in file \"%s\" line %u, near token \"%s\"", config_file, ConfigFileLineno, yytext))); OK = false; diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index d512172769..80ee04d30a 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -62,7 +62,7 @@ # (change requires restart) #port = 5432 # (change requires restart) #max_connections = 100 # (change requires restart) -# Note: Increasing max_connections costs ~400 bytes of shared memory per +# Note: Increasing max_connections costs ~400 bytes of shared memory per # connection slot, plus lock space (see max_locks_per_transaction). #superuser_reserved_connections = 3 # (change requires restart) #unix_socket_directory = '' # (change requires restart) @@ -154,7 +154,7 @@ # (change requires restart) #fsync = on # turns forced synchronization on or off #synchronous_commit = on # immediate fsync at commit -#wal_sync_method = fsync # the default is the first option +#wal_sync_method = fsync # the default is the first option # supported by the operating system: # open_datasync # fdatasync @@ -246,7 +246,7 @@ #constraint_exclusion = partition # on, off, or partition #cursor_tuple_fraction = 0.1 # range 0.0-1.0 #from_collapse_limit = 8 -#join_collapse_limit = 8 # 1 disables collapsing of explicit +#join_collapse_limit = 8 # 1 disables collapsing of explicit # JOIN clauses @@ -284,7 +284,7 @@ # in all cases. #log_rotation_age = 1d # Automatic rotation of logfiles will # happen after that time. 0 disables. -#log_rotation_size = 10MB # Automatic rotation of logfiles will +#log_rotation_size = 10MB # Automatic rotation of logfiles will # happen after that much log output. # 0 disables. @@ -412,7 +412,7 @@ # AUTOVACUUM PARAMETERS #------------------------------------------------------------------------------ -#autovacuum = on # Enable autovacuum subprocess? 'on' +#autovacuum = on # Enable autovacuum subprocess? 'on' # requires track_counts to also be on. #log_autovacuum_min_duration = -1 # -1 disables, 0 logs all actions and # their durations, > 0 logs only @@ -423,7 +423,7 @@ #autovacuum_naptime = 1min # time between autovacuum runs #autovacuum_vacuum_threshold = 50 # min number of row updates before # vacuum -#autovacuum_analyze_threshold = 50 # min number of row updates before +#autovacuum_analyze_threshold = 50 # min number of row updates before # analyze #autovacuum_vacuum_scale_factor = 0.2 # fraction of table size before vacuum #autovacuum_analyze_scale_factor = 0.1 # fraction of table size before analyze diff --git a/src/backend/utils/mmgr/README b/src/backend/utils/mmgr/README index 2e9a226114..d52e959784 100644 --- a/src/backend/utils/mmgr/README +++ b/src/backend/utils/mmgr/README @@ -377,7 +377,7 @@ constraining context-type designers very much.) Given this, the pfree routine will look something like - StandardChunkHeader * header = + StandardChunkHeader * header = (StandardChunkHeader *) ((char *) p - sizeof(StandardChunkHeader)); (*header->mycontext->methods->free_p) (p); |
