Skip to content

Commit a32450a

Browse files
bmomjianbmomjian
committed
pgindent run before 6.3 release, with Thomas' requested changes.
1 parent 757bf69 commit a32450a

File tree

430 files changed

+12555
-10457
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

430 files changed

+12555
-10457
lines changed

‎contrib/array/array_iterator.c

Lines changed: 192 additions & 169 deletions
Large diffs are not rendered by default.

‎contrib/array/array_iterator.h

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
11
#ifndef ARRAY_ITERATOR_H
22
#define ARRAY_ITERATOR_H
33

4-
static int32 array_iterator(Oid elemtype, Oid proc, int and,
5-
ArrayType *array, Datum value);
6-
int32 array_texteq(ArrayType *array, char* value);
7-
int32 array_all_texteq(ArrayType *array, char* value);
8-
int32 array_textregexeq(ArrayType *array, char* value);
9-
int32 array_all_textregexeq(ArrayType *array, char* value);
10-
int32 array_char16eq(ArrayType *array, char* value);
11-
int32 array_all_char16eq(ArrayType *array, char* value);
12-
int32 array_char16regexeq(ArrayType *array, char* value);
13-
int32 array_all_char16regexeq(ArrayType *array, char* value);
14-
int32 array_int4eq(ArrayType *array, int4 value);
15-
int32 array_all_int4eq(ArrayType *array, int4 value);
16-
int32 array_int4ne(ArrayType *array, int4 value);
17-
int32 array_all_int4ne(ArrayType *array, int4 value);
18-
int32 array_int4gt(ArrayType *array, int4 value);
19-
int32 array_all_int4gt(ArrayType *array, int4 value);
20-
int32 array_int4ge(ArrayType *array, int4 value);
21-
int32 array_all_int4ge(ArrayType *array, int4 value);
22-
int32 array_int4lt(ArrayType *array, int4 value);
23-
int32 array_all_int4lt(ArrayType *array, int4 value);
24-
int32 array_int4le(ArrayType *array, int4 value);
25-
int32 array_all_int4le(ArrayType *array, int4 value);
4+
static int32
5+
array_iterator(Oid elemtype, Oid proc, int and,
6+
ArrayType *array, Datum value);
7+
int32 array_texteq(ArrayType *array, char *value);
8+
int32 array_all_texteq(ArrayType *array, char *value);
9+
int32 array_textregexeq(ArrayType *array, char *value);
10+
int32 array_all_textregexeq(ArrayType *array, char *value);
11+
int32 array_char16eq(ArrayType *array, char *value);
12+
int32 array_all_char16eq(ArrayType *array, char *value);
13+
int32 array_char16regexeq(ArrayType *array, char *value);
14+
int32 array_all_char16regexeq(ArrayType *array, char *value);
15+
int32 array_int4eq(ArrayType *array, int4 value);
16+
int32 array_all_int4eq(ArrayType *array, int4 value);
17+
int32 array_int4ne(ArrayType *array, int4 value);
18+
int32 array_all_int4ne(ArrayType *array, int4 value);
19+
int32 array_int4gt(ArrayType *array, int4 value);
20+
int32 array_all_int4gt(ArrayType *array, int4 value);
21+
int32 array_int4ge(ArrayType *array, int4 value);
22+
int32 array_all_int4ge(ArrayType *array, int4 value);
23+
int32 array_int4lt(ArrayType *array, int4 value);
24+
int32 array_all_int4lt(ArrayType *array, int4 value);
25+
int32 array_int4le(ArrayType *array, int4 value);
26+
int32 array_all_int4le(ArrayType *array, int4 value);
2627

2728
#endif

‎contrib/datetime/datetime_functions.c

Lines changed: 102 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Copyright (c) 1996, Massimo Dal Zotto <dz@cs.unitn.it>
77
*/
88

9-
#include <stdio.h> /* for sprintf() */
9+
#include <stdio.h> /* for sprintf() */
1010
#include <string.h>
1111
#include <limits.h>
1212
#ifdef HAVE_FLOAT_H
@@ -32,45 +32,47 @@
3232
* to hh:mm like in timetables.
3333
*/
3434

