1
0
mirror of https://github.com/postgres/postgres.git synced 2025-09-02 04:21:28 +03:00

Post-PG 10 beta1 pgindent run

perltidy run not included.
This commit is contained in:
Bruce Momjian
2017-05-17 16:31:56 -04:00
parent 8a94332478
commit a6fd7b7a5f
310 changed files with 3338 additions and 3171 deletions

View File

@@ -32,15 +32,15 @@
/*
* pg_xlog has been renamed to pg_wal in version 10.
*/
#define MINIMUM_VERSION_FOR_PG_WAL 100000
#define MINIMUM_VERSION_FOR_PG_WAL 100000
#ifdef PG_FLUSH_DATA_WORKS
static int pre_sync_fname(const char *fname, bool isdir,
const char *progname);
const char *progname);
#endif
static void walkdir(const char *path,
int (*action) (const char *fname, bool isdir, const char *progname),
bool process_symlinks, const char *progname);
int (*action) (const char *fname, bool isdir, const char *progname),
bool process_symlinks, const char *progname);
/*
* Issue fsync recursively on PGDATA and all its contents.
@@ -65,7 +65,7 @@ fsync_pgdata(const char *pg_data,
/* handle renaming of pg_xlog to pg_wal in post-10 clusters */
snprintf(pg_wal, MAXPGPATH, "%s/%s", pg_data,
serverVersion < MINIMUM_VERSION_FOR_PG_WAL ? "pg_xlog" : "pg_wal");
serverVersion < MINIMUM_VERSION_FOR_PG_WAL ? "pg_xlog" : "pg_wal");
snprintf(pg_tblspc, MAXPGPATH, "%s/pg_tblspc", pg_data);
/*
@@ -347,7 +347,7 @@ fsync_parent_path(const char *fname, const char *progname)
int
durable_rename(const char *oldfile, const char *newfile, const char *progname)
{
int fd;
int fd;
/*
* First fsync the old and target path (if it exists), to ensure that they

View File

@@ -1094,8 +1094,8 @@ pg_saslprep(const char *input, char **output)
}
/*
* Quick check if the input is pure ASCII. An ASCII string requires
* no further processing.
* Quick check if the input is pure ASCII. An ASCII string requires no
* further processing.
*/
if (pg_is_ascii_string(input))
{

View File

@@ -219,8 +219,8 @@ scram_build_verifier(const char *salt, int saltlen, int iterations,
*----------
*/
maxlen = strlen("SCRAM-SHA-256") + 1
+ 10 + 1 /* iteration count */
+ pg_b64_enc_len(saltlen) + 1 /* Base64-encoded salt */
+ 10 + 1 /* iteration count */
+ pg_b64_enc_len(saltlen) + 1 /* Base64-encoded salt */
+ pg_b64_enc_len(SCRAM_KEY_LEN) + 1 /* Base64-encoded StoredKey */
+ pg_b64_enc_len(SCRAM_KEY_LEN) + 1; /* Base64-encoded ServerKey */

View File

@@ -9,7 +9,7 @@
* Portions Copyright (c) 2016, PostgreSQL Global Development Group
*
* IDENTIFICATION
* src/common/sha2_openssl.c
* src/common/sha2_openssl.c
*
*-------------------------------------------------------------------------
*/

View File

@@ -73,7 +73,7 @@ get_code_entry(pg_wchar code)
* is only valid until next call to this function!
*/
static const pg_wchar *
get_code_decomposition(pg_unicode_decomposition * entry, int *dec_size)
get_code_decomposition(pg_unicode_decomposition *entry, int *dec_size)
{
static pg_wchar x;