X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=cgi.c;h=94f6875f4f448eee6f7204833dfa360039de7ff5;hp=580e2bfb47439907e8665a350087f6fc78890373;hb=a522f06726fd0fe74058420d68f61457f07faa3f;hpb=038436dace0ed97529a10ecc4fefb7f2f2c0b1a4 diff --git a/cgi.c b/cgi.c index 580e2bfb..94f6875f 100644 --- a/cgi.c +++ b/cgi.c @@ -106,7 +106,7 @@ static const struct cgi_dispatcher cgi_dispatchers[] = { */ { "client-tags", cgi_show_client_tags, - "View or toggle the tags that can be set based on the clients address", + "View or toggle the tags that can be set based on the client's address", TRUE }, #endif { "show-request", @@ -537,7 +537,8 @@ static struct http_response *dispatch_known_cgi(struct client_state * csp, *query_args_start++ = '\0'; param_list = new_map(); err = map(param_list, "file", 1, url_decode(query_args_start), 0); - if (JB_ERR_OK != err) { + if (JB_ERR_OK != err) + { free(param_list); free(path_copy); return cgi_error_memory(); @@ -1276,7 +1277,7 @@ jb_err cgi_error_unknown(const struct client_state *csp, static const char body_suffix[] = "

\n" "

Please " - "" + "" "file a bug report.

\n" "\n" "\n"; @@ -1515,13 +1516,15 @@ static void get_locale_time(char *buf, size_t buffer_size) #elif defined(MUTEX_LOCKS_AVAILABLE) privoxy_mutex_lock(&localtime_mutex); timeptr = localtime(¤t_time); - privoxy_mutex_unlock(&localtime_mutex); #else timeptr = localtime(¤t_time); #endif strftime(buf, buffer_size, "%a %b %d %X %Z %Y", timeptr); +#if !defined(HAVE_LOCALTIME_R) && defined(MUTEX_LOCKS_AVAILABLE) + privoxy_mutex_unlock(&localtime_mutex); +#endif } @@ -1558,14 +1561,14 @@ char *compress_buffer(char *buffer, size_t *buffer_length, int compression_level (Bytef *)buffer, *buffer_length, compression_level)) { log_error(LOG_LEVEL_ERROR, - "compress2() failed. Buffer size: %d, compression level: %d.", + "compress2() failed. Buffer size: %lu, compression level: %d.", new_length, compression_level); freez(compressed_buffer); return NULL; } log_error(LOG_LEVEL_RE_FILTER, - "Compressed content from %d to %d bytes. Compression level: %d", + "Compressed content from %lu to %lu bytes. Compression level: %d", *buffer_length, new_length, compression_level); *buffer_length = (size_t)new_length;