# HG changeset patch # User nenik # Date 1181821187 0 # Node ID 7a542662a1bd8087d9ba5e56af71b69a59ac7420 # Parent aa42f90944425d13cab6a6221baab04a23c84614 Fix enum usage, sizeof(enum) might be different from sizeof(int). diff -r aa42f9094442 -r 7a542662a1bd util/szap/tzap.c --- a/util/szap/tzap.c Sun Jun 10 14:01:21 2007 +0200 +++ b/util/szap/tzap.c Thu Jun 14 11:39:47 2007 +0000 @@ -288,54 +288,53 @@ int parse(const char *fname, const char frontend->frequency = tmp; if ((err = try_parse_param(fd, - inversion_list, LIST_SIZE(inversion_list), - (int *) &frontend->inversion, + inversion_list, LIST_SIZE(inversion_list), &tmp, "inversion"))) return -4; - - if ((err = try_parse_param(fd, bw_list, LIST_SIZE(bw_list), - (int *) &frontend->u.ofdm.bandwidth, + frontend->inversion = tmp; + + if ((err = try_parse_param(fd, bw_list, LIST_SIZE(bw_list), &tmp, "bandwidth"))) return -5; - - if ((err = try_parse_param(fd, fec_list, LIST_SIZE(fec_list), - (int *) &frontend->u.ofdm.code_rate_HP, + frontend->u.ofdm.bandwidth = tmp; + + if ((err = try_parse_param(fd, fec_list, LIST_SIZE(fec_list), &tmp, + "code_rate_HP"))) return -6; + frontend->u.ofdm.code_rate_HP = tmp; if (check_fec(&frontend->u.ofdm.code_rate_HP)) return -6; - if ((err = try_parse_param(fd, fec_list, LIST_SIZE(fec_list), - (int *) &frontend->u.ofdm.code_rate_LP, + if ((err = try_parse_param(fd, fec_list, LIST_SIZE(fec_list), &tmp, "code_rate_LP"))) return -7; + frontend->u.ofdm.code_rate_LP = tmp; if (check_fec(&frontend->u.ofdm.code_rate_LP)) return -7; if ((err = try_parse_param(fd, constellation_list, - LIST_SIZE(constellation_list), - (int *) &frontend->u.ofdm.constellation, + LIST_SIZE(constellation_list), &tmp, "constellation"))) return -8; + frontend->u.ofdm.constellation = tmp; if ((err = try_parse_param(fd, transmissionmode_list, - LIST_SIZE(transmissionmode_list), - (int *) &frontend->u.ofdm. - transmission_mode, + LIST_SIZE(transmissionmode_list), &tmp, "transmission_mode"))) return -9; - - if ((err = try_parse_param(fd, guard_list, LIST_SIZE(guard_list), - (int *) &frontend->u.ofdm. - guard_interval, "guard_interval"))) + frontend->u.ofdm.transmission_mode = tmp; + + if ((err = try_parse_param(fd, guard_list, LIST_SIZE(guard_list), &tmp, + "guard_interval"))) return -10; - + frontend->u.ofdm.guard_interval = tmp; + if ((err = try_parse_param(fd, hierarchy_list, - LIST_SIZE(hierarchy_list), - (int *) &frontend->u.ofdm. - hierarchy_information, + LIST_SIZE(hierarchy_list), &tmp, "hierarchy_information"))) return -11; + frontend->u.ofdm.hierarchy_information = tmp; if ((err = try_parse_int(fd, vpid, "Video PID"))) return -12;