Date: Tue, 16 Sep 2008 23:35:52 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 149919 for review Message-ID: <200809162335.m8GNZq76024788@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=149919 Change 149919 by sam@sam_ebb on 2008/09/16 23:35:13 check for undefined identifiers Affected files ... .. //depot/projects/vap/sbin/ifconfig/regdomain.c#6 edit Differences ... ==== //depot/projects/vap/sbin/ifconfig/regdomain.c#6 (text+ko) ==== @@ -390,7 +390,7 @@ struct freqband *fp; struct netband *nb; const void *id; - int i; + int i, errors; memset(rdp, 0, sizeof(struct regdata)); mt = calloc(1, sizeof(struct mystate)); @@ -415,6 +415,8 @@ if (rdp->ident == NULL) return ENOMEM; free(mt); + + errors = 0; i = 0; LIST_FOREACH(dp, &rdp->domains, next) { rdp->ident[i].id = dp->name; @@ -440,26 +442,71 @@ if (dp->cc != NULL) { id = dp->cc; dp->cc = findid(rdp, id, COUNTRY); + if (dp->cc == NULL) { + warnx("undefined country \"%s\"", + __DECONST(char *, id)); + errors++; + } free(__DECONST(char *, id)); } - LIST_FOREACH(nb, &dp->bands_11b, next) - nb->band = findid(rdp, nb->band, FREQBAND); - LIST_FOREACH(nb, &dp->bands_11g, next) - nb->band = findid(rdp, nb->band, FREQBAND); - LIST_FOREACH(nb, &dp->bands_11a, next) - nb->band = findid(rdp, nb->band, FREQBAND); - LIST_FOREACH(nb, &dp->bands_11ng, next) - nb->band = findid(rdp, nb->band, FREQBAND); - LIST_FOREACH(nb, &dp->bands_11na, next) - nb->band = findid(rdp, nb->band, FREQBAND); + LIST_FOREACH(nb, &dp->bands_11b, next) { + id = findid(rdp, nb->band, FREQBAND); + if (id == NULL) { + warnx("undefined 11b band \"%s\"", + __DECONST(char *, nb->band)); + errors++; + } + nb->band = id; + } + LIST_FOREACH(nb, &dp->bands_11g, next) { + id = findid(rdp, nb->band, FREQBAND); + if (id == NULL) { + warnx("undefined 11g band \"%s\"", + __DECONST(char *, nb->band)); + errors++; + } + nb->band = id; + } + LIST_FOREACH(nb, &dp->bands_11a, next) { + id = findid(rdp, nb->band, FREQBAND); + if (id == NULL) { + warnx("undefined 11a band \"%s\"", + __DECONST(char *, nb->band)); + errors++; + } + nb->band = id; + } + LIST_FOREACH(nb, &dp->bands_11ng, next) { + id = findid(rdp, nb->band, FREQBAND); + if (id == NULL) { + warnx("undefined 11ng band \"%s\"", + __DECONST(char *, nb->band)); + errors++; + } + nb->band = id; + } + LIST_FOREACH(nb, &dp->bands_11na, next) { + id = findid(rdp, nb->band, FREQBAND); + if (id == NULL) { + warnx("undefined 11na band \"%s\"", + __DECONST(char *, nb->band)); + errors++; + } + nb->band = id; + } } LIST_FOREACH(cp, &rdp->countries, next) { id = cp->rd; cp->rd = findid(rdp, id, DOMAIN); + if (cp->rd == NULL) { + warnx("undefined country \"%s\"", + __DECONST(char *, id)); + errors++; + } free(__DECONST(char *, id)); } - return 0; + return errors ? EINVAL : 0; } static void
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200809162335.m8GNZq76024788>