printf "width" support for hosts (e.g. %15H)

src/libstrongswan/utils/host.c

@@ -106,49 +106,50 @@ static int print(FILE *stream, const struct printf_info *info,
 				 const void *const *args)
 {
 	private_host_t *this = *((private_host_t**)(args[0]));
-	char buffer[INET6_ADDRSTRLEN];
+	char buffer[INET6_ADDRSTRLEN + 16];
-	void *address;
+	int len;
-	u_int16_t port;
 	
 	if (this == NULL)
 	{
-		return fprintf(stream, "(null)");
+		len = sprintf(buffer, "(null)");
 	}
-	
+	else if (is_anyaddr(this))
-	if (is_anyaddr(this))
 	{
-		return fprintf(stream, "%%any");
+		len = sprintf(buffer, "%%any");
 	}
+	else
+	{
+		void *address;
+		u_int16_t port;
+		
+		address = &this->address6.sin6_addr;
+		port = this->address6.sin6_port;
 		
 		switch (this->address.sa_family)
 		{
 			case AF_INET:
 				address = &this->address4.sin_addr;
 				port = this->address4.sin_port;
-			break;
+				/* fall */
 			case AF_INET6:
-			address = &this->address6.sin6_addr;
-			port = this->address6.sin6_port;
-			break;
-		default:
-			return fprintf(stream, "(family not supported)");
-	}
 	
 				if (inet_ntop(this->address.sa_family, address,
 							  buffer, sizeof(buffer)) == NULL)
 				{
-		return fprintf(stream, "(address conversion failed)");
+					len = sprintf(buffer, "(address conversion failed)");
 				}
-	
+				else if (info->alt)
-	if (info->alt)
 				{
-		return fprintf(stream, "%s[%d]", buffer, ntohs(port));
+					len = sprintf(buffer, "%s[%d]", buffer, ntohs(port));
 				}
-	else
+				break;
-	{
+			default:
-		return fprintf(stream, "%s", buffer);
+				len = sprintf(buffer, "(family not supported)");
+				break;
 		}
 	}
+	return fprintf(stream, "%*s", info->width, buffer);
+}
 
 
 /**