Rename buf_append() in cstp.c to cbuf_append()

We're about to make it use the nicer buf_append() from http.c but let's
make the simple change to avoid the conflict first...

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

cstp.c

@@ -58,7 +58,7 @@ static struct pkt dpd_resp_pkt = {
 };
 
 static int  __attribute__ ((format (printf, 3, 4)))
-    buf_append(char *buf, int len, const char *fmt, ...)
+    cbuf_append(char *buf, int len, const char *fmt, ...)
 {
 	int start = strlen(buf);
 	int ret;
@@ -198,25 +198,25 @@ static int start_cstp_connection(struct openconnect_info *vpninfo)
 	calculate_mtu(vpninfo, &base_mtu, &mtu);
 
 	buf[0] = 0;
-	buf_append(buf, sizeof(buf), "CONNECT /CSCOSSLC/tunnel HTTP/1.1\r\n");
-	buf_append(buf, sizeof(buf), "Host: %s\r\n", vpninfo->hostname);
-	buf_append(buf, sizeof(buf), "User-Agent: %s\r\n", vpninfo->useragent);
-	buf_append(buf, sizeof(buf), "Cookie: webvpn=%s\r\n", vpninfo->cookie);
-	buf_append(buf, sizeof(buf), "X-CSTP-Version: 1\r\n");
-	buf_append(buf, sizeof(buf), "X-CSTP-Hostname: %s\r\n", vpninfo->localname);
+	cbuf_append(buf, sizeof(buf), "CONNECT /CSCOSSLC/tunnel HTTP/1.1\r\n");
+	cbuf_append(buf, sizeof(buf), "Host: %s\r\n", vpninfo->hostname);
+	cbuf_append(buf, sizeof(buf), "User-Agent: %s\r\n", vpninfo->useragent);
+	cbuf_append(buf, sizeof(buf), "Cookie: webvpn=%s\r\n", vpninfo->cookie);
+	cbuf_append(buf, sizeof(buf), "X-CSTP-Version: 1\r\n");
+	cbuf_append(buf, sizeof(buf), "X-CSTP-Hostname: %s\r\n", vpninfo->localname);
 	if (vpninfo->deflate && i < sizeof(buf))
-		buf_append(buf, sizeof(buf), "X-CSTP-Accept-Encoding: deflate;q=1.0\r\n");
+		cbuf_append(buf, sizeof(buf), "X-CSTP-Accept-Encoding: deflate;q=1.0\r\n");
 	if (base_mtu)
-		buf_append(buf, sizeof(buf), "X-CSTP-Base-MTU: %d\r\n", base_mtu);
-	buf_append(buf, sizeof(buf), "X-CSTP-MTU: %d\r\n", mtu);
-	buf_append(buf, sizeof(buf), "X-CSTP-Address-Type: %s\r\n",
+		cbuf_append(buf, sizeof(buf), "X-CSTP-Base-MTU: %d\r\n", base_mtu);
+	cbuf_append(buf, sizeof(buf), "X-CSTP-MTU: %d\r\n", mtu);
+	cbuf_append(buf, sizeof(buf), "X-CSTP-Address-Type: %s\r\n",
 			       vpninfo->disable_ipv6 ? "IPv4" : "IPv6,IPv4");
 	if (!vpninfo->disable_ipv6)
-		buf_append(buf, sizeof(buf), "X-CSTP-Full-IPv6-Capability: true\r\n");
-	buf_append(buf, sizeof(buf), "X-DTLS-Master-Secret: ");
+		cbuf_append(buf, sizeof(buf), "X-CSTP-Full-IPv6-Capability: true\r\n");
+	cbuf_append(buf, sizeof(buf), "X-DTLS-Master-Secret: ");
 	for (i = 0; i < sizeof(vpninfo->dtls_secret); i++)
-		buf_append(buf, sizeof(buf), "%02X", vpninfo->dtls_secret[i]);
-	buf_append(buf, sizeof(buf), "\r\nX-DTLS-CipherSuite: %s\r\n\r\n",
+		cbuf_append(buf, sizeof(buf), "%02X", vpninfo->dtls_secret[i]);
+	cbuf_append(buf, sizeof(buf), "\r\nX-DTLS-CipherSuite: %s\r\n\r\n",
 			       vpninfo->dtls_ciphers ? : DEFAULT_CIPHER_LIST);
 
 	vpninfo->ssl_write(vpninfo, buf, strlen(buf));