- Fixed a bunch of compile warnings

git-svn-id: svn://svn.ircd-hybrid.org/svnroot/hopm/trunk@5072 82007160-df01-0410-b94d-b575c5fd34c7

diff --git a/src/config-parser.c b/src/config-parser.c
index f136857597fa9f40d51bad1b601547f1fb2081b4..61e5ee5cf63bc4cd99c65c4d3c99c06541ac3af3 100644 (file)
--- a/src/config-parser.c
+++ b/src/config-parser.c
@@ -69,11 +69,13 @@
 #include "malloc.h"
 #include "config.h"
 
+int yylex(void);
+
 int yydebug=0;
 void *tmp;        /* Variable to temporarily hold nodes before insertion to list */
 
 
-#line 77 "config-parser.c" /* yacc.c:339  */
+#line 79 "config-parser.c" /* yacc.c:339  */
 
 # ifndef YY_NULLPTR
 #  if defined __cplusplus && 201103L <= __cplusplus
@@ -209,12 +211,12 @@ extern int yydebug;
 typedef union YYSTYPE YYSTYPE;
 union YYSTYPE
 {
-#line 81 "config-parser.y" /* yacc.c:355  */
+#line 83 "config-parser.y" /* yacc.c:355  */
 
         int number;
         char *string;
 
-#line 218 "config-parser.c" /* yacc.c:355  */
+#line 220 "config-parser.c" /* yacc.c:355  */
 };
 # define YYSTYPE_IS_TRIVIAL 1
 # define YYSTYPE_IS_DECLARED 1
@@ -229,7 +231,7 @@ int yyparse (void);
 
 /* Copy the second part of user declarations.  */
 
-#line 233 "config-parser.c" /* yacc.c:358  */
+#line 235 "config-parser.c" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -531,20 +533,20 @@ static const yytype_uint8 yytranslate[] =
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,    92,    92,    93,    96,    97,    98,    99,   100,   101,
-     106,   108,   109,   111,   112,   113,   114,   115,   117,   122,
-     128,   133,   141,   143,   144,   146,   147,   148,   149,   150,
-     151,   152,   153,   154,   155,   156,   157,   158,   159,   160,
-     161,   163,   169,   175,   181,   187,   193,   199,   205,   213,
-     218,   224,   230,   236,   242,   252,   252,   269,   270,   272,
-     273,   274,   276,   284,   292,   303,   303,   319,   320,   322,
-     323,   324,   326,   336,   349,   349,   394,   395,   397,   398,
-     399,   400,   401,   402,   403,   404,   405,   406,   408,   415,
-     422,   429,   445,   451,   457,   463,   469,   488,   490,   491,
-     493,   494,   495,   496,   497,   499,   505,   511,   520,   520,
-     539,   540,   542,   543,   544,   545,   546,   547,   549,   556,
-     563,   574,   580,   582,   583,   585,   603,   605,   606,   608,
-     609,   611
+       0,    94,    94,    95,    98,    99,   100,   101,   102,   103,
+     108,   110,   111,   113,   114,   115,   116,   117,   119,   124,
+     130,   135,   143,   145,   146,   148,   149,   150,   151,   152,
+     153,   154,   155,   156,   157,   158,   159,   160,   161,   162,
+     163,   165,   171,   177,   183,   189,   195,   201,   207,   215,
+     220,   226,   232,   238,   244,   254,   254,   271,   272,   274,
+     275,   276,   278,   286,   294,   305,   305,   321,   322,   324,
+     325,   326,   328,   338,   351,   351,   396,   397,   399,   400,
+     401,   402,   403,   404,   405,   406,   407,   408,   410,   417,
+     424,   431,   447,   453,   459,   465,   471,   490,   492,   493,
+     495,   496,   497,   498,   499,   501,   507,   513,   522,   522,
+     541,   542,   544,   545,   546,   547,   548,   549,   551,   558,
+     565,   576,   582,   584,   585,   587,   605,   607,   608,   610,
+     611,   613
 };
 #endif
 
@@ -1520,168 +1522,168 @@ yyreduce:
   switch (yyn)
     {
         case 18:
-#line 118 "config-parser.y" /* yacc.c:1646  */
+#line 120 "config-parser.y" /* yacc.c:1646  */
     {
    OptionsItem->negcache = (yyvsp[-1].number);
 }
-#line 1528 "config-parser.c" /* yacc.c:1646  */
+#line 1530 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 19:
-#line 123 "config-parser.y" /* yacc.c:1646  */
+#line 125 "config-parser.y" /* yacc.c:1646  */
     {
    MyFree(OptionsItem->pidfile);
    OptionsItem->pidfile = DupString((yyvsp[-1].string));
 }
-#line 1537 "config-parser.c" /* yacc.c:1646  */
+#line 1539 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 20:
-#line 129 "config-parser.y" /* yacc.c:1646  */
+#line 131 "config-parser.y" /* yacc.c:1646  */
     {
    OptionsItem->dns_fdlimit = (yyvsp[-1].number);
 }
-#line 1545 "config-parser.c" /* yacc.c:1646  */
+#line 1547 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 21:
-#line 134 "config-parser.y" /* yacc.c:1646  */
+#line 136 "config-parser.y" /* yacc.c:1646  */
     {
    MyFree(OptionsItem->scanlog);
    OptionsItem->scanlog = DupString((yyvsp[-1].string));
 }
-#line 1554 "config-parser.c" /* yacc.c:1646  */
+#line 1556 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 41:
-#line 164 "config-parser.y" /* yacc.c:1646  */
+#line 166 "config-parser.y" /* yacc.c:1646  */
     {
    MyFree(IRCItem->away);
    IRCItem->away = DupString((yyvsp[-1].string));
 }
-#line 1563 "config-parser.c" /* yacc.c:1646  */
+#line 1565 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 42:
-#line 170 "config-parser.y" /* yacc.c:1646  */
+#line 172 "config-parser.y" /* yacc.c:1646  */
     {
    MyFree(IRCItem->kline);
    IRCItem->kline = DupString((yyvsp[-1].string));
 }
-#line 1572 "config-parser.c" /* yacc.c:1646  */
+#line 1574 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 43:
-#line 176 "config-parser.y" /* yacc.c:1646  */
+#line 178 "config-parser.y" /* yacc.c:1646  */
     {
    MyFree(IRCItem->mode);
    IRCItem->mode = DupString((yyvsp[-1].string));
 }
-#line 1581 "config-parser.c" /* yacc.c:1646  */
+#line 1583 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 44:
-#line 182 "config-parser.y" /* yacc.c:1646  */
+#line 184 "config-parser.y" /* yacc.c:1646  */
     {
    MyFree(IRCItem->nick);
    IRCItem->nick = DupString((yyvsp[-1].string));
 }
-#line 1590 "config-parser.c" /* yacc.c:1646  */
+#line 1592 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 45:
-#line 188 "config-parser.y" /* yacc.c:1646  */
+#line 190 "config-parser.y" /* yacc.c:1646  */
     {
    MyFree(IRCItem->nickserv);
    IRCItem->nickserv = DupString((yyvsp[-1].string));
 }
-#line 1599 "config-parser.c" /* yacc.c:1646  */
+#line 1601 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 46:
-#line 194 "config-parser.y" /* yacc.c:1646  */
+#line 196 "config-parser.y" /* yacc.c:1646  */
     {
    MyFree(IRCItem->oper);
    IRCItem->oper = DupString((yyvsp[-1].string));
 }
-#line 1608 "config-parser.c" /* yacc.c:1646  */
+#line 1610 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 47:
-#line 200 "config-parser.y" /* yacc.c:1646  */
+#line 202 "config-parser.y" /* yacc.c:1646  */
     {
    MyFree(IRCItem->password);
    IRCItem->password = DupString((yyvsp[-1].string));
 }
-#line 1617 "config-parser.c" /* yacc.c:1646  */
+#line 1619 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 48:
-#line 206 "config-parser.y" /* yacc.c:1646  */
+#line 208 "config-parser.y" /* yacc.c:1646  */
     {
    node_t *node;
    node = node_create(DupString((yyvsp[-1].string)));
 
    list_add(IRCItem->performs, node);
 }
-#line 1628 "config-parser.c" /* yacc.c:1646  */
+#line 1630 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 49:
-#line 214 "config-parser.y" /* yacc.c:1646  */
+#line 216 "config-parser.y" /* yacc.c:1646  */
     {
    IRCItem->port = (yyvsp[-1].number);
 }
-#line 1636 "config-parser.c" /* yacc.c:1646  */
+#line 1638 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 50:
-#line 219 "config-parser.y" /* yacc.c:1646  */
+#line 221 "config-parser.y" /* yacc.c:1646  */
     {
    MyFree(IRCItem->realname);
    IRCItem->realname = DupString((yyvsp[-1].string));
 }
-#line 1645 "config-parser.c" /* yacc.c:1646  */
+#line 1647 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 51:
-#line 225 "config-parser.y" /* yacc.c:1646  */
+#line 227 "config-parser.y" /* yacc.c:1646  */
     {
    MyFree(IRCItem->server);
    IRCItem->server = DupString((yyvsp[-1].string));
 }
-#line 1654 "config-parser.c" /* yacc.c:1646  */
+#line 1656 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 52:
-#line 231 "config-parser.y" /* yacc.c:1646  */
+#line 233 "config-parser.y" /* yacc.c:1646  */
     {
    MyFree(IRCItem->username);
    IRCItem->username = DupString((yyvsp[-1].string));
 }
-#line 1663 "config-parser.c" /* yacc.c:1646  */
+#line 1665 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 53:
-#line 237 "config-parser.y" /* yacc.c:1646  */
+#line 239 "config-parser.y" /* yacc.c:1646  */
     {
    MyFree(IRCItem->vhost);
    IRCItem->vhost = DupString((yyvsp[-1].string));
 }
-#line 1672 "config-parser.c" /* yacc.c:1646  */
+#line 1674 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 54:
-#line 243 "config-parser.y" /* yacc.c:1646  */
+#line 245 "config-parser.y" /* yacc.c:1646  */
     {
    MyFree(IRCItem->connregex);
    IRCItem->connregex = DupString((yyvsp[-1].string));
 }
-#line 1681 "config-parser.c" /* yacc.c:1646  */
+#line 1683 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 55:
-#line 252 "config-parser.y" /* yacc.c:1646  */
+#line 254 "config-parser.y" /* yacc.c:1646  */
     {
    node_t *node;
    struct ChannelConf *item;
@@ -1697,44 +1699,44 @@ yyreduce:
 
    tmp = (void *) item;
 }
-#line 1701 "config-parser.c" /* yacc.c:1646  */
+#line 1703 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 62:
-#line 277 "config-parser.y" /* yacc.c:1646  */
+#line 279 "config-parser.y" /* yacc.c:1646  */
     {
    struct ChannelConf *item = tmp;
 
    MyFree(item->name);
    item->name = DupString((yyvsp[-1].string));
 }
-#line 1712 "config-parser.c" /* yacc.c:1646  */
+#line 1714 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 63:
-#line 285 "config-parser.y" /* yacc.c:1646  */
+#line 287 "config-parser.y" /* yacc.c:1646  */
     {
    struct ChannelConf *item = tmp;
 
    MyFree(item->key);
    item->key = DupString((yyvsp[-1].string));
 }
-#line 1723 "config-parser.c" /* yacc.c:1646  */
+#line 1725 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 64:
-#line 293 "config-parser.y" /* yacc.c:1646  */
+#line 295 "config-parser.y" /* yacc.c:1646  */
     {
    struct ChannelConf *item = tmp;
 
    MyFree(item->invite);
    item->invite = DupString((yyvsp[-1].string));
 }
-#line 1734 "config-parser.c" /* yacc.c:1646  */
+#line 1736 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 65:
-#line 303 "config-parser.y" /* yacc.c:1646  */
+#line 305 "config-parser.y" /* yacc.c:1646  */
     {
    node_t *node;
    struct UserConf *item;
@@ -1749,11 +1751,11 @@ yyreduce:
 
    tmp = (void *) item; 
 }
-#line 1753 "config-parser.c" /* yacc.c:1646  */
+#line 1755 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 72:
-#line 327 "config-parser.y" /* yacc.c:1646  */
+#line 329 "config-parser.y" /* yacc.c:1646  */
     {
    struct UserConf *item = (struct UserConf *) tmp;
 
@@ -1762,11 +1764,11 @@ yyreduce:
 
    list_add(item->masks, node);
 }
-#line 1766 "config-parser.c" /* yacc.c:1646  */
+#line 1768 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 73:
-#line 337 "config-parser.y" /* yacc.c:1646  */
+#line 339 "config-parser.y" /* yacc.c:1646  */
     {
    struct UserConf *item = (struct UserConf *) tmp;
 
@@ -1775,11 +1777,11 @@ yyreduce:
 
    list_add(item->scanners, node);
 }
-#line 1779 "config-parser.c" /* yacc.c:1646  */
+#line 1781 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 74:
-#line 349 "config-parser.y" /* yacc.c:1646  */
+#line 351 "config-parser.y" /* yacc.c:1646  */
     {
    node_t *node;
    struct ScannerConf *item, *olditem;
@@ -1823,41 +1825,41 @@ yyreduce:
    list_add(ScannerItemList, node);
    tmp = (void *) item;
 }
-#line 1827 "config-parser.c" /* yacc.c:1646  */
+#line 1829 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 88:
-#line 409 "config-parser.y" /* yacc.c:1646  */
+#line 411 "config-parser.y" /* yacc.c:1646  */
     {
    struct ScannerConf *item = (struct ScannerConf *) tmp;
    MyFree(item->name);
    item->name = DupString((yyvsp[-1].string));
 }
-#line 1837 "config-parser.c" /* yacc.c:1646  */
+#line 1839 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 89:
-#line 416 "config-parser.y" /* yacc.c:1646  */
+#line 418 "config-parser.y" /* yacc.c:1646  */
     {
    struct ScannerConf *item = (struct ScannerConf *) tmp;
    MyFree(item->vhost);
    item->vhost = DupString((yyvsp[-1].string));
 }
-#line 1847 "config-parser.c" /* yacc.c:1646  */
+#line 1849 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 90:
-#line 423 "config-parser.y" /* yacc.c:1646  */
+#line 425 "config-parser.y" /* yacc.c:1646  */
     {
    struct ScannerConf *item = (struct ScannerConf *) tmp;
    MyFree(item->target_ip);
    item->target_ip = DupString((yyvsp[-1].string));
 }
-#line 1857 "config-parser.c" /* yacc.c:1646  */
+#line 1859 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 91:
-#line 430 "config-parser.y" /* yacc.c:1646  */
+#line 432 "config-parser.y" /* yacc.c:1646  */
     {
    struct ScannerConf *item = (struct ScannerConf *) tmp;
 
@@ -1872,47 +1874,47 @@ yyreduce:
 
    list_add(item->target_string, node);
 }
-#line 1876 "config-parser.c" /* yacc.c:1646  */
+#line 1878 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 92:
-#line 446 "config-parser.y" /* yacc.c:1646  */
+#line 448 "config-parser.y" /* yacc.c:1646  */
     {
    struct ScannerConf *item = (struct ScannerConf *) tmp;
    item->fd = (yyvsp[-1].number);
 }
-#line 1885 "config-parser.c" /* yacc.c:1646  */
+#line 1887 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 93:
-#line 452 "config-parser.y" /* yacc.c:1646  */
+#line 454 "config-parser.y" /* yacc.c:1646  */
     {
    struct ScannerConf *item = (struct ScannerConf *) tmp;
    item->target_port = (yyvsp[-1].number);
 }
-#line 1894 "config-parser.c" /* yacc.c:1646  */
+#line 1896 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 94:
-#line 458 "config-parser.y" /* yacc.c:1646  */
+#line 460 "config-parser.y" /* yacc.c:1646  */
     {
    struct ScannerConf *item = (struct ScannerConf *) tmp;
    item->timeout = (yyvsp[-1].number);
 }
-#line 1903 "config-parser.c" /* yacc.c:1646  */
+#line 1905 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 95:
-#line 464 "config-parser.y" /* yacc.c:1646  */
+#line 466 "config-parser.y" /* yacc.c:1646  */
     {
    struct ScannerConf *item = (struct ScannerConf *) tmp;
    item->max_read = (yyvsp[-1].number);
 }
-#line 1912 "config-parser.c" /* yacc.c:1646  */
+#line 1914 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 96:
-#line 470 "config-parser.y" /* yacc.c:1646  */
+#line 472 "config-parser.y" /* yacc.c:1646  */
     {
    struct ProtocolConf *item;
    struct ScannerConf  *item2;
@@ -1928,38 +1930,38 @@ yyreduce:
    node = node_create(item);
    list_add(item2->protocols, node);
 }
-#line 1932 "config-parser.c" /* yacc.c:1646  */
+#line 1934 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 105:
-#line 500 "config-parser.y" /* yacc.c:1646  */
+#line 502 "config-parser.y" /* yacc.c:1646  */
     {
    MyFree(OpmItem->dnsbl_from);
    OpmItem->dnsbl_from = DupString((yyvsp[-1].string));
 }
-#line 1941 "config-parser.c" /* yacc.c:1646  */
+#line 1943 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 106:
-#line 506 "config-parser.y" /* yacc.c:1646  */
+#line 508 "config-parser.y" /* yacc.c:1646  */
     {
    MyFree(OpmItem->dnsbl_to);
    OpmItem->dnsbl_to = DupString((yyvsp[-1].string));
 }
-#line 1950 "config-parser.c" /* yacc.c:1646  */
+#line 1952 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 107:
-#line 512 "config-parser.y" /* yacc.c:1646  */
+#line 514 "config-parser.y" /* yacc.c:1646  */
     {
    MyFree(OpmItem->sendmail);
    OpmItem->sendmail = DupString((yyvsp[-1].string));
 }
-#line 1959 "config-parser.c" /* yacc.c:1646  */
+#line 1961 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 108:
-#line 520 "config-parser.y" /* yacc.c:1646  */
+#line 522 "config-parser.y" /* yacc.c:1646  */
     {
    node_t *node;
    struct BlacklistConf *item;
@@ -1977,33 +1979,33 @@ yyreduce:
 
    tmp = (void *) item;
 }
-#line 1981 "config-parser.c" /* yacc.c:1646  */
+#line 1983 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 118:
-#line 549 "config-parser.y" /* yacc.c:1646  */
+#line 551 "config-parser.y" /* yacc.c:1646  */
     {
    struct BlacklistConf *item = tmp;
 
    MyFree(item->name);
    item->name = DupString((yyvsp[-1].string));
 }
-#line 1992 "config-parser.c" /* yacc.c:1646  */
+#line 1994 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 119:
-#line 556 "config-parser.y" /* yacc.c:1646  */
+#line 558 "config-parser.y" /* yacc.c:1646  */
     {
    struct BlacklistConf *item = tmp;
 
    MyFree(item->kline);
    item->kline = DupString((yyvsp[-1].string));
 }
-#line 2003 "config-parser.c" /* yacc.c:1646  */
+#line 2005 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 120:
-#line 563 "config-parser.y" /* yacc.c:1646  */
+#line 565 "config-parser.y" /* yacc.c:1646  */
     {
    struct BlacklistConf *item = tmp;
    
@@ -2014,21 +2016,21 @@ yyreduce:
    else
       yyerror("Unknown blacklist type defined");
 }
-#line 2018 "config-parser.c" /* yacc.c:1646  */
+#line 2020 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 121:
-#line 574 "config-parser.y" /* yacc.c:1646  */
+#line 576 "config-parser.y" /* yacc.c:1646  */
     {
    struct BlacklistConf *item = tmp;
 
    item->ban_unknown = (yyvsp[-1].number);
 }
-#line 2028 "config-parser.c" /* yacc.c:1646  */
+#line 2030 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 125:
-#line 586 "config-parser.y" /* yacc.c:1646  */
+#line 588 "config-parser.y" /* yacc.c:1646  */
     {
    struct BlacklistReplyConf *item;
    struct BlacklistConf *blacklist = tmp;
@@ -2042,22 +2044,22 @@ yyreduce:
    node = node_create(item);
    list_add(blacklist->reply, node);
 }
-#line 2046 "config-parser.c" /* yacc.c:1646  */
+#line 2048 "config-parser.c" /* yacc.c:1646  */
     break;
 
   case 131:
-#line 612 "config-parser.y" /* yacc.c:1646  */
+#line 614 "config-parser.y" /* yacc.c:1646  */
     {
    node_t *node;
    node = node_create(DupString((yyvsp[-1].string)));
 
    list_add(ExemptItem->masks, node);
 }
-#line 2057 "config-parser.c" /* yacc.c:1646  */
+#line 2059 "config-parser.c" /* yacc.c:1646  */
     break;
 
 
-#line 2061 "config-parser.c" /* yacc.c:1646  */
+#line 2063 "config-parser.c" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -2285,5 +2287,5 @@ yyreturn:
 #endif
   return yyresult;
 }
