From 2b894bf7d931dd741234a6a6073da0453c1bf4cf Mon Sep 17 00:00:00 2001
From: michael <michael@82007160-df01-0410-b94d-b575c5fd34c7>
Date: Thu, 4 Jun 2015 15:51:26 +0000
Subject: [PATCH] - config-parser.y: removed explicit yydebug=0; yydebug is
 disabled by default anyways.   Declared 'tmp' as static. Fixed minor style
 issues

git-svn-id: svn://svn.ircd-hybrid.org/svnroot/hopm/trunk@6049 82007160-df01-0410-b94d-b575c5fd34c7
---
 src/config-parser.y | 45 +++++++++++++++++++++------------------------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/src/config-parser.y b/src/config-parser.y
index 0b76fda..907766f 100644
--- a/src/config-parser.y
+++ b/src/config-parser.y
@@ -27,8 +27,7 @@
 
 int yylex(void);
 
-int yydebug=0;
-void *tmp;        /* Variable to temporarily hold nodes before insertion to list */
+static void *tmp;  /* Variable to temporarily hold nodes before insertion to list */
 
 %}
 
@@ -119,25 +118,25 @@ timespec:  NUMBER timespec_         { $$ = $1 + $2; } |
            NUMBER YEARS timespec_   { $$ = $1 * 60 * 60 * 24 * 365 + $3; }
            ;
 
-sizespec_:  { $$ = 0; } | sizespec;
-sizespec:   NUMBER sizespec_ { $$ = $1 + $2; } |
-            NUMBER BYTES sizespec_ { $$ = $1 + $3; } |
-            NUMBER KBYTES sizespec_ { $$ = $1 * 1024 + $3; } |
-            NUMBER MBYTES sizespec_ { $$ = $1 * 1024 * 1024 + $3; }
-            ;
+sizespec_: { $$ = 0; } | sizespec;
+sizespec:  NUMBER sizespec_        { $$ = $1 + $2; } |
+           NUMBER BYTES sizespec_  { $$ = $1 + $3; } |
+           NUMBER KBYTES sizespec_ { $$ = $1 * 1024 + $3; } |
+           NUMBER MBYTES sizespec_ { $$ = $1 * 1024 * 1024 + $3; }
+           ;
 
-/*************************** OPTIONS BLOCK ***********************/
 
+/*************************** OPTIONS BLOCK ***********************/
 options_entry: OPTIONS '{' options_items '}' ';';
 
 options_items: options_items options_item |
                options_item;
 
-options_item: options_negcache |
+options_item: options_negcache         |
               options_negcache_rebuild |
-              options_pidfile |
-              options_dns_fdlimit |
-              options_scanlog |
+              options_pidfile          |
+              options_dns_fdlimit      |
+              options_scanlog          |
               error;
 
 options_negcache: NEGCACHE '=' timespec ';'
@@ -167,8 +166,8 @@ options_scanlog: SCANLOG '=' STRING ';'
   OptionsItem->scanlog = xstrdup($3);
 };
 
-/*************************** IRC BLOCK ***************************/
 
+/*************************** IRC BLOCK ***************************/
 irc_entry: IRC '{' irc_items '}' ';';
 
 irc_items: irc_items irc_item |
@@ -293,7 +292,6 @@ irc_connregex: CONNREGEX '=' STRING ';'
 
 
 /************************** CHANNEL BLOCK *************************/
-
 channel_entry:
 {
   node_t *node;
@@ -342,8 +340,8 @@ channel_invite: INVITE '=' STRING ';'
   item->invite = xstrdup($3);
 };
 
-/*************************** USER BLOCK ***************************/
 
+/*************************** USER BLOCK ***************************/
 user_entry:
 {
   node_t *node;
@@ -387,8 +385,8 @@ user_scanner: SCANNER '=' STRING ';'
   list_add(item->scanners, node);
 };
 
-/*************************** SCANNER BLOCK ***************************/
 
+/*************************** SCANNER BLOCK ***************************/
 scanner_entry:
 {
   node_t *node;
@@ -532,8 +530,8 @@ scanner_protocol: PROTOCOL '=' PROTOCOLTYPE ':' NUMBER ';'
   list_add(item2->protocols, node);
 };
 
-/*************************** OPM BLOCK ***************************/
 
+/*************************** OPM BLOCK ***************************/
 opm_entry: OPM '{' opm_items '}' ';' ;
 
 opm_items: opm_items opm_item |
@@ -563,8 +561,8 @@ opm_sendmail: SENDMAIL '=' STRING ';'
   OpmItem->sendmail = xstrdup($3);
 };
 
-/************************** BLACKLIST BLOCK *************************/
 
+/************************** BLACKLIST BLOCK *************************/
 opm_blacklist_entry:
 {
   node_t *node;
@@ -625,9 +623,9 @@ blacklist_type: TYPE '=' STRING ';'
 
 blacklist_ban_unknown: BAN_UNKNOWN '=' NUMBER ';'
 {
-   struct BlacklistConf *item = tmp;
+  struct BlacklistConf *item = tmp;
 
-   item->ban_unknown = $3;
+  item->ban_unknown = $3;
 };
 
 blacklist_reply: REPLY '{' blacklist_reply_items '}' ';';
@@ -650,15 +648,14 @@ blacklist_reply_item: NUMBER '=' STRING ';'
   list_add(blacklist->reply, node);
 };
 
-/*************************** EXEMPT BLOCK ***************************/
-
 
+/*************************** EXEMPT BLOCK ***************************/
 exempt_entry: EXEMPT '{' exempt_items '}' ';' ;
 
 exempt_items: exempt_items exempt_item |
               exempt_item;
 
-exempt_item: exempt_mask  |
+exempt_item: exempt_mask |
              error;
 
 exempt_mask: MASK '=' STRING ';'
-- 
2.30.2