Text archives Help
- From: bigler@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [MANTA] r1262 - trunk/Model/Readers/rply
- Date: Tue, 19 Dec 2006 12:23:39 -0700 (MST)
Author: bigler
Date: Tue Dec 19 12:23:33 2006
New Revision: 1262
Modified:
trunk/Model/Readers/rply/rply.c
Log:
Add casts to quiet warnings. This is a disgusting way to use
enumerated values. :p
Modified: trunk/Model/Readers/rply/rply.c
==============================================================================
--- trunk/Model/Readers/rply/rply.c (original)
+++ trunk/Model/Readers/rply/rply.c Tue Dec 19 12:23:33 2006
@@ -772,9 +772,9 @@
static void ply_property_init(p_ply_property property) {
property->name[0] = '\0';
- property->type = -1;
- property->length_type = -1;
- property->value_type = -1;
+ property->type = (e_ply_type)-1;
+ property->length_type = (e_ply_type)-1;
+ property->value_type = (e_ply_type)-1;
property->read_cb = (p_ply_read_cb) NULL;
property->pdata = NULL;
property->idata = 0;
@@ -832,7 +832,7 @@
assert(ply && ply->fp);
if (strcmp(BWORD(ply), "format")) return 0;
if (!ply_read_word(ply)) return 0;
- ply->storage_mode = ply_find_string(BWORD(ply), ply_storage_mode_list);
+ ply->storage_mode = (e_ply_storage_mode)ply_find_string(BWORD(ply),
ply_storage_mode_list);
if (ply->storage_mode == (e_ply_storage_mode) (-1)) return 0;
if (ply->storage_mode == PLY_ASCII) ply->idriver = &ply_idriver_ascii;
else if (ply->storage_mode == ply_arch_endian())
@@ -872,15 +872,15 @@
if (!property) return 0;
/* get property type */
if (!ply_read_word(ply)) return 0;
- property->type = ply_find_string(BWORD(ply), ply_type_list);
+ property->type = (e_ply_type)ply_find_string(BWORD(ply), ply_type_list);
if (property->type == (e_ply_type) (-1)) return 0;
if (property->type == PLY_LIST) {
/* if it's a list, we need the base types */
if (!ply_read_word(ply)) return 0;
- property->length_type = ply_find_string(BWORD(ply), ply_type_list);
+ property->length_type = (e_ply_type)ply_find_string(BWORD(ply),
ply_type_list);
if (property->length_type == (e_ply_type) (-1)) return 0;
if (!ply_read_word(ply)) return 0;
- property->value_type = ply_find_string(BWORD(ply), ply_type_list);
+ property->value_type = (e_ply_type)ply_find_string(BWORD(ply),
ply_type_list);
if (property->value_type == (e_ply_type) (-1)) return 0;
}
/* get property name */
- [MANTA] r1262 - trunk/Model/Readers/rply, bigler, 12/19/2006
Archive powered by MHonArc 2.6.16.