From 1ad4adf901e2a90738477d44e1f642bfc765f0e2 Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Mon, 10 Sep 2007 17:05:42 +0200
Subject: [PATCH] change compileregs proto, simplify

---
 awesome.c |  2 +-
 tag.c     | 14 +++++++-------
 tag.h     |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/awesome.c b/awesome.c
index 503e53875..368301bf2 100644
--- a/awesome.c
+++ b/awesome.c
@@ -165,7 +165,7 @@ setup(Display *disp, awesome_config *awesomeconf)
     XChangeWindowAttributes(disp, DefaultRootWindow(disp), CWEventMask | CWCursor, &wa);
     XSelectInput(disp, DefaultRootWindow(disp), wa.event_mask);
     grabkeys(disp, awesomeconf);
-    compileregs(awesomeconf);
+    compileregs(awesomeconf->rules, awesomeconf->nrules);
     /* bar */
     dc.h = awesomeconf->statusbar.height = dc.font.height + 2;
     wa.override_redirect = 1;
diff --git a/tag.c b/tag.c
index 5b9378e3b..7e159e6af 100644
--- a/tag.c
+++ b/tag.c
@@ -75,28 +75,28 @@ applyrules(Client * c, awesome_config *awesomeconf)
 }
 
 void
-compileregs(awesome_config * awesomeconf)
+compileregs(Rule * rules, int nrules)
 {
     int i;
     regex_t *reg;
 
     if(regs)
         return;
-    regs = p_new(Regs, awesomeconf->nrules);
-    for(i = 0; i < awesomeconf->nrules; i++)
+    regs = p_new(Regs, nrules);
+    for(i = 0; i < nrules; i++)
     {
-        if(awesomeconf->rules[i].prop)
+        if(rules[i].prop)
         {
             reg = p_new(regex_t, 1);
-            if(regcomp(reg, awesomeconf->rules[i].prop, REG_EXTENDED))
+            if(regcomp(reg, rules[i].prop, REG_EXTENDED))
                 p_delete(&reg);
             else
                 regs[i].propregex = reg;
         }
-        if(awesomeconf->rules[i].tags)
+        if(rules[i].tags)
         {
             reg = p_new(regex_t, 1);
-            if(regcomp(reg, awesomeconf->rules[i].tags, REG_EXTENDED))
+            if(regcomp(reg, rules[i].tags, REG_EXTENDED))
                 p_delete(&reg);
             else
                 regs[i].tagregex = reg;
diff --git a/tag.h b/tag.h
index dd4e0763e..f4fb0c0f7 100644
--- a/tag.h
+++ b/tag.h
@@ -9,7 +9,7 @@
 /** Check if a client is tiled */ 
 #define IS_TILED(client, tags, ntags)            (client && !client->isfloating && isvisible(client, tags, ntags))
 
-void compileregs(awesome_config *);         /* initialize regexps of rules defined in config.h */
+void compileregs(Rule *, int);         /* initialize regexps of rules defined in config.h */
 Bool isvisible(Client *, Bool *, int);
 void applyrules(Client * c, awesome_config *);    /* applies rules to c */
 void uicb_tag(Display *, awesome_config *, const char *);         /* tags sel with arg's index */