Fixed many warnings (compare (un)signed, unused vars, and initialize with zero)
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2160 152afb58-edef-0310-8abb-c4023f1b3aa9svn/tags/lighttpd-1.4.20
parent
7adc4d7e8c
commit
5a9992b106
25
src/lemon.c
25
src/lemon.c
|
@ -12,6 +12,19 @@
|
|||
#include <ctype.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_STDINT_H
|
||||
# include <stdint.h>
|
||||
#endif
|
||||
#ifdef HAVE_INTTYPES_H
|
||||
# include <inttypes.h>
|
||||
#endif
|
||||
|
||||
#define UNUSED(x) ( (void)(x) )
|
||||
|
||||
extern void qsort();
|
||||
extern double strtod();
|
||||
extern long strtol();
|
||||
|
@ -983,6 +996,7 @@ struct symbol *errsym; /* The error symbol (if defined. NULL otherwise) */
|
|||
{
|
||||
struct symbol *spx, *spy;
|
||||
int errcnt = 0;
|
||||
UNUSED(errsym);
|
||||
assert( apx->sp==apy->sp ); /* Otherwise there would be no conflict */
|
||||
if( apx->type==SHIFT && apy->type==REDUCE ){
|
||||
spx = apx->sp;
|
||||
|
@ -1347,6 +1361,7 @@ char **argv;
|
|||
struct lemon lem;
|
||||
char *def_tmpl_name = "lempar.c";
|
||||
|
||||
UNUSED(argc);
|
||||
OptInit(argv,options,stderr);
|
||||
if( version ){
|
||||
printf("Lemon version 1.0\n");
|
||||
|
@ -1651,7 +1666,7 @@ FILE *err;
|
|||
}else if( op[j].type==OPT_FLAG ){
|
||||
*((int*)op[j].arg) = v;
|
||||
}else if( op[j].type==OPT_FFLAG ){
|
||||
(*(void(*)())(op[j].arg))(v);
|
||||
(*(void(*)())(intptr_t)(op[j].arg))(v);
|
||||
}else{
|
||||
if( err ){
|
||||
fprintf(err,"%smissing argument on switch.\n",emsg);
|
||||
|
@ -1733,19 +1748,19 @@ FILE *err;
|
|||
*(double*)(op[j].arg) = dv;
|
||||
break;
|
||||
case OPT_FDBL:
|
||||
(*(void(*)())(op[j].arg))(dv);
|
||||
(*(void(*)())(intptr_t)(op[j].arg))(dv);
|
||||
break;
|
||||
case OPT_INT:
|
||||
*(int*)(op[j].arg) = lv;
|
||||
break;
|
||||
case OPT_FINT:
|
||||
(*(void(*)())(op[j].arg))((int)lv);
|
||||
(*(void(*)())(intptr_t)(op[j].arg))((int)lv);
|
||||
break;
|
||||
case OPT_STR:
|
||||
*(char**)(op[j].arg) = sv;
|
||||
break;
|
||||
case OPT_FSTR:
|
||||
(*(void(*)())(op[j].arg))(sv);
|
||||
(*(void(*)())(intptr_t)(op[j].arg))(sv);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -2286,10 +2301,10 @@ to follow the previous rule.");
|
|||
** token is passed to the function "parseonetoken" which builds all
|
||||
** the appropriate data structures in the global state vector "gp".
|
||||
*/
|
||||
struct pstate ps;
|
||||
void Parse(gp)
|
||||
struct lemon *gp;
|
||||
{
|
||||
struct pstate ps;
|
||||
FILE *fp;
|
||||
char *filebuf;
|
||||
size_t filesize;
|
||||
|
|
10
src/lempar.c
10
src/lempar.c
|
@ -210,7 +210,7 @@ static const char *yyRuleName[] = {
|
|||
*/
|
||||
const char *ParseTokenName(int tokenType){
|
||||
#ifndef NDEBUG
|
||||
if( tokenType>0 && tokenType<(sizeof(yyTokenName)/sizeof(yyTokenName[0])) ){
|
||||
if( tokenType>0 && (size_t)tokenType<(sizeof(yyTokenName)/sizeof(yyTokenName[0])) ){
|
||||
return yyTokenName[tokenType];
|
||||
}else{
|
||||
return "Unknown";
|
||||
|
@ -335,7 +335,7 @@ static int yy_find_shift_action(
|
|||
return YY_NO_ACTION;
|
||||
}
|
||||
i += iLookAhead;
|
||||
if( i<0 || i>=YY_SZ_ACTTAB || yy_lookahead[i]!=iLookAhead ){
|
||||
if( i<0 || (size_t)i>=YY_SZ_ACTTAB || yy_lookahead[i]!=iLookAhead ){
|
||||
#ifdef YYFALLBACK
|
||||
int iFallback; /* Fallback token */
|
||||
if( iLookAhead<sizeof(yyFallback)/sizeof(yyFallback[0])
|
||||
|
@ -378,7 +378,7 @@ static int yy_find_reduce_action(
|
|||
return YY_NO_ACTION;
|
||||
}
|
||||
i += iLookAhead;
|
||||
if( i<0 || i>=YY_SZ_ACTTAB || yy_lookahead[i]!=iLookAhead ){
|
||||
if( i<0 || (size_t)i>=YY_SZ_ACTTAB || yy_lookahead[i]!=iLookAhead ){
|
||||
return yy_default[stateno];
|
||||
}else{
|
||||
return yy_action[i];
|
||||
|
@ -456,7 +456,7 @@ static void yy_reduce(
|
|||
yymsp = &yypParser->yystack[yypParser->yyidx];
|
||||
#ifndef NDEBUG
|
||||
if( yyTraceFILE && yyruleno>=0
|
||||
&& yyruleno<sizeof(yyRuleName)/sizeof(yyRuleName[0]) ){
|
||||
&& (size_t)yyruleno<sizeof(yyRuleName)/sizeof(yyRuleName[0]) ){
|
||||
fprintf(yyTraceFILE, "%sReduce [%s].\n", yyTracePrompt,
|
||||
yyRuleName[yyruleno]);
|
||||
}
|
||||
|
@ -511,6 +511,8 @@ static void yy_syntax_error(
|
|||
int yymajor, /* The major type of the error token */
|
||||
YYMINORTYPE yyminor /* The minor type of the error token */
|
||||
){
|
||||
UNUSED(yymajor);
|
||||
UNUSED(yyminor);
|
||||
ParseARG_FETCH;
|
||||
#define TOKEN (yyminor.yy0)
|
||||
%%
|
||||
|
|
|
@ -28,9 +28,12 @@ static volatile sig_atomic_t start_process = 1;
|
|||
static volatile sig_atomic_t graceful_restart = 0;
|
||||
static volatile pid_t pid = -1;
|
||||
|
||||
#define UNUSED(x) ( (void)(x) )
|
||||
|
||||
static void sigaction_handler(int sig, siginfo_t *si, void *context) {
|
||||
int exitcode;
|
||||
|
||||
UNUSED(context);
|
||||
switch (sig) {
|
||||
case SIGINT:
|
||||
case SIGTERM:
|
||||
|
@ -60,6 +63,8 @@ int main(int argc, char **argv) {
|
|||
int is_shutdown = 0;
|
||||
struct sigaction act;
|
||||
|
||||
UNUSED(argc);
|
||||
|
||||
/**
|
||||
* we are running as root BEWARE
|
||||
*/
|
||||
|
|
135
src/mod_auth.c
135
src/mod_auth.c
|
@ -519,85 +519,86 @@ SETDEFAULTS_FUNC(mod_auth_set_defaults) {
|
|||
|
||||
handler_t auth_ldap_init(server *srv, mod_auth_plugin_config *s) {
|
||||
#ifdef USE_LDAP
|
||||
int ret;
|
||||
int ret;
|
||||
#if 0
|
||||
if (s->auth_ldap_basedn->used == 0) {
|
||||
log_error_write(srv, __FILE__, __LINE__, "s", "ldap: auth.backend.ldap.base-dn has to be set");
|
||||
if (s->auth_ldap_basedn->used == 0) {
|
||||
log_error_write(srv, __FILE__, __LINE__, "s", "ldap: auth.backend.ldap.base-dn has to be set");
|
||||
|
||||
return HANDLER_ERROR;
|
||||
}
|
||||
#endif
|
||||
|
||||
if (s->auth_ldap_filter->used) {
|
||||
char *dollar;
|
||||
|
||||
/* parse filter */
|
||||
|
||||
if (NULL == (dollar = strchr(s->auth_ldap_filter->ptr, '$'))) {
|
||||
log_error_write(srv, __FILE__, __LINE__, "s", "ldap: auth.backend.ldap.filter is missing a replace-operator '$'");
|
||||
|
||||
return HANDLER_ERROR;
|
||||
}
|
||||
|
||||
buffer_copy_string_len(s->ldap_filter_pre, s->auth_ldap_filter->ptr, dollar - s->auth_ldap_filter->ptr);
|
||||
buffer_copy_string(s->ldap_filter_post, dollar+1);
|
||||
}
|
||||
|
||||
if (s->auth_ldap_hostname->used) {
|
||||
if (NULL == (s->ldap = ldap_init(s->auth_ldap_hostname->ptr, LDAP_PORT))) {
|
||||
log_error_write(srv, __FILE__, __LINE__, "ss", "ldap ...", strerror(errno));
|
||||
|
||||
return HANDLER_ERROR;
|
||||
}
|
||||
|
||||
ret = LDAP_VERSION3;
|
||||
if (LDAP_OPT_SUCCESS != (ret = ldap_set_option(s->ldap, LDAP_OPT_PROTOCOL_VERSION, &ret))) {
|
||||
log_error_write(srv, __FILE__, __LINE__, "ss", "ldap:", ldap_err2string(ret));
|
||||
|
||||
return HANDLER_ERROR;
|
||||
}
|
||||
|
||||
if (s->auth_ldap_starttls) {
|
||||
/* if no CA file is given, it is ok, as we will use encryption
|
||||
* if the server requires a CAfile it will tell us */
|
||||
if (!buffer_is_empty(s->auth_ldap_cafile)) {
|
||||
if (LDAP_OPT_SUCCESS != (ret = ldap_set_option(NULL, LDAP_OPT_X_TLS_CACERTFILE,
|
||||
s->auth_ldap_cafile->ptr))) {
|
||||
log_error_write(srv, __FILE__, __LINE__, "ss",
|
||||
"Loading CA certificate failed:", ldap_err2string(ret));
|
||||
|
||||
return HANDLER_ERROR;
|
||||
}
|
||||
}
|
||||
|
||||
if (LDAP_OPT_SUCCESS != (ret = ldap_start_tls_s(s->ldap, NULL, NULL))) {
|
||||
log_error_write(srv, __FILE__, __LINE__, "ss", "ldap startTLS failed:", ldap_err2string(ret));
|
||||
|
||||
return HANDLER_ERROR;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
if (s->auth_ldap_filter->used) {
|
||||
char *dollar;
|
||||
|
||||
/* parse filter */
|
||||
/* 1. */
|
||||
if (s->auth_ldap_binddn->used) {
|
||||
if (LDAP_SUCCESS != (ret = ldap_simple_bind_s(s->ldap, s->auth_ldap_binddn->ptr, s->auth_ldap_bindpw->ptr))) {
|
||||
log_error_write(srv, __FILE__, __LINE__, "ss", "ldap:", ldap_err2string(ret));
|
||||
|
||||
if (NULL == (dollar = strchr(s->auth_ldap_filter->ptr, '$'))) {
|
||||
log_error_write(srv, __FILE__, __LINE__, "s", "ldap: auth.backend.ldap.filter is missing a replace-operator '$'");
|
||||
|
||||
return HANDLER_ERROR;
|
||||
}
|
||||
|
||||
buffer_copy_string_len(s->ldap_filter_pre, s->auth_ldap_filter->ptr, dollar - s->auth_ldap_filter->ptr);
|
||||
buffer_copy_string(s->ldap_filter_post, dollar+1);
|
||||
return HANDLER_ERROR;
|
||||
}
|
||||
} else {
|
||||
if (LDAP_SUCCESS != (ret = ldap_simple_bind_s(s->ldap, NULL, NULL))) {
|
||||
log_error_write(srv, __FILE__, __LINE__, "ss", "ldap:", ldap_err2string(ret));
|
||||
|
||||
if (s->auth_ldap_hostname->used) {
|
||||
if (NULL == (s->ldap = ldap_init(s->auth_ldap_hostname->ptr, LDAP_PORT))) {
|
||||
log_error_write(srv, __FILE__, __LINE__, "ss", "ldap ...", strerror(errno));
|
||||
|
||||
return HANDLER_ERROR;
|
||||
}
|
||||
|
||||
ret = LDAP_VERSION3;
|
||||
if (LDAP_OPT_SUCCESS != (ret = ldap_set_option(s->ldap, LDAP_OPT_PROTOCOL_VERSION, &ret))) {
|
||||
log_error_write(srv, __FILE__, __LINE__, "ss", "ldap:", ldap_err2string(ret));
|
||||
|
||||
return HANDLER_ERROR;
|
||||
}
|
||||
|
||||
if (s->auth_ldap_starttls) {
|
||||
/* if no CA file is given, it is ok, as we will use encryption
|
||||
* if the server requires a CAfile it will tell us */
|
||||
if (!buffer_is_empty(s->auth_ldap_cafile)) {
|
||||
if (LDAP_OPT_SUCCESS != (ret = ldap_set_option(NULL, LDAP_OPT_X_TLS_CACERTFILE,
|
||||
s->auth_ldap_cafile->ptr))) {
|
||||
log_error_write(srv, __FILE__, __LINE__, "ss",
|
||||
"Loading CA certificate failed:", ldap_err2string(ret));
|
||||
|
||||
return HANDLER_ERROR;
|
||||
}
|
||||
}
|
||||
|
||||
if (LDAP_OPT_SUCCESS != (ret = ldap_start_tls_s(s->ldap, NULL, NULL))) {
|
||||
log_error_write(srv, __FILE__, __LINE__, "ss", "ldap startTLS failed:", ldap_err2string(ret));
|
||||
|
||||
return HANDLER_ERROR;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* 1. */
|
||||
if (s->auth_ldap_binddn->used) {
|
||||
if (LDAP_SUCCESS != (ret = ldap_simple_bind_s(s->ldap, s->auth_ldap_binddn->ptr, s->auth_ldap_bindpw->ptr))) {
|
||||
log_error_write(srv, __FILE__, __LINE__, "ss", "ldap:", ldap_err2string(ret));
|
||||
|
||||
return HANDLER_ERROR;
|
||||
}
|
||||
} else {
|
||||
if (LDAP_SUCCESS != (ret = ldap_simple_bind_s(s->ldap, NULL, NULL))) {
|
||||
log_error_write(srv, __FILE__, __LINE__, "ss", "ldap:", ldap_err2string(ret));
|
||||
|
||||
return HANDLER_ERROR;
|
||||
}
|
||||
}
|
||||
return HANDLER_ERROR;
|
||||
}
|
||||
}
|
||||
}
|
||||
return HANDLER_GO_ON;
|
||||
#else
|
||||
log_error_write(srv, __FILE__, __LINE__, "s", "no ldap support available");
|
||||
return HANDLER_ERROR;
|
||||
UNUSED(s);
|
||||
log_error_write(srv, __FILE__, __LINE__, "s", "no ldap support available");
|
||||
return HANDLER_ERROR;
|
||||
#endif
|
||||
return HANDLER_GO_ON;
|
||||
}
|
||||
|
||||
int mod_auth_plugin_init(plugin *p) {
|
||||
|
|
|
@ -1154,6 +1154,7 @@ int webdav_has_lock(server *srv, connection *con, plugin_data *p, buffer *uri) {
|
|||
int has_lock = 1;
|
||||
|
||||
#ifdef USE_LOCKS
|
||||
UNUSED(srv);
|
||||
data_string *ds;
|
||||
|
||||
/**
|
||||
|
@ -1192,6 +1193,11 @@ int webdav_has_lock(server *srv, connection *con, plugin_data *p, buffer *uri) {
|
|||
has_lock = 0;
|
||||
}
|
||||
}
|
||||
#else
|
||||
UNUSED(srv);
|
||||
UNUSED(con);
|
||||
UNUSED(p);
|
||||
UNUSED(uri);
|
||||
#endif
|
||||
|
||||
return has_lock;
|
||||
|
|
|
@ -197,7 +197,7 @@ int plugins_load(server *srv) {
|
|||
|
||||
#else
|
||||
#if 1
|
||||
init = (int (*)(plugin *))dlsym(p->lib, srv->tmp_buf->ptr);
|
||||
init = (int (*)(plugin *))(intptr_t)dlsym(p->lib, srv->tmp_buf->ptr);
|
||||
#else
|
||||
*(void **)(&init) = dlsym(p->lib, srv->tmp_buf->ptr);
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue