moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

the strequal and strnequal should now be called with the proper curl_ prefix

Browse Source
This commit is contained in:
Daniel Stenberg 2003-02-28 12:20:08 +00:00
parent 60e015d0c1
commit 9121b1f41d
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ssluse.c
View File

@ -507,7 +507,7 @@ static int Get_SSL_Session(struct connectdata *conn,
if(!check->sessionid) if(!check->sessionid)
/* not session ID means blank entry */ /* not session ID means blank entry */
continue; continue;
if(strequal(conn->name, check->name) && if(curl_strequal(conn->name, check->name) &&
(conn->remote_port == check->remote_port) ) { (conn->remote_port == check->remote_port) ) {
/* yes, we have a session ID! */ /* yes, we have a session ID! */
data->state.sessionage++; /* increase general age */ data->state.sessionage++; /* increase general age */
@ -688,7 +688,7 @@ cert_hostcheck(const char *certname, const char *hostname)
!strlen(hostname)) /* sanity check */ !strlen(hostname)) /* sanity check */
return 0; return 0;
if(strequal(certname, hostname)) /* trivial case */ if(curl_strequal(certname, hostname)) /* trivial case */
return 1; return 1;
certdomain = certname + 1; certdomain = certname + 1;
@ -704,7 +704,7 @@ cert_hostcheck(const char *certname, const char *hostname)
if(tmp) { if(tmp) {
/* ok the certname's domain matches the hostname, let's check that it's a /* ok the certname's domain matches the hostname, let's check that it's a
tail-match */ tail-match */
if(strequal(tmp, certdomain)) if(curl_strequal(tmp, certdomain))
/* looks like a match. Just check we havent swallowed a '.' */ /* looks like a match. Just check we havent swallowed a '.' */
return tmp == strchr(hostname, '.'); return tmp == strchr(hostname, '.');
else else

6
lib/telnet.c
View File

@ -765,7 +765,7 @@ static int check_telnet_options(struct connectdata *conn)
option_keyword, option_arg) == 2) { option_keyword, option_arg) == 2) {
/* Terminal type */ /* Terminal type */
if(strequal(option_keyword, "TTYPE")) { if(curl_strequal(option_keyword, "TTYPE")) {
strncpy(tn->subopt_ttype, option_arg, 31); strncpy(tn->subopt_ttype, option_arg, 31);
tn->subopt_ttype[31] = 0; /* String termination */ tn->subopt_ttype[31] = 0; /* String termination */
tn->us_preferred[TELOPT_TTYPE] = YES; tn->us_preferred[TELOPT_TTYPE] = YES;
@ -773,7 +773,7 @@ static int check_telnet_options(struct connectdata *conn)
} }
/* Display variable */ /* Display variable */
if(strequal(option_keyword, "XDISPLOC")) { if(curl_strequal(option_keyword, "XDISPLOC")) {
strncpy(tn->subopt_xdisploc, option_arg, 127); strncpy(tn->subopt_xdisploc, option_arg, 127);
tn->subopt_xdisploc[127] = 0; /* String termination */ tn->subopt_xdisploc[127] = 0; /* String termination */
tn->us_preferred[TELOPT_XDISPLOC] = YES; tn->us_preferred[TELOPT_XDISPLOC] = YES;
@ -781,7 +781,7 @@ static int check_telnet_options(struct connectdata *conn)
} }
/* Environment variable */ /* Environment variable */
if(strequal(option_keyword, "NEW_ENV")) { if(curl_strequal(option_keyword, "NEW_ENV")) {
buf = strdup(option_arg); buf = strdup(option_arg);
if(!buf) if(!buf)
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;

24
src/main.c
View File

@ -1104,10 +1104,10 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */
int fnam=strlen(word); int fnam=strlen(word);
int numhits=0; int numhits=0;
for(j=0; j< sizeof(aliases)/sizeof(aliases[0]); j++) { for(j=0; j< sizeof(aliases)/sizeof(aliases[0]); j++) {
if(strnequal(aliases[j].lname, word, fnam)) { if(curl_strnequal(aliases[j].lname, word, fnam)) {
longopt = TRUE; longopt = TRUE;
numhits++; numhits++;
if(strequal(aliases[j].lname, word)) { if(curl_strequal(aliases[j].lname, word)) {
parse = aliases[j].letter; parse = aliases[j].letter;
hit = j; hit = j;
numhits = 1; /* a single unique hit */ numhits = 1; /* a single unique hit */
@ -1323,7 +1323,7 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */
break; break;
case 'C': case 'C':
/* This makes us continue an ftp transfer at given position */ /* This makes us continue an ftp transfer at given position */
if(!strequal(nextarg, "-")) { if(!curl_strequal(nextarg, "-")) {
config->resume_from= atoi(nextarg); config->resume_from= atoi(nextarg);
config->resume_from_current = FALSE; config->resume_from_current = FALSE;
} }
@ -1345,7 +1345,7 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */
nextarg++; /* pass the @ */ nextarg++; /* pass the @ */
if(strequal("-", nextarg)) if(curl_strequal("-", nextarg))
file = stdin; file = stdin;
else else
file = fopen(nextarg, "rb"); file = fopen(nextarg, "rb");
@ -1637,7 +1637,7 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */
case 'T': case 'T':
/* we are uploading */ /* we are uploading */
config->conf |= CONF_UPLOAD; config->conf |= CONF_UPLOAD;
if(!strequal("-", nextarg)) if(!curl_strequal("-", nextarg))
/* make - equal stdin */ /* make - equal stdin */
GetStr(&config->infile, nextarg); GetStr(&config->infile, nextarg);
break; break;
@ -1664,7 +1664,7 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */
or - (stdin) follows */ or - (stdin) follows */
FILE *file; FILE *file;
nextarg++; /* pass the @ */ nextarg++; /* pass the @ */
if(strequal("-", nextarg)) if(curl_strequal("-", nextarg))
file = stdin; file = stdin;
else else
file = fopen(nextarg, "r"); file = fopen(nextarg, "r");
@ -2199,7 +2199,7 @@ int my_trace(CURL *handle, curl_infotype type,
if(!config->trace_stream) { if(!config->trace_stream) {
/* open for append */ /* open for append */
if(strequal("-", config->trace_dump)) if(curl_strequal("-", config->trace_dump))
config->trace_stream = stdout; config->trace_stream = stdout;
else { else {
config->trace_stream = fopen(config->trace_dump, "w"); config->trace_stream = fopen(config->trace_dump, "w");
@ -2370,7 +2370,7 @@ operate(struct Configurable *config, int argc, char *argv[])
config->create_dirs=FALSE; config->create_dirs=FALSE;
if(argc>1 && if(argc>1 &&
(!strnequal("--", argv[1], 2) && (argv[1][0] == '-')) && (!curl_strnequal("--", argv[1], 2) && (argv[1][0] == '-')) &&
strchr(argv[1], 'q')) { strchr(argv[1], 'q')) {
/* /*
* The first flag, that is not a verbose name, but a shortname * The first flag, that is not a verbose name, but a shortname
@ -2399,7 +2399,7 @@ operate(struct Configurable *config, int argc, char *argv[])
char *flag = argv[i]; char *flag = argv[i];
if(strequal("--", argv[i])) if(curl_strequal("--", argv[i]))
/* this indicates the end of the flags and thus enables the /* this indicates the end of the flags and thus enables the
following (URL) argument to start with -. */ following (URL) argument to start with -. */
stillflags=FALSE; stillflags=FALSE;
@ -2553,7 +2553,7 @@ operate(struct Configurable *config, int argc, char *argv[])
/* save outfile pattern before expansion */ /* save outfile pattern before expansion */
outfiles = urlnode->outfile?strdup(urlnode->outfile):NULL; outfiles = urlnode->outfile?strdup(urlnode->outfile):NULL;
if ((!outfiles || strequal(outfiles, "-")) && urlnum > 1) { if ((!outfiles || curl_strequal(outfiles, "-")) && urlnum > 1) {
/* multiple files extracted to stdout, insert separators! */ /* multiple files extracted to stdout, insert separators! */
separator = 1; separator = 1;
} }
@ -2564,7 +2564,7 @@ operate(struct Configurable *config, int argc, char *argv[])
outfile = outfiles?strdup(outfiles):NULL; outfile = outfiles?strdup(outfiles):NULL;
if((urlnode->flags&GETOUT_USEREMOTE) || if((urlnode->flags&GETOUT_USEREMOTE) ||
(outfile && !strequal("-", outfile)) ) { (outfile && !curl_strequal("-", outfile)) ) {
/* /*
* We have specified a file name to store the result in, or we have * We have specified a file name to store the result in, or we have
@ -2946,7 +2946,7 @@ operate(struct Configurable *config, int argc, char *argv[])
fprintf(config->errors, "curl: (%d) %s\n", res, errorbuffer); fprintf(config->errors, "curl: (%d) %s\n", res, errorbuffer);
#endif #endif
if (outfile && !strequal(outfile, "-") && outs.stream) if (outfile && !curl_strequal(outfile, "-") && outs.stream)
fclose(outs.stream); fclose(outs.stream);
#ifdef HAVE_UTIME #ifdef HAVE_UTIME

2
src/writeout.c
View File

@ -108,7 +108,7 @@ void ourWriteOut(CURL *curl, char *writeinfo)
keepit=*end; keepit=*end;
*end=0; /* zero terminate */ *end=0; /* zero terminate */
for(i=0; replacements[i].name; i++) { for(i=0; replacements[i].name; i++) {
if(strequal(ptr, replacements[i].name)) { if(curl_strequal(ptr, replacements[i].name)) {
switch(replacements[i].id) { switch(replacements[i].id) {
case VAR_EFFECTIVE_URL: case VAR_EFFECTIVE_URL:
if((CURLE_OK == if((CURLE_OK ==