postgrespro
diff --git a/‎src/backend/postmaster/postmaster.c‎
Lines changed: 5 additions & 4 deletions b/‎src/backend/postmaster/postmaster.c‎
Lines changed: 5 additions & 4 deletions
diff --git a/‎src/interfaces/ecpg/pgtypeslib/dt_common.c‎
Lines changed: 17 additions & 5 deletions b/‎src/interfaces/ecpg/pgtypeslib/dt_common.c‎
Lines changed: 17 additions & 5 deletions
@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.611 2010/06/03 21:02:11 petere Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.612 2010/06/16 00:54:16 petere Exp $
  *
  * NOTES
  *
@@ -3381,9 +3381,10 @@ BackendInitialize(Port *port)
 					(errmsg_internal("pg_getnameinfo_all() failed: %s",
 									 gai_strerror(ret))));
 	}
-	snprintf(remote_ps_data, sizeof(remote_ps_data),
-			 remote_port[0] == '\0' ? "%s" : "%s(%s)",
-			 remote_host, remote_port);
+	if (remote_port[0] == '\0')
+		snprintf(remote_ps_data, sizeof(remote_ps_data), "%s", remote_host);
+	else
+		snprintf(remote_ps_data, sizeof(remote_ps_data), "%s(%s)", remote_host, remote_port);
 
 	if (Log_connections)
 	{
 
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/dt_common.c,v 1.53 2010/05/09 02:15:59 tgl Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/dt_common.c,v 1.54 2010/06/16 00:54:16 petere Exp $ */
 
 #include "postgres_fe.h"
 
@@ -815,7 +815,10 @@ EncodeDateTime(struct tm * tm, fsec_t fsec, int *tzp, char **tzn, int style, cha
 			{
 				hour = -(*tzp / SECS_PER_HOUR);
 				min = (abs(*tzp) / MINS_PER_HOUR) % MINS_PER_HOUR;
-				sprintf(str + strlen(str), (min != 0) ? "%+03d:%02d" : "%+03d", hour, min);
+				if (min != 0)
+					sprintf(str + strlen(str), "%+03d:%02d", hour, min);
+				else
+					sprintf(str + strlen(str), "%+03d", hour);
 			}
 			break;
 
@@ -869,7 +872,10 @@ EncodeDateTime(struct tm * tm, fsec_t fsec, int *tzp, char **tzn, int style, cha
 				{
 					hour = -(*tzp / SECS_PER_HOUR);
 					min = (abs(*tzp) / MINS_PER_HOUR) % MINS_PER_HOUR;
-					sprintf(str + strlen(str), (min != 0) ? "%+03d:%02d" : "%+03d", hour, min);
+					if (min != 0)
+						sprintf(str + strlen(str), "%+03d:%02d", hour, min);
+					else
+						sprintf(str + strlen(str), "%+03d", hour);
 				}
 			}
 			break;
@@ -915,7 +921,10 @@ EncodeDateTime(struct tm * tm, fsec_t fsec, int *tzp, char **tzn, int style, cha
 				{
 					hour = -(*tzp / SECS_PER_HOUR);
 					min = (abs(*tzp) / MINS_PER_HOUR) % MINS_PER_HOUR;
-					sprintf(str + strlen(str), (min != 0) ? "%+03d:%02d" : "%+03d", hour, min);
+					if (min != 0)
+						sprintf(str + strlen(str), "%+03d:%02d", hour, min);
+					else
+						sprintf(str + strlen(str), "%+03d", hour);
 				}
 			}
 			break;
@@ -977,7 +986,10 @@ EncodeDateTime(struct tm * tm, fsec_t fsec, int *tzp, char **tzn, int style, cha
 					 */
 					hour = -(*tzp / SECS_PER_HOUR);
 					min = (abs(*tzp) / MINS_PER_HOUR) % MINS_PER_HOUR;
-					sprintf(str + strlen(str), (min != 0) ? " %+03d:%02d" : " %+03d", hour, min);
+					if (min != 0)
+						sprintf(str + strlen(str), " %+03d:%02d", hour, min);
+					else
+						sprintf(str + strlen(str), " %+03d", hour);
 				}
 			}
 			break;
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`*`
`38`	`38`	`*`
`39`	`39`	`* IDENTIFICATION`
`40`		`- * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.611 2010/06/03 21:02:11 petere Exp $`
	`40`	`+ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.612 2010/06/16 00:54:16 petere Exp $`
`41`	`41`	`*`
`42`	`42`	`* NOTES`
`43`	`43`	`*`
`@@ -3381,9 +3381,10 @@ BackendInitialize(Port *port)`
`3381`	`3381`	`(errmsg_internal("pg_getnameinfo_all() failed: %s",`
`3382`	`3382`	`gai_strerror(ret))));`
`3383`	`3383`	`}`
`3384`		`- snprintf(remote_ps_data, sizeof(remote_ps_data),`
`3385`		`- remote_port[0] == '\0' ? "%s" : "%s(%s)",`
`3386`		`- remote_host, remote_port);`
	`3384`	`+ if (remote_port[0] == '\0')`
	`3385`	`+ snprintf(remote_ps_data, sizeof(remote_ps_data), "%s", remote_host);`
	`3386`	`+ else`
	`3387`	`+ snprintf(remote_ps_data, sizeof(remote_ps_data), "%s(%s)", remote_host, remote_port);`
`3387`	`3388`
`3388`	`3389`	`if (Log_connections)`
`3389`	`3390`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/dt_common.c,v 1.53 2010/05/09 02:15:59 tgl Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/dt_common.c,v 1.54 2010/06/16 00:54:16 petere Exp $ */`
`2`	`2`
`3`	`3`	`#include "postgres_fe.h"`
`4`	`4`
`@@ -815,7 +815,10 @@ EncodeDateTime(struct tm * tm, fsec_t fsec, int tzp, char *tzn, int style, cha`
`815`	`815`	`{`
`816`	`816`	`hour = -(*tzp / SECS_PER_HOUR);`
`817`	`817`	`min = (abs(*tzp) / MINS_PER_HOUR) % MINS_PER_HOUR;`
`818`		`- sprintf(str + strlen(str), (min != 0) ? "%+03d:%02d" : "%+03d", hour, min);`
	`818`	`+ if (min != 0)`
	`819`	`+ sprintf(str + strlen(str), "%+03d:%02d", hour, min);`
	`820`	`+ else`
	`821`	`+ sprintf(str + strlen(str), "%+03d", hour);`
`819`	`822`	`}`
`820`	`823`	`break;`
`821`	`824`
`@@ -869,7 +872,10 @@ EncodeDateTime(struct tm * tm, fsec_t fsec, int tzp, char *tzn, int style, cha`
`869`	`872`	`{`
`870`	`873`	`hour = -(*tzp / SECS_PER_HOUR);`
`871`	`874`	`min = (abs(*tzp) / MINS_PER_HOUR) % MINS_PER_HOUR;`
`872`		`- sprintf(str + strlen(str), (min != 0) ? "%+03d:%02d" : "%+03d", hour, min);`
	`875`	`+ if (min != 0)`
	`876`	`+ sprintf(str + strlen(str), "%+03d:%02d", hour, min);`
	`877`	`+ else`
	`878`	`+ sprintf(str + strlen(str), "%+03d", hour);`
`873`	`879`	`}`
`874`	`880`	`}`
`875`	`881`	`break;`
`@@ -915,7 +921,10 @@ EncodeDateTime(struct tm * tm, fsec_t fsec, int tzp, char *tzn, int style, cha`
`915`	`921`	`{`
`916`	`922`	`hour = -(*tzp / SECS_PER_HOUR);`
`917`	`923`	`min = (abs(*tzp) / MINS_PER_HOUR) % MINS_PER_HOUR;`
`918`		`- sprintf(str + strlen(str), (min != 0) ? "%+03d:%02d" : "%+03d", hour, min);`
	`924`	`+ if (min != 0)`
	`925`	`+ sprintf(str + strlen(str), "%+03d:%02d", hour, min);`
	`926`	`+ else`
	`927`	`+ sprintf(str + strlen(str), "%+03d", hour);`
`919`	`928`	`}`
`920`	`929`	`}`
`921`	`930`	`break;`
`@@ -977,7 +986,10 @@ EncodeDateTime(struct tm * tm, fsec_t fsec, int tzp, char *tzn, int style, cha`
`977`	`986`	`*/`
`978`	`987`	`hour = -(*tzp / SECS_PER_HOUR);`
`979`	`988`	`min = (abs(*tzp) / MINS_PER_HOUR) % MINS_PER_HOUR;`
`980`		`- sprintf(str + strlen(str), (min != 0) ? " %+03d:%02d" : " %+03d", hour, min);`
	`989`	`+ if (min != 0)`
	`990`	`+ sprintf(str + strlen(str), " %+03d:%02d", hour, min);`
	`991`	`+ else`
	`992`	`+ sprintf(str + strlen(str), " %+03d", hour);`
`981`	`993`	`}`
`982`	`994`	`}`
`983`	`995`	`break;`