mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-07-16 23:51:08 +02:00
c7b8998ebb
Change pg_bsd_indent to follow upstream rules for placement of comments
to the right of code, and remove pgindent hack that caused comments
following #endif to not obey the general rule.
Commit e3860ffa4d wasn't actually using
the published version of pg_bsd_indent, but a hacked-up version that
tried to minimize the amount of movement of comments to the right of
code. The situation of interest is where such a comment has to be
moved to the right of its default placement at column 33 because there's
code there. BSD indent has always moved right in units of tab stops
in such cases --- but in the previous incarnation, indent was working
in 8-space tab stops, while now it knows we use 4-space tabs. So the
net result is that in about half the cases, such comments are placed
one tab stop left of before. This is better all around: it leaves
more room on the line for comment text, and it means that in such
cases the comment uniformly starts at the next 4-space tab stop after
the code, rather than sometimes one and sometimes two tabs after.
Also, ensure that comments following #endif are indented the same
as comments following other preprocessor commands such as #else.
That inconsistency turns out to have been self-inflicted damage
from a poorly-thought-through post-indent "fixup" in pgindent.
This patch is much less interesting than the first round of indent
changes, but also bulkier, so I thought it best to separate the effects.
Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org
Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
83 lines
2.8 KiB
C
83 lines
2.8 KiB
C
/*
|
|
* px-crypt.h
|
|
* Header file for px_crypt().
|
|
*
|
|
* Copyright (c) 2001 Marko Kreen
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* contrib/pgcrypto/px-crypt.h
|
|
*/
|
|
|
|
#ifndef _PX_CRYPT_H
|
|
#define _PX_CRYPT_H
|
|
|
|
/* max room for result */
|
|
#define PX_MAX_CRYPT 128
|
|
|
|
/* max salt returned by gen_salt() */
|
|
#define PX_MAX_SALT_LEN 128
|
|
|
|
/* default rounds for xdes salt */
|
|
/* NetBSD bin/passwd/local_passwd.c has (29 * 25)*/
|
|
#define PX_XDES_ROUNDS (29 * 25)
|
|
|
|
/* default for blowfish salt */
|
|
#define PX_BF_ROUNDS 6
|
|
|
|
/*
|
|
* main interface
|
|
*/
|
|
char *px_crypt(const char *psw, const char *salt, char *buf, unsigned buflen);
|
|
int px_gen_salt(const char *salt_type, char *dst, int rounds);
|
|
|
|
/*
|
|
* internal functions
|
|
*/
|
|
|
|
/* crypt-gensalt.c */
|
|
char *_crypt_gensalt_traditional_rn(unsigned long count,
|
|
const char *input, int size, char *output, int output_size);
|
|
char *_crypt_gensalt_extended_rn(unsigned long count,
|
|
const char *input, int size, char *output, int output_size);
|
|
char *_crypt_gensalt_md5_rn(unsigned long count,
|
|
const char *input, int size, char *output, int output_size);
|
|
char *_crypt_gensalt_blowfish_rn(unsigned long count,
|
|
const char *input, int size, char *output, int output_size);
|
|
|
|
/* disable 'extended DES crypt' */
|
|
/* #define DISABLE_XDES */
|
|
|
|
/* crypt-blowfish.c */
|
|
char *_crypt_blowfish_rn(const char *key, const char *setting,
|
|
char *output, int size);
|
|
|
|
/* crypt-des.c */
|
|
char *px_crypt_des(const char *key, const char *setting);
|
|
|
|
/* crypt-md5.c */
|
|
char *px_crypt_md5(const char *pw, const char *salt,
|
|
char *dst, unsigned dstlen);
|
|
|
|
#endif /* _PX_CRYPT_H */
|