diff options
| author | Bruce Momjian | 2017-05-17 20:31:56 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2017-05-17 20:31:56 +0000 |
| commit | a6fd7b7a5f7bf3a8aa3f3d076cf09d922c1c6dd2 (patch) | |
| tree | d10454411c05d459abe06df161ab3c1156c5f477 /src/common | |
| parent | 8a943324780259757c77c56cfc597347d1150cdb (diff) | |
Post-PG 10 beta1 pgindent run
perltidy run not included.
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/file_utils.c | 12 | ||||
| -rw-r--r-- | src/common/saslprep.c | 4 | ||||
| -rw-r--r-- | src/common/scram-common.c | 4 | ||||
| -rw-r--r-- | src/common/sha2_openssl.c | 2 | ||||
| -rw-r--r-- | src/common/unicode_norm.c | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/src/common/file_utils.c b/src/common/file_utils.c index 218b83f3913..7f24325b8a8 100644 --- a/src/common/file_utils.c +++ b/src/common/file_utils.c @@ -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 diff --git a/src/common/saslprep.c b/src/common/saslprep.c index 7f5dc7155f7..0a3585850b8 100644 --- a/src/common/saslprep.c +++ b/src/common/saslprep.c @@ -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)) { diff --git a/src/common/scram-common.c b/src/common/scram-common.c index 295507a0adc..461d75db125 100644 --- a/src/common/scram-common.c +++ b/src/common/scram-common.c @@ -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 */ diff --git a/src/common/sha2_openssl.c b/src/common/sha2_openssl.c index 91d0c3924b9..bcc34426333 100644 --- a/src/common/sha2_openssl.c +++ b/src/common/sha2_openssl.c @@ -9,7 +9,7 @@ * Portions Copyright (c) 2016, PostgreSQL Global Development Group * * IDENTIFICATION - * src/common/sha2_openssl.c + * src/common/sha2_openssl.c * *------------------------------------------------------------------------- */ diff --git a/src/common/unicode_norm.c b/src/common/unicode_norm.c index 740b10d22a1..5361f5f111e 100644 --- a/src/common/unicode_norm.c +++ b/src/common/unicode_norm.c @@ -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; |