35-
TimeADT *
35+
TimeADT *
3636
hhmm_in(char *str)
3737
{
38-
TimeADT *time;
39-
40-
double fsec;
41-
struct tm tt, *tm = &tt;
42-
43-
int nf;
44-
char lowstr[MAXDATELEN+1];
45-
char *field[MAXDATEFIELDS];
46-
int dtype;
47-
int ftype[MAXDATEFIELDS];
48-
49-
if (!PointerIsValid(str))
50-
elog(ERROR,"Bad (null) time external representation",NULL);
51-
52-
if ((ParseDateTime( str, lowstr, field, ftype, MAXDATEFIELDS, &nf) != 0)
53-
|| (DecodeTimeOnly( field, ftype, nf, &dtype, tm, &fsec) != 0))
54-
elog(ERROR,"Bad time external representation '%s'",str);
55-
56-
if (tm->tm_hour<0 || tm->tm_hour>24 ||
57-
(tm->tm_hour==24 && (tm->tm_min!=0 || tm->tm_sec!=0 || fsec!= 0))) {
58-
elog(ERROR,
59-
"time_in: hour must be limited to values 0 through 24:00 "
60-
"in \"%s\"",
61-
str);
62-
}
63-
if ((tm->tm_min < 0) || (tm->tm_min > 59))
64-
elog(ERROR,"Minute must be limited to values 0 through 59 in '%s'",str);
65-
if ((tm->tm_sec < 0) || ((tm->tm_sec + fsec) >= 60))
66-
elog(ERROR,"Second must be limited to values 0 through < 60 in '%s'",
67-
str);
68-
69-
time = palloc(sizeof(TimeADT));
70-
71-
*time = ((((tm->tm_hour*60)+tm->tm_min)*60));
72-
73-
return(time);
38+
TimeADT *time;
39+
40+
double fsec;
41+
struct tm tt,
42+
*tm = &tt;
43+
44+
int nf;
45+
char lowstr[MAXDATELEN + 1];
46+
char *field[MAXDATEFIELDS];
47+
int dtype;
48+
int ftype[MAXDATEFIELDS];
49+
50+
if (!PointerIsValid(str))
51+
elog(ERROR, "Bad (null) time external representation", NULL);
52+
53+
if ((ParseDateTime(str, lowstr, field, ftype, MAXDATEFIELDS, &nf) != 0)
54+
|| (DecodeTimeOnly(field, ftype, nf, &dtype, tm, &fsec) != 0))
55+
elog(ERROR, "Bad time external representation '%s'", str);
56+
57+
if (tm->tm_hour < 0 || tm->tm_hour > 24 ||
58+
(tm->tm_hour == 24 && (tm->tm_min != 0 || tm->tm_sec != 0 || fsec != 0)))
59+
{
60+
elog(ERROR,
61+
"time_in: hour must be limited to values 0 through 24:00 "
62+
"in \"%s\"",
63+
str);
64+
}
65+
if ((tm->tm_min < 0) || (tm->tm_min > 59))
66+
elog(ERROR, "Minute must be limited to values 0 through 59 in '%s'", str);
67+
if ((tm->tm_sec < 0) || ((tm->tm_sec + fsec) >= 60))
68+
elog(ERROR, "Second must be limited to values 0 through < 60 in '%s'",
69+
str);
70+
71+
time = palloc(sizeof(TimeADT));
72+
73+
*time = ((((tm->tm_hour * 60) + tm->tm_min) * 60));
74+
75+
return (time);
7476
}
7577

