warning fixes from SCL git 166425a and dcdd77a

Nicholas Reed · Nicholas Reed · commit 92ed62505e27 · 2012-06-07T22:02:54.000Z
diff --git a/src/exppp/exppp.c b/src/exppp/exppp.c
@@ -414,10 +414,10 @@ REFout( Dictionary refdict, Linked_List reflist, char * type, int level ) {
         list = ( Linked_List )DICTlookup( dict, r->schema->symbol.name );
         if( !list ) {
             list = LISTcreate();
-            DICTdefine( dict, r->schema->symbol.name, list,
+            DICTdefine( dict, r->schema->symbol.name, ( Generic ) list,
                         ( Symbol * )0, OBJ_UNKNOWN );
         }
-        LISTadd( list, r );
+        LISTadd( list, ( Generic ) r );
     }
 
     /* step 2: for each list, print out the renames */
diff --git a/src/express/error.c b/src/express/error.c
@@ -99,7 +99,7 @@ void ( *ERRORusage_function )( void );
                                   * dump the buffer */
 
 static struct heap_element {
-    int line;
+    unsigned int line;
     char * msg;
 } heap[ERROR_MAX_ERRORS + 1]; /**< NOTE!  element 0 is purposely ignored, and
                                 * an additional element is at the end.  This
diff --git a/src/fedex_plus/classes.c b/src/fedex_plus/classes.c
@@ -139,10 +139,10 @@ void USEREFout( Schema schema, Dictionary refdict, Linked_List reflist, char * t
         list = ( Linked_List )DICTlookup( dict, r->schema->symbol.name );
         if( !list ) {
             list = LISTcreate();
-            DICTdefine( dict, r->schema->symbol.name, list,
+            DICTdefine( dict, r->schema->symbol.name, ( Generic ) list,
                         ( Symbol * )0, OBJ_UNKNOWN );
         }
-        LISTadd( list, r );
+        LISTadd( list, ( Generic ) r );
     }
 
     /* step 2: for each list, print out the renames */
diff --git a/src/fedex_plus/selects.c b/src/fedex_plus/selects.c
@@ -190,7 +190,7 @@ SELgetnew_dmlist( const Type type ) {
 
     /*     if t\'s underlying type is not already in newlist, */
     if( ! utype_member( newlist, t, 0 ) ) {
-        LISTadd_last( newlist, t );
+        LISTadd_last( newlist, ( Generic ) t );
     }
 
     LISTod;
@@ -362,9 +362,9 @@ find_duplicate_list( const Type type, Linked_List * duplicate_list ) {
         if( !utype_member( *duplicate_list, u, 1 ) ) {
             /**  if not already a duplicate  **/
             if( utype_member( temp, u, 1 ) ) {
-                LISTadd_first( *duplicate_list, u );
+                LISTadd_first( *duplicate_list, ( Generic ) u );
             } else {
-                LISTadd_first( temp, u );
+                LISTadd_first( temp, ( Generic ) u );
             }
         }
         LISTod;
@@ -562,7 +562,7 @@ SEL_TYPEgetnew_attribute_list( const Type type ) {
         attrs = ENTITYget_all_attributes( cur );
         LISTdo( attrs, a, Variable )
         if( ! ATTR_LISTmember( newlist, a ) ) {
-            LISTadd_first( newlist, a );
+            LISTadd_first( newlist, ( Generic ) a );
         }
         LISTod;
     }
@@ -954,8 +954,8 @@ ENTITYget_expanded_entities( Entity e, Linked_List l ) {
     int super_cnt = 0;
     Entity super;
 
-    if( ! LISTmember( l, e ) ) {
-        LISTadd_first( l, e );
+    if( ! LISTmember( l, ( Generic ) e ) ) {
+        LISTadd_first( l, ( Generic ) e );
     }
 
     if( multiple_inheritance ) {
@@ -1006,7 +1006,7 @@ memberOfEntPrimary( Entity ent, Variable uattr )
     int result;
 
     ENTITYget_first_attribs( ent, attrlist );
-    result = ( LISTmember( attrlist, uattr ) != 0 );
+    result = ( LISTmember( attrlist, ( Generic ) uattr ) != 0 );
     LIST_destroy( attrlist );
     return result;
 }

Original file line number	Diff line number	Diff line change
`@@ -414,10 +414,10 @@ REFout( Dictionary refdict, Linked_List reflist, char * type, int level ) {`
`414`	`414`	`list = ( Linked_List )DICTlookup( dict, r->schema->symbol.name );`
`415`	`415`	`if( !list ) {`
`416`	`416`	`list = LISTcreate();`
`417`		`- DICTdefine( dict, r->schema->symbol.name, list,`
	`417`	`+ DICTdefine( dict, r->schema->symbol.name, ( Generic ) list,`
`418`	`418`	`( Symbol * )0, OBJ_UNKNOWN );`
`419`	`419`	`}`
`420`		`- LISTadd( list, r );`
	`420`	`+ LISTadd( list, ( Generic ) r );`
`421`	`421`	`}`
`422`	`422`
`423`	`423`	`/* step 2: for each list, print out the renames */`
Original file line number	Diff line number	Diff line change
`@@ -139,10 +139,10 @@ void USEREFout( Schema schema, Dictionary refdict, Linked_List reflist, char * t`
`139`	`139`	`list = ( Linked_List )DICTlookup( dict, r->schema->symbol.name );`
`140`	`140`	`if( !list ) {`
`141`	`141`	`list = LISTcreate();`
`142`		`- DICTdefine( dict, r->schema->symbol.name, list,`
	`142`	`+ DICTdefine( dict, r->schema->symbol.name, ( Generic ) list,`
`143`	`143`	`( Symbol * )0, OBJ_UNKNOWN );`
`144`	`144`	`}`
`145`		`- LISTadd( list, r );`
	`145`	`+ LISTadd( list, ( Generic ) r );`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`/* step 2: for each list, print out the renames */`