merge trunk.

Comment improvements, styling.

3 files changed, 11 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 7710ce6..24f793d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-23  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* compat/fake-rfc2553.c: [Bug 3599194]: compat/fake-rfc2553.c is
+	broken.
+
 2013-02-22  Don Porter  <dgp@users.sourceforge.net>
 
 	* generic/tclAssembly.c:	Shift more burden of smart cleanup
diff --git a/compat/fake-rfc2553.c b/compat/fake-rfc2553.c
index 666144f..3b91041 100644
--- a/compat/fake-rfc2553.c
+++ b/compat/fake-rfc2553.c
@@ -84,7 +84,7 @@ int fake_getnameinfo(const struct sockaddr *sa, size_t salen, char *host,
 
 	if (host != NULL) {
 		if (flags & NI_NUMERICHOST) {
-			int len;
+			size_t len;
 			Tcl_MutexLock(&netdbMutex);
 			len = strlcpy(host, inet_ntoa(sin->sin_addr), hostlen);
 			Tcl_MutexUnlock(&netdbMutex);
@@ -135,7 +135,7 @@ fake_gai_strerror(int err)
 
 #ifndef HAVE_FREEADDRINFO
 void
-freeaddrinfo(struct addrinfo *ai)
+fake_freeaddrinfo(struct addrinfo *ai)
 {
 	struct addrinfo *next;
 
@@ -199,7 +199,7 @@ fake_getaddrinfo(const char *hostname, const char *servname,
 
 		port = strtol(servname, &cp, 10);
 		if (port > 0 && port <= 65535 && *cp == '\0')
-			port = htons(port);
+			port = htons((unsigned short)port);
 		else if ((sp = getservbyname(servname, NULL)) != NULL)
 			port = sp->s_port;
 		else
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 119cea5..dbe747b 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -1433,9 +1433,8 @@ MODULE_SCOPE const TclStubs tclStubs;
  * It contains just enough for Tcl_InitStubs to be able
  * to initialize the stub table. */
 static const struct {
-	/* a real interpreter has */
-	/* interp->result / interp->freeProc here: */
-	const char version[2*sizeof(void *)];
+    /* A real interpreter has interp->result/freeProc here: */
+    const char version[sizeof(struct {char *r; void (*f)(void);})];
     int errorLine;
     const struct TclStubs *stubTable;
 } dummyInterp = {
@@ -1447,7 +1446,6 @@ Tcl_Interp *
 Tcl_InitSubsystems(int flags, ...)
 {
     va_list argList;
-
     int argc = 0;
     void **argv = NULL;
 
@@ -1459,7 +1457,7 @@ Tcl_InitSubsystems(int flags, ...)
 	argc = va_arg(argList, int);
 	argv = va_arg(argList, void **);
     }
-    va_end (argList);
+    va_end(argList);
 
     TclInitSubsystems();
     TclpSetInitialEncodings();