7678
/*
@@ -82,132 +84,143 @@ hhmm_in(char *str)
8284
char *
8385
hhmm_out(TimeADT *time)
8486
{
85-
char *result;
86-
struct tm tt, *tm = &tt;
87-
char buf[MAXDATELEN+1];
87+
char *result;
88+
struct tm tt,
89+
*tm = &tt;
90+
char buf[MAXDATELEN + 1];
8891

89-
if (!PointerIsValid(time))
90-
return NULL;
92+
if (!PointerIsValid(time))
93+
return NULL;
9194

92-
tm->tm_hour = (*time / (60*60));
93-
tm->tm_min = (((int) (*time / 60)) % 60);
94-
tm->tm_sec = (((int) *time) % 60);
95+
tm->tm_hour = (*time / (60 * 60));
96+
tm->tm_min = (((int) (*time / 60)) % 60);
97+
tm->tm_sec = (((int) *time) % 60);
9598

96-
if (tm->tm_sec == 0) {
97-
sprintf(buf, "%02d:%02d", tm->tm_hour, tm->tm_min);
98-
} else {
99-
sprintf(buf, "%02d:%02d:%02d", tm->tm_hour, tm->tm_min, tm->tm_sec);
100-
}
99+
if (tm->tm_sec == 0)
100+
{
101+
sprintf(buf, "%02d:%02d", tm->tm_hour, tm->tm_min);
102+
}
103+
else
104+
{
105+
sprintf(buf, "%02d:%02d:%02d", tm->tm_hour, tm->tm_min, tm->tm_sec);
106+
}
101107

102-
result = palloc(strlen(buf)+1);
108+
result = palloc(strlen(buf) + 1);
103109

104-
strcpy( result, buf);
110+
strcpy(result, buf);
105111

106-
return(result);
112+
return (result);
107113
}
108114

109-
TimeADT *
115+
TimeADT *
110116
hhmm(TimeADT *time)
111117
{
112-
TimeADT *result = palloc(sizeof(TimeADT));
118+
TimeADT *result = palloc(sizeof(TimeADT));
113119

114-
*result = (((int) *time) / 60 * 60);
120+
*result = (((int) *time) / 60 * 60);
115121

116-
return(result);
122+
return (result);
117123
}
118124

119-
TimeADT *
125+
TimeADT *
120126
time_difference(TimeADT *time1, TimeADT *time2)
121127
{
122-
TimeADT *time = palloc(sizeof(TimeADT));
128+
TimeADT *time = palloc(sizeof(TimeADT));
123129

124-
*time = (*time1 - *time2);
125-
return(time);
130+
*time = (*time1 - *time2);
131+
return (time);
126132
}
127133

128134
int4
129135
time_hours(TimeADT *time)
130136
{
131-
return (((int) *time) / 3600);
137+
return (((int) *time) / 3600);
132138
}
133139

134140
int4
135141
time_minutes(TimeADT *time)
136142
{
137-
return ((((int) *time) / 60) % 60);
143+
return ((((int) *time) / 60) % 60);
138144
}
139145

140146
int4
141147
time_seconds(TimeADT *time)
142148
{
143-
return (((int) *time) % 60);
149+
return (((int) *time) % 60);
144150
}
145151

146152
int4
147153
as_minutes(TimeADT *time)
148154
{
149-
return (((int) *time) / 60);
155+
return (((int) *time) / 60);
150156
}
151157

152158
int4
153159
as_seconds(TimeADT *time)
154160
{
155-
return ((int) *time);
161+
return ((int) *time);
156162
}
157163

158164
int4
159165
date_day(DateADT val)
160166
{
161-
int year, month, day;
167+
int year,
168+
month,
169+
day;
162170

163-
j2date(val + JDATE_2000, &year, &month, &day);
171+
j2date(val + JDATE_2000, &year, &month, &day);
164172

165-
return (day);
173+
return (day);
166174
}
167175

168176
int4
169177
date_month(DateADT val)
170178
{
171-
int year, month, day;
179+
int year,
180+
month,
181+
day;
172182

173-
j2date(val + JDATE_2000, &year, &month, &day);
183+
j2date(val + JDATE_2000, &year, &month, &day);
174184

175-
return (month);
185+
return (month);
176186
}
177187

178188
int4
179189
date_year(DateADT val)
180190
{
181-
int year, month, day;
191+
int year,
192+
month,
193+
day;
182194

183-
j2date(val + JDATE_2000, &year, &month, &day);
195+
j2date(val + JDATE_2000, &year, &month, &day);
184196

185-
return (year);
197+
return (year);
186198
}
187199

188-
TimeADT *
200+
TimeADT *
189201
currenttime()
190202
{
191-
TimeADT *result = palloc(sizeof(TimeADT));
192-
struct tm *tm;
193-
time_t current_time;
203+
TimeADT *result = palloc(sizeof(TimeADT));
204+
struct tm *tm;
205+
time_t current_time;
194206

195-
current_time = time(NULL);
196-
tm = localtime(&current_time);
197-
*result = ((((tm->tm_hour*60)+tm->tm_min)*60)+tm->tm_sec);
207+
current_time = time(NULL);
208+
tm = localtime(&current_time);
209+
*result = ((((tm->tm_hour * 60) + tm->tm_min) * 60) + tm->tm_sec);
198210

199-
return (result);
211+
return (result);
200212
}
201213

202214
DateADT
203215
currentdate()
204216
{
205-
DateADT date;
206-
struct tm tt, *tm = &tt;
217+
DateADT date;
218+
struct tm tt,
219+
*tm = &tt;
207220

208-
GetCurrentTime(tm);
209-
date = (date2j( tm->tm_year, tm->tm_mon, tm->tm_mday) - JDATE_2000);
210-
return (date);
221+
GetCurrentTime(tm);
222+
date = (date2j(tm->tm_year, tm->tm_mon, tm->tm_mday) - JDATE_2000);
223+
return (date);
211224
}
212225

213226
/* end of file */

‎contrib/datetime/datetime_functions.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
#ifndef DATETIME_FUNCTIONS_H
22
#define DATETIME_FUNCTIONS_H
33

4-
TimeADT *hhmm_in(char *str);
5-
char *hhmm_out(TimeADT *time);
6-
TimeADT *hhmm(TimeADT *time);
7-
TimeADT *time_difference(TimeADT *time1, TimeADT *time2);
8-
int4 time_hours(TimeADT *time);
9-
int4 time_minutes(TimeADT *time);
10-
int4 time_seconds(TimeADT *time);
11-
int4 as_minutes(TimeADT *time);
12-
int4 as_seconds(TimeADT *time);
13-
int4 date_day(DateADT val);
14-
int4 date_month(DateADT val);
15-
int4 date_year(DateADT val);
16-
TimeADT *currenttime(void);
17-
DateADT currentdate(void);
4+
TimeADT *hhmm_in(char *str);
5+
char *hhmm_out(TimeADT *time);
6+
TimeADT *hhmm(TimeADT *time);
7+
TimeADT *time_difference(TimeADT *time1, TimeADT *time2);
8+
int4 time_hours(TimeADT *time);
9+
int4 time_minutes(TimeADT *time);
10+
int4 time_seconds(TimeADT *time);
11+
int4 as_minutes(TimeADT *time);
12+
int4 as_seconds(TimeADT *time);
13+
int4 date_day(DateADT val);
14+
int4 date_month(DateADT val);
15+
int4 date_year(DateADT val);
16+
TimeADT *currenttime(void);
17+
DateADT currentdate(void);
1818

1919
#endif

0 commit comments

Comments
 (0)