Commit 49a99134 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

curl.h: s/HTTPPOST_/CURL_HTTPOST_ 

Fixes a name space pollution at the cost of programs using one of these
defines will no longer compile. However, the vast majority of libcurl
programs that do multipart formposts use curl_formadd() to build this
list.

Closes #506
parent fbf09b77

include/curl/curl.h

+16 −12
Original line number Diff line number Diff line
@@ -136,18 +136,22 @@ struct curl_httppost { 
                                       file, this link should link to following

                                       files */

  long flags;                       /* as defined below */

#define HTTPPOST_FILENAME (1<<0)    /* specified content is a file name */

#define HTTPPOST_READFILE (1<<1)    /* specified content is a file name */

#define HTTPPOST_PTRNAME (1<<2)     /* name is only stored pointer

                                       do not free in formfree */

#define HTTPPOST_PTRCONTENTS (1<<3) /* contents is only stored pointer

                                       do not free in formfree */

#define HTTPPOST_BUFFER (1<<4)      /* upload file from buffer */

#define HTTPPOST_PTRBUFFER (1<<5)   /* upload file from pointer contents */

#define HTTPPOST_CALLBACK (1<<6)    /* upload file contents by using the

                                       regular read callback to get the data

                                       and pass the given pointer as custom

                                       pointer */



/* specified content is a file name */

#define CURL_HTTPPOST_FILENAME (1<<0)

/* specified content is a file name */

#define CURL_HTTPPOST_READFILE (1<<1)

/* name is only stored pointer do not free in formfree */

#define CURL_HTTPPOST_PTRNAME (1<<2)

/* contents is only stored pointer do not free in formfree */

#define CURL_HTTPPOST_PTRCONTENTS (1<<3)

/* upload file from buffer */

#define CURL_HTTPPOST_BUFFER (1<<4)

/* upload file from pointer contents */

#define CURL_HTTPPOST_PTRBUFFER (1<<5)

/* upload file contents by using the regular read callback to get the data and

   pass the given pointer as custom pointer */

#define CURL_HTTPPOST_CALLBACK (1<<6)



  char *showfilename;               /* The file name to show. If not set, the

                                       actual file name will be used (if this

lib/formdata.c

+8 −0
Original line number Diff line number Diff line
@@ -57,6 +57,14 @@ static char *formboundary(struct SessionHandle *data); 
#define FORM_FILE_SEPARATOR ','

#define FORM_TYPE_SEPARATOR ';'



#define HTTPPOST_PTRNAME CURL_HTTPPOST_PTRNAME

#define HTTPPOST_FILENAME CURL_HTTPPOST_FILENAME

#define HTTPPOST_PTRCONTENTS CURL_HTTPPOST_PTRCONTENTS

#define HTTPPOST_READFILE CURL_HTTPPOST_READFILE

#define HTTPPOST_PTRBUFFER CURL_HTTPPOST_PTRBUFFER

#define HTTPPOST_CALLBACK CURL_HTTPPOST_CALLBACK

#define HTTPPOST_BUFFER CURL_HTTPPOST_BUFFER



/***************************************************************************

 *

 * AddHttpPost()

src/tool_setopt.c

+3 −3
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -392,11 +392,11 @@ CURLcode tool_setopt_httppost(CURL *curl, struct GlobalConfig *config, 
          ret = CURLE_OUT_OF_MEMORY;

          goto nomem;

        }

        if(pp->flags & HTTPPOST_FILENAME) {

        if(pp->flags & CURL_HTTPPOST_FILENAME) {

          /* file upload as for -F @filename */

          DATA1("             CURLFORM_FILE, \"%s\",", escaped);

        }

        else if(pp->flags & HTTPPOST_READFILE) {

        else if(pp->flags & CURL_HTTPPOST_READFILE) {

          /* content from file as for -F <filename */

          DATA1("             CURLFORM_FILECONTENT, \"%s\",", escaped);

        }