buffer_size: make sure it always has the correct size

Removes the need for CURL_BUFSIZE

diff --git a/lib/easy.c b/lib/easy.c
index 5189d0794f74b3f521dcaf7a10046d0e868a2bfe..531f18b43b52aac28605d774fe20b71870b81837 100644 (file)
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -870,7 +870,7 @@ struct Curl_easy *curl_easy_duphandle(struct Curl_easy *data)
    * the likeliness of us forgetting to init a buffer here in the future.
    */
   outcurl->set.buffer_size = data->set.buffer_size;
-  outcurl->state.buffer = malloc(CURL_BUFSIZE(outcurl->set.buffer_size) + 1);
+  outcurl->state.buffer = malloc(outcurl->set.buffer_size + 1);
   if(!outcurl->state.buffer)
     goto fail;
 

diff --git a/lib/ftp.c b/lib/ftp.c
index a0ea7cad18ebc8c4b5018d0c766485941135b903..cd2abdef626825e70b25d60fa040fefa8d2dc1b6 100644 (file)
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -2824,7 +2824,7 @@ static CURLcode ftp_statemach_act(struct connectdata *conn)
     case FTP_PWD:
       if(ftpcode == 257) {
         char *ptr=&data->state.buffer[4];  /* start on the first letter */
-        const size_t buf_size = CURL_BUFSIZE(data->set.buffer_size);
+        const size_t buf_size = data->set.buffer_size;
         char *dir;
         char *store;
 

diff --git a/lib/telnet.c b/lib/telnet.c
index bbdbb86ad84d86efbba4274ed0e5415ba10b62c5..57d908c9cfe2271f8ad69f16cd452a5206ed3f72 100644 (file)
--- a/lib/telnet.c
+++ b/lib/telnet.c
@@ -1416,7 +1416,7 @@ static CURLcode telnet_do(struct connectdata *conn, bool *done)
 
   /* Keep on listening and act on events */
   while(keepon) {
-    const DWORD buf_size = (DWORD)CURL_BUFSIZE(data->set.buffer_size);
+    const DWORD buf_size = (DWORD)data->set.buffer_size;
     waitret = WaitForMultipleObjects(obj_count, objs, FALSE, wait_timeout);
     switch(waitret) {
     case WAIT_TIMEOUT:

diff --git a/lib/url.c b/lib/url.c
index 04c03ac8d97ea2002de9e359cead6908c7680cf0..965b5b57b64969d1065d43768e7cf1483cb1c366 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -607,6 +607,7 @@ CURLcode Curl_init_userdefined(struct UserDefined *set)
 
   set->expect_100_timeout = 1000L; /* Wait for a second by default. */
   set->sep_headers = TRUE; /* separated header lists by default */
+  set->buffer_size = BUFSIZE;
 
   Curl_http2_init_userset(set);
   return result;

diff --git a/lib/urldata.h b/lib/urldata.h
index b300d8a690d4f99ad99f40eff163523eef5b0e5a..0cedfa817bc2c0a7144a020dd4165eddcc1369e1 100644 (file)
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -206,7 +206,6 @@
 #undef MAX_BUFSIZE
 #define MAX_BUFSIZE CURL_MAX_READ_SIZE
 #define MIN_BUFSIZE 1024
-#define CURL_BUFSIZE(x) ((x)?(x):(BUFSIZE))
 
 /* Initial size of the buffer to store headers in, it'll be enlarged in case
    of need. */