postgrespro
diff --git a/‎contrib/array/array_iterator.c
Lines changed: 23 additions & 23 deletions b/‎contrib/array/array_iterator.c
Lines changed: 23 additions & 23 deletions
diff --git a/‎contrib/datetime/datetime_functions.c
Lines changed: 21 additions & 14 deletions b/‎contrib/datetime/datetime_functions.c
Lines changed: 21 additions & 14 deletions
@@ -40,21 +40,21 @@
 #include "utils/builtins.h"
 #include "utils/elog.h"
 
-static			int32
+static int32
 array_iterator(Oid elemtype, Oid proc, int and, ArrayType * array, Datum value)
 {
-	HeapTuple		typ_tuple;
-	TypeTupleForm	typ_struct;
-	bool			typbyval;
-	int				typlen;
-	func_ptr		proc_fn;
-	int				pronargs;
-	int				nitems,
-					i,
-					result;
-	int				ndim,
-				   *dim;
-	char		   *p;
+	HeapTuple	typ_tuple;
+	TypeTupleForm typ_struct;
+	bool		typbyval;
+	int			typlen;
+	func_ptr	proc_fn;
+	int			pronargs;
+	int			nitems,
+				i,
+				result;
+	int			ndim,
+			   *dim;
+	char	   *p;
 
 	/* Sanity checks */
 	if ((array == (ArrayType *) NULL)
@@ -101,16 +101,16 @@ array_iterator(Oid elemtype, Oid proc, int and, ArrayType * array, Datum value)
 		{
 			switch (typlen)
 			{
-			case 1:
-				result = (int) (*proc_fn) (*p, value);
-				break;
-			case 2:
-				result = (int) (*proc_fn) (*(int16 *) p, value);
-				break;
-			case 3:
-			case 4:
-				result = (int) (*proc_fn) (*(int32 *) p, value);
-				break;
+				case 1:
+					result = (int) (*proc_fn) (*p, value);
+					break;
+				case 2:
+					result = (int) (*proc_fn) (*(int16 *) p, value);
+					break;
+				case 3:
+				case 4:
+					result = (int) (*proc_fn) (*(int32 *) p, value);
+					break;
 			}
 			p += typlen;
 		}
 
@@ -13,33 +13,34 @@
 #include "utils/datetime.h"
 
 
-TimeADT		   *
+TimeADT    *
 time_difference(TimeADT * time1, TimeADT * time2)
 {
-	TimeADT		   *result = (TimeADT *) palloc(sizeof(TimeADT));
+	TimeADT    *result = (TimeADT *) palloc(sizeof(TimeADT));
 
 	*result = *time1 - *time2;
 	return (result);
 }
 
-TimeADT		   *
+TimeADT    *
 currenttime()
 {
-	time_t			current_time;
-	struct tm	   *tm;
-	TimeADT		   *result = (TimeADT *) palloc(sizeof(TimeADT));
+	time_t		current_time;
+	struct tm  *tm;
+	TimeADT    *result = (TimeADT *) palloc(sizeof(TimeADT));
 
 	current_time = time(NULL);
 	tm = localtime(&current_time);
 	*result = ((((tm->tm_hour * 60) + tm->tm_min) * 60) + tm->tm_sec);
 	return (result);
 }
+
 DateADT
 currentdate()
 {
-	time_t			current_time;
-	struct tm	   *tm;
-	DateADT			result;
+	time_t		current_time;
+	struct tm  *tm;
+	DateADT		result;
 
 	current_time = time(NULL);
 	tm = localtime(&current_time);
@@ -48,6 +49,7 @@ currentdate()
 		date2j(100, 1, 1);
 	return (result);
 }
+
 int4
 hours(TimeADT * time)
 {
@@ -65,47 +67,52 @@ seconds(TimeADT * time)
 {
 	return (((int) *time) % 60);
 }
+
 int4
 day(DateADT * date)
 {
-	struct tm		tm;
+	struct tm	tm;
 
 	j2date((*date + date2j(2000, 1, 1)),
 		   &tm.tm_year, &tm.tm_mon, &tm.tm_mday);
 
 	return (tm.tm_mday);
 }
+
 int4
 month(DateADT * date)
 {
-	struct tm		tm;
+	struct tm	tm;
 
 	j2date((*date + date2j(2000, 1, 1)),
 		   &tm.tm_year, &tm.tm_mon, &tm.tm_mday);
 
 	return (tm.tm_mon);
 }
+
 int4
 year(DateADT * date)
 {
-	struct tm		tm;
+	struct tm	tm;
 
 	j2date((*date + date2j(2000, 1, 1)),
 		   &tm.tm_year, &tm.tm_mon, &tm.tm_mday);
 
 	return (tm.tm_year);
 }
+
 int4
 asminutes(TimeADT * time)
 {
-	int				seconds = (int) *time;
+	int			seconds = (int) *time;
 
 	return (seconds / 60);
 }
+
 int4
 asseconds(TimeADT * time)
 {
-	int				seconds = (int) *time;
+	int			seconds = (int) *time;
 
 	return (seconds);
 }
Original file line number	Diff line number	Diff line change
`@@ -13,33 +13,34 @@`
`13`	`13`	`#include "utils/datetime.h"`
`14`	`14`
`15`	`15`
`16`		`-TimeADT *`
	`16`	`+TimeADT *`
`17`	`17`	`time_difference(TimeADT * time1, TimeADT * time2)`
`18`	`18`	`{`
`19`		`- TimeADT result = (TimeADT ) palloc(sizeof(TimeADT));`
	`19`	`+ TimeADT result = (TimeADT ) palloc(sizeof(TimeADT));`
`20`	`20`
`21`	`21`	`result = time1 - *time2;`
`22`	`22`	`return (result);`
`23`	`23`	`}`
`24`	`24`
`25`		`-TimeADT *`
	`25`	`+TimeADT *`
`26`	`26`	`currenttime()`
`27`	`27`	`{`
`28`		`- time_t current_time;`
`29`		`- struct tm *tm;`
`30`		`- TimeADT result = (TimeADT ) palloc(sizeof(TimeADT));`
	`28`	`+ time_t current_time;`
	`29`	`+ struct tm *tm;`
	`30`	`+ TimeADT result = (TimeADT ) palloc(sizeof(TimeADT));`
`31`	`31`
`32`	`32`	`current_time = time(NULL);`
`33`	`33`	`tm = localtime(&current_time);`
`34`	`34`	`result = ((((tm->tm_hour 60) + tm->tm_min) * 60) + tm->tm_sec);`
`35`	`35`	`return (result);`
`36`	`36`	`}`
	`37`	`+`
`37`	`38`	`DateADT`
`38`	`39`	`currentdate()`
`39`	`40`	`{`
`40`		`- time_t current_time;`
`41`		`- struct tm *tm;`
`42`		`- DateADT result;`
	`41`	`+ time_t current_time;`
	`42`	`+ struct tm *tm;`
	`43`	`+ DateADT result;`
`43`	`44`
`44`	`45`	`current_time = time(NULL);`
`45`	`46`	`tm = localtime(&current_time);`
`@@ -48,6 +49,7 @@ currentdate()`
`48`	`49`	`date2j(100, 1, 1);`
`49`	`50`	`return (result);`
`50`	`51`	`}`
	`52`	`+`
`51`	`53`	`int4`
`52`	`54`	`hours(TimeADT * time)`
`53`	`55`	`{`
`@@ -65,47 +67,52 @@ seconds(TimeADT * time)`
`65`	`67`	`{`
`66`	`68`	`return (((int) *time) % 60);`
`67`	`69`	`}`
	`70`	`+`
`68`	`71`	`int4`
`69`	`72`	`day(DateADT * date)`
`70`	`73`	`{`
`71`		`- struct tm tm;`
	`74`	`+ struct tm tm;`
`72`	`75`
`73`	`76`	`j2date((*date + date2j(2000, 1, 1)),`
`74`	`77`	`&tm.tm_year, &tm.tm_mon, &tm.tm_mday);`
`75`	`78`
`76`	`79`	`return (tm.tm_mday);`
`77`	`80`	`}`
	`81`	`+`
`78`	`82`	`int4`
`79`	`83`	`month(DateADT * date)`
`80`	`84`	`{`
`81`		`- struct tm tm;`
	`85`	`+ struct tm tm;`
`82`	`86`
`83`	`87`	`j2date((*date + date2j(2000, 1, 1)),`
`84`	`88`	`&tm.tm_year, &tm.tm_mon, &tm.tm_mday);`
`85`	`89`
`86`	`90`	`return (tm.tm_mon);`
`87`	`91`	`}`
	`92`	`+`
`88`	`93`	`int4`
`89`	`94`	`year(DateADT * date)`
`90`	`95`	`{`
`91`		`- struct tm tm;`
	`96`	`+ struct tm tm;`
`92`	`97`
`93`	`98`	`j2date((*date + date2j(2000, 1, 1)),`
`94`	`99`	`&tm.tm_year, &tm.tm_mon, &tm.tm_mday);`
`95`	`100`
`96`	`101`	`return (tm.tm_year);`
`97`	`102`	`}`
	`103`	`+`
`98`	`104`	`int4`
`99`	`105`	`asminutes(TimeADT * time)`
`100`	`106`	`{`
`101`		`- int seconds = (int) *time;`
	`107`	`+ int seconds = (int) *time;`
`102`	`108`
`103`	`109`	`return (seconds / 60);`
`104`	`110`	`}`
	`111`	`+`
`105`	`112`	`int4`
`106`	`113`	`asseconds(TimeADT * time)`
`107`	`114`	`{`
`108`		`- int seconds = (int) *time;`
	`115`	`+ int seconds = (int) *time;`
`109`	`116`
`110`	`117`	`return (seconds);`
`111`	`118`	`}`