mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2024-11-21 01:16:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

curl.h: s/HTTPPOST_/CURL_HTTPOST_

Browse Source 
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
This commit is contained in:
Daniel Stenberg 2015-10-31 22:48:21 +01:00
parent fbf09b7775
commit 49a991346e
3 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/curl/curl.h
View File

@ -136,18 +136,22 @@ struct curl_httppost {
file, this link should link to following file, this link should link to following
files */ files */
long flags; /* as defined below */ 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 */ /* specified content is a file name */
#define HTTPPOST_PTRNAME (1<<2) /* name is only stored pointer #define CURL_HTTPPOST_FILENAME (1<<0)
do not free in formfree */ /* specified content is a file name */
#define HTTPPOST_PTRCONTENTS (1<<3) /* contents is only stored pointer #define CURL_HTTPPOST_READFILE (1<<1)
do not free in formfree */ /* name is only stored pointer do not free in formfree */
#define HTTPPOST_BUFFER (1<<4) /* upload file from buffer */ #define CURL_HTTPPOST_PTRNAME (1<<2)
#define HTTPPOST_PTRBUFFER (1<<5) /* upload file from pointer contents */ /* contents is only stored pointer do not free in formfree */
#define HTTPPOST_CALLBACK (1<<6) /* upload file contents by using the #define CURL_HTTPPOST_PTRCONTENTS (1<<3)
regular read callback to get the data /* upload file from buffer */
and pass the given pointer as custom #define CURL_HTTPPOST_BUFFER (1<<4)
pointer */ /* 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 char *showfilename; /* The file name to show. If not set, the
actual file name will be used (if this actual file name will be used (if this

8
lib/formdata.c
View File

@ -57,6 +57,14 @@ static char *formboundary(struct SessionHandle *data);
#define FORM_FILE_SEPARATOR ',' #define FORM_FILE_SEPARATOR ','
#define FORM_TYPE_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() * AddHttpPost()

6
src/tool_setopt.c
View File

@ -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 * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * 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; ret = CURLE_OUT_OF_MEMORY;
goto nomem; goto nomem;
} }
if(pp->flags & HTTPPOST_FILENAME) { if(pp->flags & CURL_HTTPPOST_FILENAME) {
/* file upload as for -F @filename */ /* file upload as for -F @filename */
DATA1(" CURLFORM_FILE, \"%s\",", escaped); 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 */ /* content from file as for -F <filename */
DATA1(" CURLFORM_FILECONTENT, \"%s\",", escaped); DATA1(" CURLFORM_FILECONTENT, \"%s\",", escaped);
} }