gEDA-cvs: CVS update: o_complex_basic.c

[cvspsrv@xxxxxxxx]

  User: cnieves 
  Date: 06/10/21 16:17:39

  Modified:    .        Tag: glist_dev o_complex_basic.c
  Log:
  src/o_complex_basic.c: Fixed logic level of some checks.
  
  
  
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.27.2.2  +9 -8      eda/geda/gaf/libgeda/src/o_complex_basic.c
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: o_complex_basic.c
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/o_complex_basic.c,v
  retrieving revision 1.27.2.1
  retrieving revision 1.27.2.2
  diff -u -b -r1.27.2.1 -r1.27.2.2
  --- o_complex_basic.c	21 Oct 2006 18:04:33 -0000	1.27.2.1
  +++ o_complex_basic.c	21 Oct 2006 20:17:38 -0000	1.27.2.2
  @@ -1468,8 +1468,8 @@
   #endif
   
     g_return_if_fail(object != NULL);
  -  g_return_if_fail(((object->type != OBJ_COMPLEX) &&
  -		    (object->type != OBJ_PLACEHOLDER)));
  +  g_return_if_fail(((object->type == OBJ_COMPLEX) ||
  +		    (object->type == OBJ_PLACEHOLDER)));
     g_return_if_fail(object->complex != NULL);
   
   
  @@ -1536,8 +1536,8 @@
     OBJECT *o_current=NULL;
   
     g_return_if_fail(object != NULL);
  -  g_return_if_fail(((object->type != OBJ_COMPLEX) &&
  -		    (object->type != OBJ_PLACEHOLDER)));
  +  g_return_if_fail(((object->type == OBJ_COMPLEX) ||
  +		    (object->type == OBJ_PLACEHOLDER)));
     g_return_if_fail(object->complex != NULL);
   
     /* do individual complex objects */
  @@ -1605,8 +1605,8 @@
     OBJECT *found;
   
     g_return_val_if_fail(object != NULL, NULL);
  -  g_return_val_if_fail(((object->type != OBJ_COMPLEX) &&
  -			(object->type != OBJ_PLACEHOLDER)) , NULL);
  +  g_return_val_if_fail(((object->type == OBJ_COMPLEX) ||
  +			(object->type == OBJ_PLACEHOLDER)) , NULL);
     g_return_val_if_fail(object->complex != NULL, NULL);
   
   
  @@ -1655,8 +1655,9 @@
     double outside_major, outside_minor;
     
     g_return_if_fail (object != NULL);
  -  g_return_if_fail ((object->type != OBJ_COMPLEX && 
  -		     object->type != OBJ_PLACEHOLDER));
  +  g_return_if_fail ((object->type == OBJ_COMPLEX || 
  +		     object->type == OBJ_PLACEHOLDER));
  +  g_return_if_fail (object->complex != NULL);
   
     /* first look on the inside for the symversion= attribute */
     inside = o_attrib_search_name(object->complex->prim_objs, "symversion", 0);
  
  
  


_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs