Re: [PATCH:xman 2/2] Fix shadow warning.

2014-05-22 Thread Alan Coopersmith 

On 05/21/14 03:17 PM, Thomas Klausner wrote:

Signed-off-by: Thomas Klausner 
---
  handler.c | 8 
  1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/handler.c b/handler.c
index 87a928e..fec793d 100644
--- a/handler.c
+++ b/handler.c
@@ -587,17 +587,17 @@ Search(Widget w, XEvent * event, String * params, 
Cardinal * num_params)
  case 'O':
  case 'o':
  if (file != NULL) {
-Widget w;
+Widget w2;
  char *label;

-w = CreateManpage(file);
-if (w) {
+w2 = CreateManpage(file);
+if (w2) {
  man_pages_shown++;

  /* Put title into new manual page. */

  label = man_globals->manpage_title;
-man_globals = GetGlobals(w);
+man_globals = GetGlobals(w2);
  strcpy(man_globals->manpage_title, label);
  ChangeLabel(man_globals->label, label);
  }



Reviewed-by: Alan Coopersmith 

--
-Alan Coopersmith-  alan.coopersm...@oracle.com
 Oracle Solaris Engineering - http://blogs.oracle.com/alanc
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

[PATCH:xman 2/2] Fix shadow warning.

2014-05-21 Thread Thomas Klausner 
Signed-off-by: Thomas Klausner 
---
 handler.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/handler.c b/handler.c
index 87a928e..fec793d 100644
--- a/handler.c
+++ b/handler.c
@@ -587,17 +587,17 @@ Search(Widget w, XEvent * event, String * params, 
Cardinal * num_params)
 case 'O':
 case 'o':
 if (file != NULL) {
-Widget w;
+Widget w2;
 char *label;
 
-w = CreateManpage(file);
-if (w) {
+w2 = CreateManpage(file);
+if (w2) {
 man_pages_shown++;
 
 /* Put title into new manual page. */
 
 label = man_globals->manpage_title;
-man_globals = GetGlobals(w);
+man_globals = GetGlobals(w2);
 strcpy(man_globals->manpage_title, label);
 ChangeLabel(man_globals->label, label);
 }
-- 
1.9.3

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel