Changeset 393 for cpp/frams/param/param.cpp
- Timestamp:
- 06/03/15 17:57:46 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
cpp/frams/param/param.cpp
r375 r393 529 529 paInt mn, mx, def; 530 530 if (getMinMax(i, mn, mx, def) >= 3) 531 return setInt(i, def) ;531 return setInt(i, def) | PSET_PARSEFAILED; 532 532 else 533 return setInt(i, (paInt)0) ;533 return setInt(i, (paInt)0) | PSET_PARSEFAILED; 534 534 } 535 535 else … … 544 544 double mn, mx, def; 545 545 if (getMinMax(i, mn, mx, def) >= 3) 546 return setDouble(i, def) ;546 return setDouble(i, def) | PSET_PARSEFAILED; 547 547 else 548 return setDouble(i, (double)0) ;548 return setDouble(i, (double)0) | PSET_PARSEFAILED; 549 549 } 550 550 else … … 1013 1013 const char *value, *valstop; 1014 1014 SString tmpvalue; 1015 bool parse_failed=false; 1015 1016 if (poz >= s.len()) return fields_loaded; 1016 1017 t = s.c_str() + poz; … … 1038 1039 { 1039 1040 field_end = strchrlimit(quote2 + 1, ',', end); 1040 if (!field_end) next_field = field_end = end; 1041 if (!field_end) field_end = end; 1042 next_field = field_end; 1041 1043 } 1042 1044 equals_sign = strchrlimit(t, '=', quote); … … 1094 1096 logPrintf("Param", "load2", LOG_WARN, "Adjusted '%s' in '%s' (was too %s)", 1095 1097 id(i), getName(), (ret&PSET_HITMAX) ? "big" : "small"); 1098 if (ret&PSET_PARSEFAILED) 1099 parse_failed=true; 1096 1100 *(char*)valstop = remember; 1097 1101 } … … 1104 1108 #endif 1105 1109 } 1106 return fields_loaded ;1110 return fields_loaded | (parse_failed ? LOAD2_PARSE_FAILED : 0); 1107 1111 } 1108 1112
Note: See TracChangeset
for help on using the changeset viewer.