-#line 619 "config-parser.y" /* yacc.c:1906  */
+#line 621 "config-parser.y" /* yacc.c:1906  */
 

diff --git a/src/config-parser.h b/src/config-parser.h
index b2e7144dc2ad63e40b35577495dbf843793733d4..d70d152c3d313125444884087f2217d14d11b1a8 100644 (file)
--- a/src/config-parser.h
+++ b/src/config-parser.h
@@ -146,7 +146,7 @@ extern int yydebug;
 typedef union YYSTYPE YYSTYPE;
 union YYSTYPE
 {
-#line 81 "config-parser.y" /* yacc.c:1909  */
+#line 83 "config-parser.y" /* yacc.c:1909  */
 
         int number;
         char *string;

diff --git a/src/config-parser.y b/src/config-parser.y
index a0935f5768d467146da27505e05b70bf7a302ea9..f8b68e8cef1550d80ad5de4455fafaa7a2060c6c 100644 (file)
--- a/src/config-parser.y
+++ b/src/config-parser.y
@@ -28,6 +28,8 @@
 #include "malloc.h"
 #include "config.h"
 
+int yylex(void);
+
 int yydebug=0;
 void *tmp;        /* Variable to temporarily hold nodes before insertion to list */
 

diff --git a/src/config.h b/src/config.h
index eea243f14f8c9bbf79dd75c5c4171ed063ca9fe4..dbac8e35cf2dcbc47bdb8089da36bc017002bf2f 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -5,8 +5,6 @@
 #include "list.h"
 #include "libopm/src/opm_types.h"
 
-int yylex(void);
-
 extern char linebuf[512];
 extern int  linenum;
 

diff --git a/src/firedns.c b/src/firedns.c
index aed0a7fdb8aa642112690a98ed1dd2da77d288d6..d5b817e123b6963c3a7c3ed582a9a4de7802bdac 100644 (file)
--- a/src/firedns.c
+++ b/src/firedns.c
@@ -78,7 +78,7 @@ static list_t *CONNECTIONS = NULL;
  * List of errors, in order of values used in FDNS_ERR_*, returned by
  * firedns_strerror
  */
-static char *errors[] = {
+static const char *errors[] = {
    "Success",
    "Format error",
    "Server failure",
@@ -167,7 +167,7 @@ void firedns_init(void)
    int i;
    struct in_addr addr4;
    char buf[1024];
-   char *file;
+   const char *file;
 #ifdef IPV6
 
    struct in6_addr addr6;
@@ -278,7 +278,7 @@ struct in6_addr *firedns_resolveip6(const char * const name)
 
 char *firedns_resolveip(int type, const char * const name)
 { /* resolve a query of a given type */
-   int fd, t, i;
+   int fd, t;
    struct firedns_result *result;
    struct timeval tv;
    fd_set s;
@@ -293,7 +293,7 @@ char *firedns_resolveip(int type, const char * const name)
       tv.tv_usec = 0;
       FD_ZERO(&s);
       FD_SET(fd, &s);
-      i = select(fd + 1, &s, NULL, NULL, &tv);
+      select(fd + 1, &s, NULL, NULL, &tv);
 
       result = firedns_getresult(fd);
       
@@ -815,7 +815,7 @@ void firedns_cycle(void)
    }
 }
 
-char *firedns_strerror(int error)
+const char *firedns_strerror(int error)
 {
    if(error == FDNS_ERR_NETWORK)
       return strerror(errno);

diff --git a/src/firedns.h b/src/firedns.h
index 6432dec7089ba0ae0d87f45d136692ad86be2002..2806b1112cca56b4de171fdd822fcbf21c195667 100644 (file)
--- a/src/firedns.h
+++ b/src/firedns.h
@@ -94,6 +94,6 @@ struct in_addr *firedns_resolveip4(const char * const name);
 struct in6_addr *firedns_resolveip6(const char * const name);
 
 void firedns_cycle(void);
-char *firedns_strerror(int);
+extern const char *firedns_strerror(int);
 
 #endif

diff --git a/src/irc.c b/src/irc.c
index 17677a4ef3e54afdde02a49569a6c4241afb2b17..b95fd614e54725e9c615287785c3346c133a8240 100644 (file)
--- a/src/irc.c
+++ b/src/irc.c
@@ -329,7 +329,7 @@ static void irc_init(void)
  */
 
 
-void irc_send(char *data, ...)
+void irc_send(const char *data, ...)
 {
    va_list arglist;
    char    data2[MSGLENMAX];
@@ -363,7 +363,7 @@ void irc_send(char *data, ...)
  * Return: NONE
  */
 
-void irc_send_channels(char *data, ...)
+void irc_send_channels(const char *data, ...)
 {
    va_list arglist;
    char    data2[MSGLENMAX];

diff --git a/src/irc.h b/src/irc.h
index 35a89d0cdb44d909a12f30db9f8ff3cc72d60018..d655651a0e07b823c84bafce43cde3400923c0d7 100644 (file)
--- a/src/irc.h
+++ b/src/irc.h
@@ -30,13 +30,13 @@ typedef void (*irc_command) (char **, unsigned int, char *, struct UserInfo *);
 
 struct CommandHash
 {
-   char       *command;
+   const char *command;
    irc_command handler;
 };
 
 
-extern void irc_send(char *, ...);
-extern void irc_send_channels(char *, ...);
+extern void irc_send(const char *, ...);
+extern void irc_send_channels(const char *, ...);
 extern void irc_cycle(void);
 extern void irc_timer(void);
 

diff --git a/src/log.c b/src/log.c
index d10df5a3f83da8adb863cc2bcc78131cb8c107c6..fd1444f6074a938e0c1ad8324e717d34af0973c6 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -77,7 +77,7 @@ void scanlog_close(void)
       fclose(scanlogfile);
 }
 
-void log_printf(char *data, ...)
+void log_printf(const char *data, ...)
 {
    char data2[513];
    char buf_present[25];

diff --git a/src/log.h b/src/log.h
index 435ce528ed858b308c2bd4cc9ea61cf4d895779e..da04cb74e0a5edb6628616d1d89d3f87884e373f 100644 (file)
--- a/src/log.h
+++ b/src/log.h
@@ -6,9 +6,9 @@ extern void log_close(void);
 extern void scanlog_open(char *filename);
 extern void scanlog_close(void);
 #ifdef __GNUC__
-extern void log_printf(char *data, ...) __attribute__((format(printf,1,2)));
+extern void log_printf(const char *data, ...) __attribute__((format(printf,1,2)));
 #else
-extern void log_printf(char *data, ...);
+extern void log_printf(const char *data, ...);
 #endif
 
 #endif

diff --git a/src/main.c b/src/main.c
index 5dfc9c5cdd7c906b2f62fa7f7d81c827b9f7a543..8d66e471a1fd02b3fdd2eccc554e4173f20d24dc 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -65,8 +65,8 @@ int REOPEN  = 0;             /* Flagged to reopen log files on next cycle */
 unsigned int OPT_DEBUG = 0;  /* Debug level */
 
 char *CONFNAME = DEFAULTNAME;
-char *CONFDIR = HOPM_ETCDIR;
-char *LOGDIR = HOPM_LOGDIR;
+static const char *CONFDIR = HOPM_ETCDIR;
+static const char *LOGDIR = HOPM_LOGDIR;
 char *CONFFILE, *LOGFILE;
 
 struct sigaction ALARMACTION;
@@ -78,13 +78,11 @@ int main(int argc, char **argv)
    char spid[16];
    pid_t pid;
    int c;
-   size_t lenc, lenl, lenp;
-   unsigned int nc_counter, i;
+   size_t lenc, lenl;
+   unsigned int i;
    FILE *pidout;
    struct rlimit rlim;
 
-   nc_counter = 0;
-
    while (1)
    {
       c = getopt(argc, argv, "dc:");
@@ -109,7 +107,6 @@ int main(int argc, char **argv)
 
    lenc = strlen(CONFDIR) + strlen(CONFNAME) + strlen(CONFEXT) + 3;
    lenl = strlen(LOGDIR) + strlen(CONFNAME) + strlen(LOGEXT) + 3;
-   lenp = strlen(LOGDIR) + strlen(CONFNAME) + strlen(PIDEXT) + 3;
 
    CONFFILE = MyMalloc(lenc * sizeof *CONFFILE);
    LOGFILE = MyMalloc(lenl * sizeof *LOGFILE);

diff --git a/src/opercmd.h b/src/opercmd.h
index a6bed392b574d0d4dd826e37c11c3590108b1f50..295f5d7eba50a826bdc793ed15e9112b9d063c78 100644 (file)
--- a/src/opercmd.h
+++ b/src/opercmd.h
@@ -34,7 +34,7 @@ typedef void (*oper_command) (char *, char*, struct ChannelConf *);
 
 struct OperCommandHash
 {
-   char       *command;
+   const char *command;
    oper_command handler;
 };
 

diff --git a/src/scan.c b/src/scan.c
index d9d234cdd256506b88e8282eede36b5ab05ca979..57c840b62463323ca299b37f5e0cda7459394b57 100644 (file)
--- a/src/scan.c
+++ b/src/scan.c
@@ -89,7 +89,7 @@ struct cnode *nc_head;
 
 struct scan_struct *scan_create(char **, char *);
 void scan_free(struct scan_struct *);
-static void scan_irckline(struct scan_struct *, char *, char *);
+static void scan_irckline(struct scan_struct *, const char *, const char *);
 static void scan_negative(struct scan_struct *);
 static void scan_log(OPM_REMOTE_T *);
 
@@ -169,10 +169,10 @@ void scan_timer(void)
  *
  */
 
-char *scan_gettype(int protocol)
+const char *scan_gettype(int protocol)
 {
    unsigned int i;
-   static char *undef = "undefined";
+   static const char *undef = "undefined";
 
    static struct protocol_assoc protocols[] =
       {
@@ -572,7 +572,7 @@ void scan_checkfinished(struct scan_struct *ss)
  *
  */
 
-void scan_positive(struct scan_struct *ss, char *kline, char *type)
+void scan_positive(struct scan_struct *ss, const char *kline, const char *type)
 {
    node_t *node;
    OPM_T *scanner;
@@ -674,7 +674,7 @@ void scan_open_proxy(OPM_T *scanner, OPM_REMOTE_T *remote, int notused,
 void scan_negotiation_failed(OPM_T *scanner, OPM_REMOTE_T *remote,
       int notused, void *data)
 {
-   struct scan_struct *ss;
+//   struct scan_struct *ss;
    struct scanner_struct *scs;
 
    USE_VAR(scanner);
@@ -684,7 +684,7 @@ void scan_negotiation_failed(OPM_T *scanner, OPM_REMOTE_T *remote,
    scan_log(remote);
 
    scs = (struct scanner_struct *) data;
-   ss = (struct scan_struct *) remote->data;
+//   ss = (struct scan_struct *) remote->data;
 
    if(OPT_DEBUG)
    {
@@ -720,7 +720,7 @@ void scan_negotiation_failed(OPM_T *scanner, OPM_REMOTE_T *remote,
 static void scan_timeout(OPM_T *scanner, OPM_REMOTE_T *remote, int notused,
       void *data)
 {
-   struct scan_struct *ss;
+//   struct scan_struct *ss;
    struct scanner_struct *scs;
 
    USE_VAR(scanner);
@@ -730,7 +730,7 @@ static void scan_timeout(OPM_T *scanner, OPM_REMOTE_T *remote, int notused,
    scan_log(remote);
 
    scs = (struct scanner_struct *) data;
-   ss = (struct scan_struct *) remote->data;
+//   ss = (struct scan_struct *) remote->data;
 
    if(OPT_DEBUG)
    {
@@ -899,7 +899,7 @@ static void scan_negative(struct scan_struct *ss)
  *
  */
 
-static void scan_irckline(struct scan_struct *ss, char *format, char *type)
+static void scan_irckline(struct scan_struct *ss, const char *format, const char *type)
 {
 
    char message[MSGLENMAX];  /* OUTPUT */
@@ -956,14 +956,14 @@ static void scan_irckline(struct scan_struct *ss, char *format, char *type)
                   {
                      case FORMATTYPE_STRING:
 
-                        size = strlen( (char *) table[i].data);
+                        size = strlen(table[i].data);
 
                         /* Check if the new string can fit! */
                         if( (size + len) > (MSGLENMAX - 1) )
                            break;
                         else
                         {
-                           strcat(message, (char *) table[i].data);
+                           strcat(message, table[i].data);
                            len += size;
                         }
 
@@ -1141,7 +1141,7 @@ int scan_checkexempt(char *mask, char *ipmask)
 
    LIST_FOREACH(node, ExemptItem->masks->head)
    {
-      exempt_mask = (char *) node->data;
+      exempt_mask = node->data;
       if(match(exempt_mask, mask) || match(exempt_mask, ipmask))
          return 1;
    }

diff --git a/src/scan.h b/src/scan.h
index 73d77767fc7f4f11583776ddda090bfa34ed29ee..7babc3a923782f007e040a382ef6b12fafee862f 100644 (file)
--- a/src/scan.h
+++ b/src/scan.h
@@ -30,23 +30,23 @@ struct scanner_struct
 struct protocol_assoc
 {
    int type;
-   char *name;
+   const char *name;
 };
 
 extern void scan_init(void);
-extern char *scan_gettype(int);
+extern const char *scan_gettype(int);
 extern void scan_cycle(void);
 extern void scan_connect(char **, char *);
 extern void scan_checkfinished(struct scan_struct *);
 extern void scan_manual(char *, struct ChannelConf *);
 extern int scan_checkexempt(char *, char *);
 extern void scan_timer(void);
-extern void scan_positive(struct scan_struct *, char *, char *);
+extern void scan_positive(struct scan_struct *, const char *, const char *);
 
 struct kline_format_assoc
 {
    char key;
-   void *data;
+   const void *data;
    int type;
 };
 

diff --git a/src/stats.h b/src/stats.h
index 951cbe99cd77d56b30bd7df207e15085e0338376..e53753d348276397880c55c2617ec6bc93e9f0ee 100644 (file)
--- a/src/stats.h
+++ b/src/stats.h
@@ -8,7 +8,7 @@ struct StatsHash
 {
    int type;
    unsigned int count;
-   char *name;
+   const char *name;
 };
 
 extern void stats_init(void);