summaryrefslogtreecommitdiffstatsabout
path: root/functions.h
diff options
context:
space:
mode:
authorEdward Rudd <urkle@outoforder.cc>2004-05-05 21:38:29 (GMT)
committer Edward Rudd <urkle@outoforder.cc>2004-05-05 21:38:29 (GMT)
commit0c5c1bb0d0a3efe9ba96784cc5bc58c174db562e (patch)
tree3b9bb9c9ecf6b72556d65a6cf7b56ccd1760470e /functions.h
parentd98a5b1a3da9aec6911b28d1104411a942dffb1e (diff)
changed strstr to ap_strstr or ap_strstr_c
changed strchr to ap_strchr or ap_strchr_c
Diffstat (limited to 'functions.h')
-rw-r--r--functions.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/functions.h b/functions.h
index 7281588..dcbc939 100644
--- a/functions.h
+++ b/functions.h
@@ -185,7 +185,7 @@ static const char *extract_specific_cookie(request_rec *r, char *a)
185 log_error(APLOG_MARK,APLOG_DEBUG, 0, r->server, 185 log_error(APLOG_MARK,APLOG_DEBUG, 0, r->server,
186 "Cookie2: [%s]", cookiestr); 186 "Cookie2: [%s]", cookiestr);
187 /* Does the cookie string contain one with our name? */ 187 /* Does the cookie string contain one with our name? */
188 isvalid = strstr(cookiestr, a); 188 isvalid = ap_strstr_c(cookiestr, a);
189 if (isvalid != NULL) { 189 if (isvalid != NULL) {
190 /* Move past the cookie name and equal sign */ 190 /* Move past the cookie name and equal sign */
191 isvalid += strlen(a) + 1; 191 isvalid += strlen(a) + 1;
@@ -193,7 +193,7 @@ static const char *extract_specific_cookie(request_rec *r, char *a)
193 cookiebuf = apr_pstrdup(r->pool, isvalid); 193 cookiebuf = apr_pstrdup(r->pool, isvalid);
194 /* Segregate just this cookie out of the string 194 /* Segregate just this cookie out of the string
195 * with a terminating nul at the first semicolon */ 195 * with a terminating nul at the first semicolon */
196 cookieend = strchr(cookiebuf, ';'); 196 cookieend = ap_strchr(cookiebuf, ';');
197 if (cookieend != NULL) 197 if (cookieend != NULL)
198 *cookieend = '\0'; 198 *cookieend = '\0';
199 return cookiebuf; 199 return cookiebuf;
@@ -204,11 +204,11 @@ static const char *extract_specific_cookie(request_rec *r, char *a)
204 if (cookiestr != NULL) { 204 if (cookiestr != NULL) {
205 log_error(APLOG_MARK,APLOG_DEBUG, 0, r->server, 205 log_error(APLOG_MARK,APLOG_DEBUG, 0, r->server,
206 "Cookie: [%s]", cookiestr); 206 "Cookie: [%s]", cookiestr);
207 isvalid = strstr(cookiestr, a); 207 isvalid = ap_strstr_c(cookiestr, a);
208 if (isvalid != NULL) { 208 if (isvalid != NULL) {
209 isvalid += strlen(a) + 1; 209 isvalid += strlen(a) + 1;
210 cookiebuf = apr_pstrdup(r->pool, isvalid); 210 cookiebuf = apr_pstrdup(r->pool, isvalid);
211 cookieend = strchr(cookiebuf, ';'); 211 cookieend = ap_strchr(cookiebuf, ';');
212 if (cookieend != NULL) 212 if (cookieend != NULL)
213 *cookieend = '\0'; 213 *cookieend = '\0';
214 return cookiebuf; 214 return cookiebuf;
@@ -219,11 +219,11 @@ static const char *extract_specific_cookie(request_rec *r, char *a)
219 if (cookiestr != NULL) { 219 if (cookiestr != NULL) {
220 log_error(APLOG_MARK,APLOG_DEBUG, 0, r->server, 220 log_error(APLOG_MARK,APLOG_DEBUG, 0, r->server,
221 "Set-Cookie: [%s]", cookiestr); 221 "Set-Cookie: [%s]", cookiestr);
222 isvalid = strstr(cookiestr, a); 222 isvalid = ap_strstr_c(cookiestr, a);
223 if (isvalid != NULL) { 223 if (isvalid != NULL) {
224 isvalid += strlen(a) + 1; 224 isvalid += strlen(a) + 1;
225 cookiebuf = apr_pstrdup(r->pool, isvalid); 225 cookiebuf = apr_pstrdup(r->pool, isvalid);
226 cookieend = strchr(cookiebuf, ';'); 226 cookieend = ap_strchr(cookiebuf, ';');
227 if (cookieend != NULL) 227 if (cookieend != NULL)
228 *cookieend = '\0'; 228 *cookieend = '\0';
229 return cookiebuf; 229 return cookiebuf;