summaryrefslogtreecommitdiff
path: root/src/timezone
diff options
context:
space:
mode:
authorTom Lane2019-05-22 17:04:48 +0000
committerTom Lane2019-05-22 17:04:48 +0000
commit8255c7a5eeba8f1a38b7a431c04909bde4f5e67d (patch)
tree50b5b32eaf388701b2714244a10fb23f8d4a2c7c /src/timezone
parentbe76af171cdb3e7465c4ef234af403f97ad79b7b (diff)
Phase 2 pgindent run for v12.
Switch to 2.1 version of pg_bsd_indent. This formats multiline function declarations "correctly", that is with additional lines of parameter declarations indented to match where the first line's left parenthesis is. Discussion: https://postgr.es/m/CAEepm=0P3FeTXRcU5B2W3jv3PgRVZ-kGUXLGfd42FFhUROO3ug@mail.gmail.com
Diffstat (limited to 'src/timezone')
-rw-r--r--src/timezone/localtime.c2
-rw-r--r--src/timezone/pgtz.c4
-rw-r--r--src/timezone/pgtz.h4
-rw-r--r--src/timezone/strftime.c2
-rw-r--r--src/timezone/zic.c8
5 files changed, 10 insertions, 10 deletions
diff --git a/src/timezone/localtime.c b/src/timezone/localtime.c
index 9fe43135fe3..82365aed2f4 100644
--- a/src/timezone/localtime.c
+++ b/src/timezone/localtime.c
@@ -93,7 +93,7 @@ static struct pg_tm *gmtsub(pg_time_t const *, int32, struct pg_tm *);
static bool increment_overflow(int *, int);
static bool increment_overflow_time(pg_time_t *, int32);
static struct pg_tm *timesub(pg_time_t const *, int32, struct state const *,
- struct pg_tm *);
+ struct pg_tm *);
static bool typesequiv(struct state const *, int, int);
diff --git a/src/timezone/pgtz.c b/src/timezone/pgtz.c
index ee111a80d40..1d5bd90afb7 100644
--- a/src/timezone/pgtz.c
+++ b/src/timezone/pgtz.c
@@ -32,8 +32,8 @@ pg_tz *log_timezone = NULL;
static bool scan_directory_ci(const char *dirname,
- const char *fname, int fnamelen,
- char *canonname, int canonnamelen);
+ const char *fname, int fnamelen,
+ char *canonname, int canonnamelen);
/*
diff --git a/src/timezone/pgtz.h b/src/timezone/pgtz.h
index ab2b2bb7401..ff83bffc7ef 100644
--- a/src/timezone/pgtz.h
+++ b/src/timezone/pgtz.h
@@ -74,8 +74,8 @@ struct pg_tz
extern int pg_open_tzfile(const char *name, char *canonname);
/* in localtime.c */
-extern int tzload(const char *name, char *canonname, struct state *sp,
- bool doextend);
+extern int tzload(const char *name, char *canonname, struct state *sp,
+ bool doextend);
extern bool tzparse(const char *name, struct state *sp, bool lastditch);
#endif /* _PGTZ_H */
diff --git a/src/timezone/strftime.c b/src/timezone/strftime.c
index 217dd375f36..55c617f8c22 100644
--- a/src/timezone/strftime.c
+++ b/src/timezone/strftime.c
@@ -114,7 +114,7 @@ enum warn
static char *_add(const char *, char *, const char *);
static char *_conv(int, const char *, char *, const char *);
static char *_fmt(const char *, const struct pg_tm *, char *, const char *,
- enum warn *);
+ enum warn *);
static char *_yconv(int, int, bool, bool, char *, char const *);
diff --git a/src/timezone/zic.c b/src/timezone/zic.c
index de8daaee5c9..fb22622a1cc 100644
--- a/src/timezone/zic.c
+++ b/src/timezone/zic.c
@@ -151,9 +151,9 @@ static zic_t oadd(zic_t t1, zic_t t2);
static void outzone(const struct zone *zp, ptrdiff_t ntzones);
static zic_t rpytime(const struct rule *rp, zic_t wantedy);
static void rulesub(struct rule *rp,
- const char *loyearp, const char *hiyearp,
- const char *typep, const char *monthp,
- const char *dayp, const char *timep);
+ const char *loyearp, const char *hiyearp,
+ const char *typep, const char *monthp,
+ const char *dayp, const char *timep);
static zic_t tadd(zic_t t1, zic_t t2);
static bool yearistype(zic_t year, const char *type);
@@ -304,7 +304,7 @@ struct lookup
};
static struct lookup const *byword(const char *string,
- const struct lookup *lp);
+ const struct lookup *lp);
static struct lookup const zi_line_codes[] = {
{"Rule", LC_RULE},