From 891fb8da7b436164cdf72fca41b935e0b6a53029 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Fri, 12 Sep 2008 17:51:43 +0000 Subject: [PATCH 1/1] - A few style fixes. - Remove a pointless cast. --- parsers.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/parsers.c b/parsers.c index 17e85019..d08c4fc2 100644 --- a/parsers.c +++ b/parsers.c @@ -1,4 +1,4 @@ -const char parsers_rcs[] = "$Id: parsers.c,v 1.138 2008/08/30 12:03:07 fabiankeil Exp $"; +const char parsers_rcs[] = "$Id: parsers.c,v 1.139 2008/09/04 08:13:58 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/parsers.c,v $ @@ -44,6 +44,10 @@ const char parsers_rcs[] = "$Id: parsers.c,v 1.138 2008/08/30 12:03:07 fabiankei * * Revisions : * $Log: parsers.c,v $ + * Revision 1.139 2008/09/04 08:13:58 fabiankeil + * Prepare for critical sections on Windows by adding a + * layer of indirection before the pthread mutex functions. + * * Revision 1.138 2008/08/30 12:03:07 fabiankeil * Remove FEATURE_COOKIE_JAR. * @@ -979,7 +983,7 @@ static const struct parsers server_patterns[] = { { "Last-Modified:", 14, server_last_modified }, { "*", 0, crunch_server_header }, { "*", 0, filter_header }, - { NULL, 0, NULL } + { NULL, 0, NULL } }; static const add_header_func_ptr add_client_headers[] = { @@ -1696,10 +1700,10 @@ static char *get_header_line(struct iob *iob) if (*ret == '\0') { freez(ret); - return(NULL); + return NULL; } - return(ret); + return ret; } @@ -1740,9 +1744,9 @@ char *get_header_value(const struct list *header_list, const char *header_name) /* * Found: return pointer to start of value */ - ret = (char *) (cur_entry->str + length); + ret = cur_entry->str + length; while (*ret && ijb_isspace(*ret)) ret++; - return(ret); + return ret; } } } @@ -1877,7 +1881,7 @@ jb_err update_server_headers(struct client_state *csp) #ifdef FEATURE_ZLIB { "Content-Encoding:", 17, server_content_encoding }, #endif /* def FEATURE_ZLIB */ - { NULL, 0, NULL } + { NULL, 0, NULL } }; if (strncmpic(csp->http->cmd, "HEAD", 4)) @@ -1965,7 +1969,7 @@ static jb_err header_tagger(struct client_state *csp, char *header) { log_error(LOG_LEVEL_ERROR, "Inconsistent configuration: " "tagging enabled, but no taggers available."); - return(JB_ERR_OK); + return JB_ERR_OK; } for (i = 0; i < MAX_AF_FILES; i++) @@ -2183,7 +2187,7 @@ static jb_err filter_header(struct client_state *csp, char **header) { log_error(LOG_LEVEL_ERROR, "Inconsistent configuration: " "header filtering enabled, but no matching filters available."); - return(JB_ERR_OK); + return JB_ERR_OK; } for (i = 0; i < MAX_AF_FILES; i++) @@ -2283,7 +2287,7 @@ static jb_err filter_header(struct client_state *csp, char **header) freez(*header); } - return(JB_ERR_OK); + return JB_ERR_OK; } -- 2.39.2