moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

Created a CURLMIN macro to match CURLMAX

This commit is contained in:
Dan Fandrich 2009-01-07 19:39:35 +00:00
parent dd058b8de6
commit 80ffd3581f
4 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/sendf.c
View File

@ -559,10 +559,6 @@ int Curl_read_plain(curl_socket_t sockfd,
return CURLE_OK; return CURLE_OK;
} }
#ifndef MIN
#define MIN(a,b) ((a) < (b) ? (a) : (b))
#endif
/* /*
* Internal read-from-socket function. This is meant to deal with plain * Internal read-from-socket function. This is meant to deal with plain
* sockets, SSL sockets and kerberos sockets. * sockets, SSL sockets and kerberos sockets.
@ -591,7 +587,7 @@ int Curl_read(struct connectdata *conn, /* connection data */
/* If session can pipeline, check connection buffer */ /* If session can pipeline, check connection buffer */
if(pipelining) { if(pipelining) {
size_t bytestocopy = MIN(conn->buf_len - conn->read_pos, sizerequested); size_t bytestocopy = CURLMIN(conn->buf_len - conn->read_pos, sizerequested);
/* Copy from our master buffer first if we have some unread data there*/ /* Copy from our master buffer first if we have some unread data there*/
if(bytestocopy > 0) { if(bytestocopy > 0) {
@ -604,11 +600,11 @@ int Curl_read(struct connectdata *conn, /* connection data */
} }
/* If we come here, it means that there is no data to read from the buffer, /* If we come here, it means that there is no data to read from the buffer,
* so we read from the socket */ * so we read from the socket */
bytesfromsocket = MIN(sizerequested, BUFSIZE * sizeof (char)); bytesfromsocket = CURLMIN(sizerequested, BUFSIZE * sizeof (char));
buffertofill = conn->master_buffer; buffertofill = conn->master_buffer;
} }
else { else {
bytesfromsocket = MIN((long)sizerequested, conn->data->set.buffer_size ? bytesfromsocket = CURLMIN((long)sizerequested, conn->data->set.buffer_size ?
conn->data->set.buffer_size : BUFSIZE); conn->data->set.buffer_size : BUFSIZE);
buffertofill = buf; buffertofill = buf;
} }

6
lib/transfer.c
View File

@ -323,10 +323,6 @@ static int data_pending(const struct connectdata *conn)
Curl_ssl_data_pending(conn, FIRSTSOCKET); Curl_ssl_data_pending(conn, FIRSTSOCKET);
} }
#ifndef MIN
#define MIN(a,b) (a < b ? a : b)
#endif
static void read_rewind(struct connectdata *conn, static void read_rewind(struct connectdata *conn,
size_t thismuch) size_t thismuch)
{ {
@ -338,7 +334,7 @@ static void read_rewind(struct connectdata *conn,
char buf[512 + 1]; char buf[512 + 1];
size_t show; size_t show;
show = MIN(conn->buf_len - conn->read_pos, sizeof(buf)-1); show = CURLMIN(conn->buf_len - conn->read_pos, sizeof(buf)-1);
if(conn->master_buffer) { if(conn->master_buffer) {
memcpy(buf, conn->master_buffer + conn->read_pos, show); memcpy(buf, conn->master_buffer + conn->read_pos, show);
buf[show] = '\0'; buf[show] = '\0';

4
lib/urldata.h
View File

@ -150,9 +150,11 @@
#define CURLEASY_MAGIC_NUMBER 0xc0dedbadU #define CURLEASY_MAGIC_NUMBER 0xc0dedbadU
/* Just a convenience macro to get the larger value out of two given. /* Some convenience macros to get the larger/smaller value out of two given.
We prefix with CURL to prevent name collisions. */ We prefix with CURL to prevent name collisions. */
#define CURLMAX(x,y) ((x)>(y)?(x):(y)) #define CURLMAX(x,y) ((x)>(y)?(x):(y))
#define CURLMIN(x,y) ((x)<(y)?(x):(y))
#if defined(HAVE_KRB4) || defined(HAVE_GSSAPI) #if defined(HAVE_KRB4) || defined(HAVE_GSSAPI)
/* Types needed for krb4/5-ftp connections */ /* Types needed for krb4/5-ftp connections */

8
src/main.c
View File

@ -184,14 +184,6 @@ char **__crt0_glob_function (char *arg)
#define CURL_PROGRESS_STATS 0 /* default progress display */ #define CURL_PROGRESS_STATS 0 /* default progress display */
#define CURL_PROGRESS_BAR 1 #define CURL_PROGRESS_BAR 1
/**
* @def MIN
* standard MIN macro
*/
#ifndef MIN
#define MIN(X,Y) (((X) < (Y)) ? (X) : (Y))
#endif
typedef enum { typedef enum {
HTTPREQ_UNSPEC, HTTPREQ_UNSPEC,
HTTPREQ_GET, HTTPREQ_GET,