mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-12-27 08:39:28 +08: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
80 lines
2.6 KiB
C
80 lines
2.6 KiB
C
/* contrib/pgcrypto/md5.h */
|
|
/* $KAME: md5.h,v 1.3 2000/02/22 14:01:18 itojun Exp $ */
|
|
|
|
/*
|
|
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
|
|
* 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.
|
|
* 3. Neither the name of the project nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE PROJECT 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 PROJECT 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.
|
|
*/
|
|
|
|
#ifndef _NETINET6_MD5_H_
|
|
#define _NETINET6_MD5_H_
|
|
|
|
#define MD5_BUFLEN 64
|
|
|
|
typedef struct
|
|
{
|
|
union
|
|
{
|
|
uint32 md5_state32[4];
|
|
uint8 md5_state8[16];
|
|
} md5_st;
|
|
|
|
#define md5_sta md5_st.md5_state32[0]
|
|
#define md5_stb md5_st.md5_state32[1]
|
|
#define md5_stc md5_st.md5_state32[2]
|
|
#define md5_std md5_st.md5_state32[3]
|
|
#define md5_st8 md5_st.md5_state8
|
|
|
|
union
|
|
{
|
|
uint64 md5_count64;
|
|
uint8 md5_count8[8];
|
|
} md5_count;
|
|
#define md5_n md5_count.md5_count64
|
|
#define md5_n8 md5_count.md5_count8
|
|
|
|
unsigned int md5_i;
|
|
uint8 md5_buf[MD5_BUFLEN];
|
|
} md5_ctxt;
|
|
|
|
extern void md5_init(md5_ctxt *);
|
|
extern void md5_loop(md5_ctxt *, const uint8 *, unsigned int);
|
|
extern void md5_pad(md5_ctxt *);
|
|
extern void md5_result(uint8 *, md5_ctxt *);
|
|
|
|
/* compatibility */
|
|
#define MD5_CTX md5_ctxt
|
|
#define MD5Init(x) md5_init((x))
|
|
#define MD5Update(x, y, z) md5_loop((x), (y), (z))
|
|
#define MD5Final(x, y) \
|
|
do { \
|
|
md5_pad((y)); \
|
|
md5_result((x), (y)); \
|
|
} while (0)
|
|
|
|
#endif /* ! _NETINET6_MD5_H_ */
|