gnue/geas/src/classdef classdef.c

[Reinhard Mueller]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Reinhard Mueller <address@hidden>       01/10/29 14:39:06

Modified files:
        geas/src/classdef: classdef.c 

Log message:
        Check not only the field name but also the module when searching for a 
field in a class.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/src/classdef/classdef.c.diff?tr1=1.21&tr2=1.22&r1=text&r2=text

Patches:
Index: gnue/geas/src/classdef/classdef.c
diff -u gnue/geas/src/classdef/classdef.c:1.21 
gnue/geas/src/classdef/classdef.c:1.22
--- gnue/geas/src/classdef/classdef.c:1.21      Sat Oct 20 15:16:43 2001
+++ gnue/geas/src/classdef/classdef.c   Mon Oct 29 14:39:06 2001
@@ -19,7 +19,7 @@
    along with GEAS; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   $Id: classdef.c,v 1.21 2001/10/20 19:16:43 reinhard Exp $
+   $Id: classdef.c,v 1.22 2001/10/29 19:39:06 reinhard Exp $
 */
 
 #include "config.h"
@@ -721,14 +721,14 @@
   GList *l;
 
   g_return_val_if_fail (c, NULL);
+  g_return_val_if_fail (m, NULL);
   g_return_val_if_fail (name, NULL);
 
-  /* TODO: multiple fields with the same fieldname should be allowed if the
-     modulename differs */
   l = g_list_first (c->fields);
   while (l)
     {
-      if (!strcmp (geas_cd_field_get_name((geas_cd_field *)(l->data)), name))
+      if (!strcmp ((((geas_cd_field *)l->data)->name), name)
+          && (((geas_cd_field *)l->data)->module == m))
         {
           return ((geas_cd_field *)(l->data));
         }