diff --git a/src/conf.h b/src/conf.h deleted file mode 100644 index 28a71bf..0000000 --- a/src/conf.h +++ /dev/null @@ -1,169 +0,0 @@ -/* A Bison parser, made by GNU Bison 2.3. */ - -/* Skeleton interface for Bison's Yacc-like parsers in C - - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ - -/* As a special exception, you may create a larger work that contains - part or all of the Bison parser skeleton and distribute that work - under terms of your choice, so long as that work isn't itself a - parser generator using the skeleton or a modified version thereof - as a parser skeleton. Alternatively, if you modify or redistribute - the parser skeleton itself, you may (at your option) remove this - special exception, which will cause the skeleton and the resulting - Bison output files to be licensed under the GNU General Public - License without this special exception. - - This special exception was added by the Free Software Foundation in - version 2.2 of Bison. */ - -/* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - LEX_IP = 258, - LEX_EQ = 259, - LEX_PORT = 260, - LEX_CSS = 261, - LEX_SEMICOLON = 262, - LEX_CONNECTION = 263, - LEX_NETWORK = 264, - LEX_LBRA = 265, - LEX_RBRA = 266, - LEX_USER = 267, - LEX_NAME = 268, - LEX_USERNAME = 269, - LEX_NICK = 270, - LEX_SERVER = 271, - LEX_PASSWORD = 272, - LEX_SRCIP = 273, - LEX_HOST = 274, - LEX_VHOST = 275, - LEX_SOURCE_PORT = 276, - LEX_NONE = 277, - LEX_COMMENT = 278, - LEX_BUNCH = 279, - LEX_REALNAME = 280, - LEX_SSL = 281, - LEX_SSL_CHECK_MODE = 282, - LEX_SSL_CHECK_STORE = 283, - LEX_CHANNEL = 284, - LEX_KEY = 285, - LEX_LOG_ROOT = 286, - LEX_LOG_FORMAT = 287, - LEX_LOG_LEVEL = 288, - LEX_BACKLOG_LINES = 289, - LEX_BACKLOG = 290, - LEX_LOG = 291, - LEX_LOG_SYNC_INTERVAL = 292, - LEX_FOLLOW_NICK = 293, - LEX_ON_CONNECT_SEND = 294, - LEX_AWAY_NICK = 295, - LEX_PID_FILE = 296, - LEX_IGN_FIRST_NICK = 297, - LEX_ALWAYS_BACKLOG = 298, - LEX_LOGIN = 299, - LEX_BLRESET_ON_TALK = 300, - LEX_DEFAULT_USER = 301, - LEX_DEFAULT_NICK = 302, - LEX_DEFAULT_REALNAME = 303, - LEX_NO_CLIENT_AWAY_MSG = 304, - LEX_BL_MSG_ONLY = 305, - LEX_BOOL = 306, - LEX_INT = 307, - LEX_STRING = 308 - }; -#endif -/* Tokens. */ -#define LEX_IP 258 -#define LEX_EQ 259 -#define LEX_PORT 260 -#define LEX_CSS 261 -#define LEX_SEMICOLON 262 -#define LEX_CONNECTION 263 -#define LEX_NETWORK 264 -#define LEX_LBRA 265 -#define LEX_RBRA 266 -#define LEX_USER 267 -#define LEX_NAME 268 -#define LEX_USERNAME 269 -#define LEX_NICK 270 -#define LEX_SERVER 271 -#define LEX_PASSWORD 272 -#define LEX_SRCIP 273 -#define LEX_HOST 274 -#define LEX_VHOST 275 -#define LEX_SOURCE_PORT 276 -#define LEX_NONE 277 -#define LEX_COMMENT 278 -#define LEX_BUNCH 279 -#define LEX_REALNAME 280 -#define LEX_SSL 281 -#define LEX_SSL_CHECK_MODE 282 -#define LEX_SSL_CHECK_STORE 283 -#define LEX_CHANNEL 284 -#define LEX_KEY 285 -#define LEX_LOG_ROOT 286 -#define LEX_LOG_FORMAT 287 -#define LEX_LOG_LEVEL 288 -#define LEX_BACKLOG_LINES 289 -#define LEX_BACKLOG 290 -#define LEX_LOG 291 -#define LEX_LOG_SYNC_INTERVAL 292 -#define LEX_FOLLOW_NICK 293 -#define LEX_ON_CONNECT_SEND 294 -#define LEX_AWAY_NICK 295 -#define LEX_PID_FILE 296 -#define LEX_IGN_FIRST_NICK 297 -#define LEX_ALWAYS_BACKLOG 298 -#define LEX_LOGIN 299 -#define LEX_BLRESET_ON_TALK 300 -#define LEX_DEFAULT_USER 301 -#define LEX_DEFAULT_NICK 302 -#define LEX_DEFAULT_REALNAME 303 -#define LEX_NO_CLIENT_AWAY_MSG 304 -#define LEX_BL_MSG_ONLY 305 -#define LEX_BOOL 306 -#define LEX_INT 307 -#define LEX_STRING 308 - - - - -#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE -#line 85 "conf.y" -{ - int number; - char *string; - void *list; - struct tuple *tuple; -} -/* Line 1529 of yacc.c. */ -#line 162 "conf.h" - YYSTYPE; -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -# define YYSTYPE_IS_DECLARED 1 -# define YYSTYPE_IS_TRIVIAL 1 -#endif - -extern YYSTYPE yylval; - diff --git a/src/irc.c b/src/irc.c index ba6003d..3afeeec 100644 --- a/src/irc.c +++ b/src/irc.c @@ -1476,6 +1476,8 @@ static int irc_366(struct link_server *server, struct line *line) static int irc_367(struct link_server *server, struct line *l) { + (void)server; + (void)l; return OK_COPY_WHO; } diff --git a/src/log.c b/src/log.c index b151a69..f7212fa 100644 --- a/src/log.c +++ b/src/log.c @@ -1011,7 +1011,7 @@ next_file: return NULL; } - if (conf_always_backlog && c == EOF) + if (!conf_always_backlog && c == EOF) lf->backlog_offset--; buf[pos] = 0; if (pos == 0) {