Deleted Added
full compact
29c29
< * $FreeBSD: head/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c 165046 2006-12-09 20:58:26Z syrinx $
---
> * $FreeBSD: head/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c 165253 2006-12-15 20:01:57Z syrinx $
363c363
< break;
---
> goto get;
377c377
< break;
---
> goto get;
384,385c384
< default:
< abort();
---
> break;
386a386
> abort();
387a388
> get:
391c392,393
< break;
---
> return (SNMP_ERR_NOERROR);
>
394c396,397
< break;
---
> return (SNMP_ERR_NOERROR);
>
397c400,401
< break;
---
> return (SNMP_ERR_NOERROR);
>
400c404,405
< break;
---
> return (SNMP_ERR_NOERROR);
>
403c408
< break;
---
> return (SNMP_ERR_NOERROR);
406c411
< return (SNMP_ERR_NOERROR);
---
> abort();
413d417
< int ret;
431c435
< break;
---
> goto get;
445c449
< break;
---
> goto get;
455a460,462
> if (val->v.integer < 0 || val->v.integer > 255)
> return (SNMP_ERR_WRONG_VALUE);
>
457,459c464,468
< ret = bridge_port_set_priority(bif->bif_name, bp,
< val->v.integer);
< break;
---
> if (bridge_port_set_priority(bif->bif_name, bp,
> val->v.integer) < 0)
> return (SNMP_ERR_GENERR);
> return (SNMP_ERR_NOERROR);
>
460a470,473
> if (val->v.integer != dot1dStpPortEnable_enabled &&
> val->v.integer != dot1dStpPortEnable_disabled)
> return (SNMP_ERR_WRONG_VALUE);
>
462,464c475,479
< ret = bridge_port_set_stp_enable(bif->bif_name,
< bp, val->v.integer);
< break;
---
> if (bridge_port_set_stp_enable(bif->bif_name,
> bp, val->v.integer) < 0)
> return (SNMP_ERR_GENERR);
> return (SNMP_ERR_NOERROR);
>
465a481,484
> if (val->v.integer < SNMP_PORT_MIN_PATHCOST ||
> val->v.integer > SNMP_PORT_MAX_PATHCOST)
> return (SNMP_ERR_WRONG_VALUE);
>
467,469c486,490
< ret = bridge_port_set_path_cost(bif->bif_name, bp,
< val->v.integer);
< break;
---
> if (bridge_port_set_path_cost(bif->bif_name, bp,
> val->v.integer) < 0)
> return (SNMP_ERR_GENERR);
> return (SNMP_ERR_NOERROR);
>
478,479d498
< default:
< return (SNMP_ERR_NOSUCHNAME);
481,485c500
< if (ret == 0)
< return (SNMP_ERR_NOERROR);
< else if (ret == -2)
< return (SNMP_ERR_WRONG_VALUE);
< return (SNMP_ERR_GENERR);
---
> abort();
509,511d523
<
< default:
< abort();
512a525
> abort();
514c527
< ret = SNMP_ERR_NOERROR;
---
> get:
518c531,532
< break;
---
> return (SNMP_ERR_NOERROR);
>
521c535,536
< break;
---
> return (SNMP_ERR_NOERROR);
>
524c539,540
< break;
---
> return (SNMP_ERR_NOERROR);
>
527c543,544
< break;
---
> return (SNMP_ERR_NOERROR);
>
530c547,548
< break;
---
> return (SNMP_ERR_NOERROR);
>
532,534c550,552
< ret = string_get(val, bp->design_root,
< SNMP_BRIDGE_ID_LEN);
< break;
---
> return (string_get(val, bp->design_root,
> SNMP_BRIDGE_ID_LEN));
>
537c555,556
< break;
---
> return (SNMP_ERR_NOERROR);
>
539,541c558,560
< ret = string_get(val, bp->design_bridge,
< SNMP_BRIDGE_ID_LEN);
< break;
---
> return (string_get(val, bp->design_bridge,
> SNMP_BRIDGE_ID_LEN));
>
543,544c562,563
< ret = string_get(val, bp->design_port, 2);
< break;
---
> return (string_get(val, bp->design_port, 2));
>
547c566
< break;
---
> return (SNMP_ERR_NOERROR);
550c569
< return (ret);
---
> abort();
557d575
< int ret;
575c593
< break;
---
> goto get;
589c607
< break;
---
> goto get;
599a618,621
> if (val->v.integer != TruthValue_true &&
> val->v.integer != TruthValue_false)
> return (SNMP_ERR_WRONG_VALUE);
>
601,603c623,627
< ret = bridge_port_set_admin_edge(bif->bif_name, bp,
< val->v.integer);
< break;
---
> if (bridge_port_set_admin_edge(bif->bif_name, bp,
> val->v.integer) < 0)
> return (SNMP_ERR_GENERR);
> return (SNMP_ERR_NOERROR);
>
604a629,632
> if (val->v.integer < 0 || val->v.integer >
> StpPortAdminPointToPointType_auto)
> return (SNMP_ERR_WRONG_VALUE);
>
606,608c634,638
< ret = bridge_port_set_admin_p2p(bif->bif_name, bp,
< val->v.integer);
< break;
---
> if (bridge_port_set_admin_p2p(bif->bif_name, bp,
> val->v.integer) < 0)
> return (SNMP_ERR_GENERR);
> return (SNMP_ERR_NOERROR);
>
609a640,643
> if (val->v.integer < SNMP_PORT_MIN_PATHCOST ||
> val->v.integer > SNMP_PORT_MAX_PATHCOST)
> return (SNMP_ERR_WRONG_VALUE);
>
611,613c645,649
< ret = bridge_port_set_path_cost(bif->bif_name, bp,
< val->v.integer);
< break;
---
> if (bridge_port_set_path_cost(bif->bif_name, bp,
> val->v.integer) < 0)
> return (SNMP_ERR_GENERR);
> return (SNMP_ERR_NOERROR);
>
618,619d653
< default:
< return (SNMP_ERR_NOSUCHNAME);
620a655
> abort();
622,627d656
< if (ret == 0)
< return (SNMP_ERR_NOERROR);
< else if (ret == -2)
< return (SNMP_ERR_WRONG_VALUE);
< return (SNMP_ERR_GENERR);
<
651,653d679
<
< default:
< abort();
654a681
> abort();
655a683
> get:
659c687,688
< break;
---
> return (SNMP_ERR_NOERROR);
>
662c691,692
< break;
---
> return (SNMP_ERR_NOERROR);
>
665c695,696
< break;
---
> return (SNMP_ERR_NOERROR);
>
668c699,700
< break;
---
> return (SNMP_ERR_NOERROR);
>
671c703,704
< break;
---
> return (SNMP_ERR_NOERROR);
>
674c707
< break;
---
> return (SNMP_ERR_NOERROR);
677c710
< return (SNMP_ERR_NOERROR);
---
> abort();
701c734
< break;
---
> goto get;
715c748
< break;
---
> goto get;
722,723c755
< default:
< abort();
---
> break;
724a757
> abort();
725a759
> get:
729c763,764
< break;
---
> return (SNMP_ERR_NOERROR);
>
732c767,768
< break;
---
> return (SNMP_ERR_NOERROR);
>
735c771,772
< break;
---
> return (SNMP_ERR_NOERROR);
>
738c775,776
< break;
---
> return (SNMP_ERR_NOERROR);
>
741c779
< break;
---
> return (SNMP_ERR_NOERROR);
744c782
< return (SNMP_ERR_NOERROR);
---
> abort();
1039c1077
< struct bridge_port *bp = NULL;
---
> struct bridge_port *bp;
1055c1093
< break;
---
> goto get;
1065c1103
< break;
---
> goto get;
1097a1136
> abort();
1098a1138
> get:
1102c1142,1143
< break;
---
> return (SNMP_ERR_NOERROR);
>
1105c1146,1147
< break;
---
> return (SNMP_ERR_NOERROR);
>
1108c1150,1151
< break;
---
> return (SNMP_ERR_NOERROR);
>
1111c1154,1155
< break;
---
> return (SNMP_ERR_NOERROR);
>
1114c1158,1159
< break;
---
> return (SNMP_ERR_NOERROR);
>
1117c1162
< break;
---
> return (SNMP_ERR_NOERROR);
1120c1165
< return (SNMP_ERR_NOERROR);
---
> abort();
1127d1171
< int ret;
1138c1182
< break;
---
> goto get;
1144c1188
< break;
---
> goto get;
1152d1195
< ret = SNMP_ERR_NOERROR;
1154a1198,1200
> if (val->v.integer < 0 || val->v.integer > 255)
> return (SNMP_ERR_WRONG_VALUE);
>
1156,1158c1202,1206
< ret = bridge_port_set_priority(b_name, bp,
< val->v.integer);
< break;
---
> if (bridge_port_set_priority(b_name, bp,
> val->v.integer) < 0)
> return (SNMP_ERR_GENERR);
> return (SNMP_ERR_NOERROR);
>
1159a1208,1213
> if (val->v.integer !=
> begemotBridgeStpPortEnable_enabled ||
> val->v.integer !=
> begemotBridgeStpPortEnable_disabled)
> return (SNMP_ERR_WRONG_VALUE);
>
1161,1163c1215,1219
< ret = bridge_port_set_stp_enable(b_name, bp,
< val->v.integer);
< break;
---
> if (bridge_port_set_stp_enable(b_name, bp,
> val->v.integer) < 0)
> return (SNMP_ERR_GENERR);
> return (SNMP_ERR_NOERROR);
>
1164a1221,1224
> if (val->v.integer < SNMP_PORT_MIN_PATHCOST ||
> val->v.integer > SNMP_PORT_MAX_PATHCOST)
> return (SNMP_ERR_WRONG_VALUE);
>
1166,1168c1226,1230
< ret = bridge_port_set_path_cost(b_name, bp,
< val->v.integer);
< break;
---
> if (bridge_port_set_path_cost(b_name, bp,
> val->v.integer) < 0)
> return (SNMP_ERR_GENERR);
> return (SNMP_ERR_NOERROR);
>
1178,1182c1240
< if (ret == 0)
< return (SNMP_ERR_NOERROR);
< else if (ret == -2)
< return (SNMP_ERR_WRONG_VALUE);
< return (SNMP_ERR_GENERR);
---
> abort();
1207,1209d1264
<
< default:
< abort();
1210a1266
> abort();
1212c1268
< ret = SNMP_ERR_NOERROR;
---
> get:
1216c1272,1273
< break;
---
> return (SNMP_ERR_NOERROR);
>
1219c1276,1277
< break;
---
> return (SNMP_ERR_NOERROR);
>
1222c1280,1281
< break;
---
> return (SNMP_ERR_NOERROR);
>
1225c1284,1285
< break;
---
> return (SNMP_ERR_NOERROR);
>
1228c1288,1289
< break;
---
> return (SNMP_ERR_NOERROR);
>
1230,1231c1291,1292
< ret = string_get(val, bp->design_root, SNMP_BRIDGE_ID_LEN);
< break;
---
> return (string_get(val, bp->design_root, SNMP_BRIDGE_ID_LEN));
>
1234c1295,1296
< break;
---
> return (SNMP_ERR_NOERROR);
>
1236,1237c1298,1299
< ret = string_get(val, bp->design_bridge, SNMP_BRIDGE_ID_LEN);
< break;
---
> return (string_get(val, bp->design_bridge, SNMP_BRIDGE_ID_LEN));
>
1239,1240c1301,1302
< ret = string_get(val, bp->design_port, 2);
< break;
---
> return (string_get(val, bp->design_port, 2));
>
1243c1305
< break;
---
> return (SNMP_ERR_NOERROR);
1246c1308
< return (ret);
---
> abort();
1253d1314
< int ret;
1264c1325
< break;
---
> goto get;
1270c1331
< break;
---
> goto get;
1279a1341,1344
> if (val->v.integer != TruthValue_true &&
> val->v.integer != TruthValue_false)
> return (SNMP_ERR_WRONG_VALUE);
>
1281,1283c1346,1350
< ret = bridge_port_set_admin_edge(b_name, bp,
< val->v.integer);
< break;
---
> if (bridge_port_set_admin_edge(b_name, bp,
> val->v.integer) < 0)
> return (SNMP_ERR_GENERR);
> return (SNMP_ERR_NOERROR);
>
1284a1352,1355
> if (val->v.integer < 0 || val->v.integer >
> StpPortAdminPointToPointType_auto)
> return (SNMP_ERR_WRONG_VALUE);
>
1286,1288c1357,1361
< ret = bridge_port_set_admin_p2p(b_name, bp,
< val->v.integer);
< break;
---
> if (bridge_port_set_admin_p2p(b_name, bp,
> val->v.integer) < 0)
> return (SNMP_ERR_GENERR);
> return (SNMP_ERR_NOERROR);
>
1289a1363,1366
> if (val->v.integer < SNMP_PORT_MIN_PATHCOST ||
> val->v.integer > SNMP_PORT_MAX_PATHCOST)
> return (SNMP_ERR_WRONG_VALUE);
>
1291,1293c1368,1372
< ret = bridge_port_set_path_cost(b_name, bp,
< val->v.integer);
< break;
---
> if (bridge_port_set_path_cost(b_name, bp,
> val->v.integer) < 0)
> return (SNMP_ERR_GENERR);
> return (SNMP_ERR_NOERROR);
>
1298,1299d1376
< default:
< return (SNMP_ERR_NOSUCHNAME);
1300a1378
> abort();
1302,1307d1379
< if (ret == 0)
< return (SNMP_ERR_NOERROR);
< else if (ret == -2)
< return (SNMP_ERR_WRONG_VALUE);
< return (SNMP_ERR_GENERR);
<
1331,1333d1402
<
< default:
< abort();
1334a1404
> abort();
1335a1406
> get:
1339c1410,1411
< break;
---
> return (SNMP_ERR_NOERROR);
>
1342c1414,1415
< break;
---
> return (SNMP_ERR_NOERROR);
>
1345c1418,1419
< break;
---
> return (SNMP_ERR_NOERROR);
>
1348c1422,1423
< break;
---
> return (SNMP_ERR_NOERROR);
>
1351c1426,1427
< break;
---
> return (SNMP_ERR_NOERROR);
>
1354c1430
< break;
---
> return (SNMP_ERR_NOERROR);
1357c1433
< return (SNMP_ERR_NOERROR);
---
> abort();
1373c1449
< break;
---
> goto get;
1379c1455
< break;
---
> goto get;
1386,1387c1462
< default:
< abort();
---
> break;
1388a1464
> abort();
1389a1466
> get:
1393c1470,1471
< break;
---
> return (SNMP_ERR_NOERROR);
>
1396c1474,1475
< break;
---
> return (SNMP_ERR_NOERROR);
>
1399c1478,1479
< break;
---
> return (SNMP_ERR_NOERROR);
>
1402c1482,1483
< break;
---
> return (SNMP_ERR_NOERROR);
>
1405c1486
< break;
---
> return (SNMP_ERR_NOERROR);
1408c1489
< return (SNMP_ERR_NOERROR);
---
> abort();