提交 9275def5 编写于 作者: D Daniel P. Berrangé

util: handle missing switch enum cases

Ensure all enum cases are listed in switch statements.
Reviewed-by: NJohn Ferlan <jferlan@redhat.com>
Signed-off-by: NDaniel P. Berrangé <berrange@redhat.com>
上级 3b1020ac
......@@ -296,7 +296,9 @@ virConfSaveValue(virBufferPtr buf, virConfValuePtr val)
virBufferAddLit(buf, " ]");
break;
}
case VIR_CONF_LAST:
default:
virReportEnumRangeError(virConfType, val->type);
return -1;
}
return 0;
......@@ -986,13 +988,20 @@ int virConfGetValueStringList(virConfPtr conf,
}
ATTRIBUTE_FALLTHROUGH;
default:
case VIR_CONF_LLONG:
case VIR_CONF_ULLONG:
case VIR_CONF_NONE:
virReportError(VIR_ERR_INTERNAL_ERROR,
compatString ?
_("%s: expected a string or string list for '%s' parameter") :
_("%s: expected a string list for '%s' parameter"),
conf->filename, setting);
return -1;
case VIR_CONF_LAST:
default:
virReportEnumRangeError(virConfType, cval->type);
return -1;
}
return 1;
......
......@@ -173,7 +173,7 @@ void virReportSystemErrorFull(int domcode,
virReportErrorHelper(VIR_FROM_THIS, VIR_ERR_INTERNAL_ERROR, \
__FILE__, __FUNCTION__, __LINE__, \
"Unexpected enum value %d for %s", \
value, sizeof((typename)1) != 0 ? #typname : #typname);
value, sizeof((typname)1) != 0 ? #typname : #typname);
void virReportOOMErrorFull(int domcode,
const char *filename,
......
......@@ -827,9 +827,11 @@ virFirewallApplyRule(virFirewallPtr firewall,
if (virFirewallApplyRuleFirewallD(rule, ignoreErrors, &output) < 0)
return -1;
break;
case VIR_FIREWALL_BACKEND_AUTOMATIC:
case VIR_FIREWALL_BACKEND_LAST:
default:
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Unexpected firewall engine backend"));
virReportEnumRangeError(virFirewallBackend, currentBackend);
return -1;
}
......
......@@ -1206,20 +1206,30 @@ virLogGetOutputs(void)
virLogDestinationTypeToString(dest),
virLogOutputs[i]->name);
break;
default:
case VIR_LOG_TO_STDERR:
case VIR_LOG_TO_JOURNALD:
virBufferAsprintf(&outputbuf, "%d:%s",
virLogOutputs[i]->priority,
virLogDestinationTypeToString(dest));
break;
case VIR_LOG_TO_OUTPUT_LAST:
default:
virReportEnumRangeError(virLogDestination, dest);
goto error;
}
}
virLogUnlock();
if (virBufferError(&outputbuf)) {
virBufferFreeAndReset(&outputbuf);
return NULL;
goto error;
}
virLogUnlock();
return virBufferContentAndReset(&outputbuf);
error:
virLogUnlock();
virBufferFreeAndReset(&outputbuf);
return NULL;
}
......
......@@ -1071,6 +1071,9 @@ virNetDevVPortProfileOp8021Qbg(const char *ifname,
case VIR_NETDEV_VPORT_PROFILE_LINK_OP_PREASSOCIATE:
op = PORT_REQUEST_PREASSOCIATE;
break;
case VIR_NETDEV_VPORT_PROFILE_LINK_OP_PREASSOCIATE_RR:
op = PORT_REQUEST_PREASSOCIATE_RR;
break;
case VIR_NETDEV_VPORT_PROFILE_LINK_OP_ASSOCIATE:
op = PORT_REQUEST_ASSOCIATE;
break;
......@@ -1191,10 +1194,15 @@ virNetDevVPortProfileOp8021Qbh(const char *ifname,
false);
break;
default:
case VIR_NETDEV_VPORT_PROFILE_LINK_OP_PREASSOCIATE:
virReportError(VIR_ERR_INTERNAL_ERROR,
_("operation type %d not supported"), virtPortOp);
rc = -1;
break;
default:
virReportEnumRangeError(virNetDevVPortProfileType, virtPortOp);
rc = -1;
break;
}
cleanup:
......
......@@ -30,7 +30,7 @@
# define LIBVIRT_IFLA_VF_PORT_PROFILE_MAX 40
enum virNetDevVPortProfile {
typedef enum virNetDevVPortProfile {
VIR_NETDEV_VPORT_PROFILE_NONE,
VIR_NETDEV_VPORT_PROFILE_8021QBG,
VIR_NETDEV_VPORT_PROFILE_8021QBH,
......@@ -38,7 +38,7 @@ enum virNetDevVPortProfile {
VIR_NETDEV_VPORT_PROFILE_MIDONET,
VIR_NETDEV_VPORT_PROFILE_LAST,
};
} virNetDevVPortProfileType;
VIR_ENUM_DECL(virNetDevVPort)
typedef enum {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册