Commit c11a1bf7 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

made some char * into const char * and I removed the check for size > 0 

in the add_buffer function.
parent f1955020

lib/http.c

+20 −22
Original line number Original line Diff line number Diff line
@@ -104,7 +104,7 @@ 
 * be sent in one go.

 * be sent in one go.

 */

 */

static CURLcode

static CURLcode

 add_buffer(send_buffer *in, void *inptr, size_t size);

 add_buffer(send_buffer *in, const void *inptr, size_t size);





/*

/*

 * add_buffer_init() returns a fine buffer struct

 * add_buffer_init() returns a fine buffer struct
@@ -148,7 +148,7 @@ size_t add_buffer_send(int sockfd, struct connectdata *conn, send_buffer *in) 
 * add_bufferf() builds a buffer from the formatted input

 * add_bufferf() builds a buffer from the formatted input

 */

 */

static

static

CURLcode add_bufferf(send_buffer *in, char *fmt, ...)

CURLcode add_bufferf(send_buffer *in, const char *fmt, ...)

{

{

  CURLcode result = CURLE_OUT_OF_MEMORY;

  CURLcode result = CURLE_OUT_OF_MEMORY;

  char *s;

  char *s;
@@ -168,12 +168,11 @@ CURLcode add_bufferf(send_buffer *in, char *fmt, ...) 
 * add_buffer() appends a memory chunk to the existing one

 * add_buffer() appends a memory chunk to the existing one

 */

 */

static

static

CURLcode add_buffer(send_buffer *in, void *inptr, size_t size)

CURLcode add_buffer(send_buffer *in, const void *inptr, size_t size)

{

{

  char *new_rb;

  char *new_rb;

  int new_size;

  int new_size;





  if(size > 0) {

  if(!in->buffer ||

  if(!in->buffer ||

     ((in->size_used + size) > (in->size_max - 1))) {

     ((in->size_used + size) > (in->size_max - 1))) {

    new_size = (in->size_used+size)*2;

    new_size = (in->size_used+size)*2;
@@ -193,7 +192,6 @@ CURLcode add_buffer(send_buffer *in, void *inptr, size_t size) 
  memcpy(&in->buffer[in->size_used], inptr, size);

  memcpy(&in->buffer[in->size_used], inptr, size);

      

      

  in->size_used += size;

  in->size_used += size;

  }





  return CURLE_OK;

  return CURLE_OK;

}

}
@@ -240,7 +238,7 @@ int GetLine(int sockfd, char *buf, struct connectdata *conn) 
 * This function checks the linked list of custom HTTP headers for a particular

 * This function checks the linked list of custom HTTP headers for a particular

 * header (prefix).

 * header (prefix).

 */

 */

bool static checkheaders(struct UrlData *data, char *thisheader)

static bool checkheaders(struct UrlData *data, const char *thisheader)

{

{

  struct curl_slist *head;

  struct curl_slist *head;

  size_t thislen = strlen(thisheader);

  size_t thislen = strlen(thisheader);