|
8 | 8 | * |
9 | 9 | * |
10 | 10 | * IDENTIFICATION |
11 | | - * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.178 2007/03/01 14:52:03 petere Exp $ |
| 11 | + * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.179 2007/05/27 20:32:16 neilc Exp $ |
12 | 12 | * |
13 | 13 | *------------------------------------------------------------------------- |
14 | 14 | */ |
|
32 | 32 |
|
33 | 33 | staticintDecodeNumber(intflen,char*field,boolhaveTextMonth, |
34 | 34 | intfmask,int*tmask, |
35 | | -structpg_tm*tm,fsec_t*fsec,int*is2digits); |
| 35 | +structpg_tm*tm,fsec_t*fsec,bool*is2digits); |
36 | 36 | staticintDecodeNumberField(intlen,char*str, |
37 | 37 | intfmask,int*tmask, |
38 | | -structpg_tm*tm,fsec_t*fsec,int*is2digits); |
| 38 | +structpg_tm*tm,fsec_t*fsec,bool*is2digits); |
39 | 39 | staticintDecodeTime(char*str,intfmask,int*tmask, |
40 | 40 | structpg_tm*tm,fsec_t*fsec); |
41 | 41 | staticintDecodeTimezone(char*str,int*tzp); |
@@ -668,8 +668,8 @@ DecodeDateTime(char **field, int *ftype, int nf, |
668 | 668 | intdterr; |
669 | 669 | intmer=HR24; |
670 | 670 | boolhaveTextMonth= FALSE; |
671 | | -intis2digits= FALSE; |
672 | | -intbc= FALSE; |
| 671 | +boolis2digits= FALSE; |
| 672 | +boolbc= FALSE; |
673 | 673 | pg_tz*namedTz=NULL; |
674 | 674 |
|
675 | 675 | /* |
@@ -1476,7 +1476,7 @@ DecodeTimeOnly(char **field, int *ftype, int nf, |
1476 | 1476 | inti; |
1477 | 1477 | intval; |
1478 | 1478 | intdterr; |
1479 | | -intis2digits= FALSE; |
| 1479 | +boolis2digits= FALSE; |
1480 | 1480 | intmer=HR24; |
1481 | 1481 | pg_tz*namedTz=NULL; |
1482 | 1482 |
|
@@ -2047,8 +2047,8 @@ DecodeDate(char *str, int fmask, int *tmask, struct pg_tm * tm) |
2047 | 2047 | len; |
2048 | 2048 | intdterr; |
2049 | 2049 | boolhaveTextMonth= FALSE; |
2050 | | -intbc= FALSE; |
2051 | | -intis2digits= FALSE; |
| 2050 | +boolbc= FALSE; |
| 2051 | +boolis2digits= FALSE; |
2052 | 2052 | inttype, |
2053 | 2053 | val, |
2054 | 2054 | dmask=0; |
@@ -2193,8 +2193,8 @@ DecodeDate(char *str, int fmask, int *tmask, struct pg_tm * tm) |
2193 | 2193 | * Decode time string which includes delimiters. |
2194 | 2194 | * Return 0 if okay, a DTERR code if not. |
2195 | 2195 | * |
2196 | | - * Only check the lower limit on hours, since this same code |
2197 | | - *can be used to represent time spans. |
| 2196 | + * Only check the lower limit on hours, since this same code can be |
| 2197 | + * used to represent time spans. |
2198 | 2198 | */ |
2199 | 2199 | staticint |
2200 | 2200 | DecodeTime(char*str,intfmask,int*tmask,structpg_tm*tm,fsec_t*fsec) |
@@ -2270,7 +2270,7 @@ DecodeTime(char *str, int fmask, int *tmask, struct pg_tm * tm, fsec_t *fsec) |
2270 | 2270 | */ |
2271 | 2271 | staticint |
2272 | 2272 | DecodeNumber(intflen,char*str,boolhaveTextMonth,intfmask, |
2273 | | -int*tmask,structpg_tm*tm,fsec_t*fsec,int*is2digits) |
| 2273 | +int*tmask,structpg_tm*tm,fsec_t*fsec,bool*is2digits) |
2274 | 2274 | { |
2275 | 2275 | intval; |
2276 | 2276 | char*cp; |
@@ -2462,7 +2462,7 @@ DecodeNumber(int flen, char *str, bool haveTextMonth, int fmask, |
2462 | 2462 | */ |
2463 | 2463 | staticint |
2464 | 2464 | DecodeNumberField(intlen,char*str,intfmask, |
2465 | | -int*tmask,structpg_tm*tm,fsec_t*fsec,int*is2digits) |
| 2465 | +int*tmask,structpg_tm*tm,fsec_t*fsec,bool*is2digits) |
2466 | 2466 | { |
2467 | 2467 | char*cp; |
2468 | 2468 |
|
@@ -2680,7 +2680,7 @@ DecodeSpecial(int field, char *lowtoken, int *val) |
2680 | 2680 | int |
2681 | 2681 | DecodeInterval(char**field,int*ftype,intnf,int*dtype,structpg_tm*tm,fsec_t*fsec) |
2682 | 2682 | { |
2683 | | -intis_before= FALSE; |
| 2683 | +boolis_before= FALSE; |
2684 | 2684 | char*cp; |
2685 | 2685 | intfmask=0, |
2686 | 2686 | tmask, |
@@ -3519,8 +3519,8 @@ EncodeDateTime(struct pg_tm * tm, fsec_t fsec, int *tzp, char **tzn, int style, |
3519 | 3519 | int |
3520 | 3520 | EncodeInterval(structpg_tm*tm,fsec_tfsec,intstyle,char*str) |
3521 | 3521 | { |
3522 | | -intis_before= FALSE; |
3523 | | -intis_nonzero= FALSE; |
| 3522 | +boolis_before= FALSE; |
| 3523 | +boolis_nonzero= FALSE; |
3524 | 3524 | char*cp=str; |
3525 | 3525 |
|
3526 | 3526 | /* |
|