summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Strauss <gstrauss@gluelogic.com>2016-10-09 19:19:37 -0400
committerGlenn Strauss <gstrauss@gluelogic.com>2016-10-09 19:19:37 -0400
commit81ce160d83792214040fee02497345f34481a3ee (patch)
treea0e09a34aaef295b8548d8f752390b115ec362cd
parentce24523b59ed97a42b2e446036b70f490400688f (diff)
downloadlighttpd-git-81ce160d83792214040fee02497345f34481a3ee.tar.gz
silence warnings from clang ccc-analyzer
-rw-r--r--src/buffer.c2
-rw-r--r--src/configfile.c2
-rw-r--r--src/mod_fastcgi.c2
-rw-r--r--src/mod_webdav.c4
4 files changed, 5 insertions, 5 deletions
diff --git a/src/buffer.c b/src/buffer.c
index 548493e7..053157bc 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -929,7 +929,7 @@ void buffer_path_simplify(buffer *dest, buffer *src)
walk++;
}
- pre2 = pre1 = 0;
+ pre1 = 0;
c = *(walk++);
/* prefix with '/' if not already present */
if (c != '/') {
diff --git a/src/configfile.c b/src/configfile.c
index 26556108..2d024841 100644
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -166,6 +166,8 @@ static int config_insert(server *srv) {
srv->config_storage = calloc(1, srv->config_context->used * sizeof(specific_config *));
force_assert(srv->config_storage);
+ force_assert(srv->config_context->used); /* static analysis hint for ccc
+-analyzer */
for (i = 0; i < srv->config_context->used; i++) {
data_config const* config = (data_config const*)srv->config_context->data[i];
diff --git a/src/mod_fastcgi.c b/src/mod_fastcgi.c
index 9066097a..ea63265e 100644
--- a/src/mod_fastcgi.c
+++ b/src/mod_fastcgi.c
@@ -2406,7 +2406,7 @@ static int fcgi_response_parse(server *srv, connection *con, plugin_data *p, buf
/* found the file */
/* parse range */
- begin_range = 0; end_range = sce->st.st_size - 1;
+ end_range = sce->st.st_size - 1;
{
char *rpos = NULL;
errno = 0;
diff --git a/src/mod_webdav.c b/src/mod_webdav.c
index 88b01b1a..afb4b32d 100644
--- a/src/mod_webdav.c
+++ b/src/mod_webdav.c
@@ -590,7 +590,6 @@ static int webdav_delete_dir(server *srv, connection *con, plugin_data *p, physi
while(NULL != (de = readdir(dir))) {
struct stat st;
- int status = 0;
if ((de->d_name[0] == '.' && de->d_name[1] == '\0') ||
(de->d_name[0] == '.' && de->d_name[1] == '.' && de->d_name[2] == '\0')) {
@@ -614,6 +613,7 @@ static int webdav_delete_dir(server *srv, connection *con, plugin_data *p, physi
/* try to unlink it */
if (-1 == rmdir(d.path->ptr)) {
+ int status;
switch(errno) {
case EACCES:
case EPERM:
@@ -631,8 +631,6 @@ static int webdav_delete_dir(server *srv, connection *con, plugin_data *p, physi
#ifdef USE_PROPPATCH
sqlite3_stmt *stmt = p->conf.stmt_delete_uri;
- status = 0;
-
if (stmt) {
sqlite3_reset(stmt);